Fixing tests and associated code

Author: bowencode

Extensions/Csv/Cosmos.DataTransfer.CsvExtension.UnitTests/CsvWriterSettingsTests.cs

@@ -17,8 +17,8 @@ public class CsvWriterSettingsTests
     public void TestDefault() {
         var settings = new CsvWriterSettings() { };
 
-        Assert.AreEqual(settings.GetCultureInfo(), CultureInfo.InvariantCulture);        
-        Assert.AreEqual(settings.Validate(new ValidationContext(this)).Count(), 0);
+        Assert.AreEqual(CultureInfo.InvariantCulture, settings.GetCultureInfo());        
+        Assert.AreEqual(0, settings.Validate(new ValidationContext(this)).Count());
     }
 
     [TestMethod]
@@ -30,8 +30,8 @@ public void TestInvariantCulture(string culture) {
         var settings = new CsvWriterSettings() {
             Culture = culture
         };
-        Assert.AreEqual(settings.GetCultureInfo(), CultureInfo.InvariantCulture);        
-        Assert.AreEqual(settings.Validate(new ValidationContext(this)).Count(), 0);
+        Assert.AreEqual(CultureInfo.InvariantCulture, settings.GetCultureInfo());        
+        Assert.AreEqual(0, settings.Validate(new ValidationContext(this)).Count());
     }
 
     [TestMethod]
@@ -43,39 +43,49 @@ public void TestCurrentCulture(string culture) {
         var settings = new CsvWriterSettings() {
             Culture = culture
         };
-        Assert.AreEqual(settings.GetCultureInfo(), CultureInfo.CurrentCulture);
-        Assert.AreEqual(settings.Validate(new ValidationContext(this)).Count(), 0);
+        Assert.AreEqual(CultureInfo.CurrentCulture, settings.GetCultureInfo());
+        Assert.AreEqual(0, settings.Validate(new ValidationContext(this)).Count());
     }
 
     [TestMethod]
     public void TestCurrentCultureByName() {
         var settings = new CsvWriterSettings() {
             Culture = CultureInfo.CurrentCulture.Name
         };
-        Assert.AreEqual(settings.GetCultureInfo(), CultureInfo.CurrentCulture);
-        Assert.AreEqual(settings.Validate(new ValidationContext(this)).Count(), 0);
+        Assert.AreEqual(CultureInfo.CurrentCulture, settings.GetCultureInfo());
+        Assert.AreEqual(0, settings.Validate(new ValidationContext(this)).Count());
     }
 
     [TestMethod]
     public void TestCultureFails() {
         var settings = new CsvWriterSettings() {
             Culture = "not a culture"
         };
-        var results = settings.Validate(new ValidationContext(this));
-        Assert.AreEqual(results.Count(), 1);
-        Assert.AreEqual(results.First().ErrorMessage, "Could not find CultureInfo `not a culture` on this system.");
+        var results = settings.Validate(new ValidationContext(this)).ToArray();
+        Assert.AreEqual(1, results.Count());
+        Assert.AreEqual("Could not find CultureInfo `not a culture` on this system.", results.First().ErrorMessage);
     }
 
     [TestMethod]
-    [DataRow(null)]
-    [DataRow("")]
-    public void TestCultureMissing(string culture) {
+    public void TestCultureMissing() {
         var settings = new CsvWriterSettings() {
-            Culture = culture
+            Culture = ""
+        };
+        var results = settings.Validate(new ValidationContext(this)).ToArray();
+        Assert.AreEqual(1, results.Count());
+        Assert.AreEqual("Culture missing.", results.First().ErrorMessage);
+    }
+
+    [TestMethod]
+    public void TestCultureNull()
+    {
+        var settings = new CsvWriterSettings()
+        {
+            Culture = null
         };
-        var results = settings.Validate(new ValidationContext(this));
-        Assert.AreEqual(results.Count(), 1);
-        Assert.AreEqual(results.First().ErrorMessage, "Culture missing.");
+        var results = settings.Validate(new ValidationContext(this)).ToArray();
+        Assert.AreEqual(1, results.Count());
+        Assert.AreEqual("Culture missing.", results.First().ErrorMessage);
     }
 
     [TestMethod]
@@ -101,6 +111,6 @@ public async Task TestDanishCulture() {
 
         await sink.WriteAsync(data.ToAsyncEnumerable(), config, new JsonFileSource(), NullLogger.Instance);
         var result = await File.ReadAllTextAsync(outputFile);
-        Assert.AreEqual(result, "1,2");
+        Assert.AreEqual("1,2", result);
     }
 }

Extensions/Csv/Cosmos.DataTransfer.CsvExtension/CsvFormatWriter.cs

@@ -24,7 +24,7 @@ public async Task FormatDataAsync(IAsyncEnumerable<IDataItem> dataItems, Stream
         await using var textWriter = new StreamWriter(target, leaveOpen: true);
         await using var writer = new CsvWriter(textWriter, new CsvConfiguration(settings.GetCultureInfo())
         {
-            Delimiter = settings.Delimiter,
+            Delimiter = settings.Delimiter ?? ",",
             HasHeaderRecord = settings.IncludeHeader,
         });
 

Extensions/Csv/Cosmos.DataTransfer.CsvExtension/Settings/CsvWriterSettings.cs

@@ -7,8 +7,8 @@ namespace Cosmos.DataTransfer.CsvExtension.Settings;
 public class CsvWriterSettings : IDataExtensionSettings, IValidatableObject
 {
     public bool IncludeHeader { get; set; } = true;
-    public string Delimiter { get; set; } = ",";
-    public string Culture { get; set; } = "InvariantCulture";
+    public string? Delimiter { get; set; } = ",";
+    public string? Culture { get; set; } = "InvariantCulture";
     public CultureInfo GetCultureInfo() {
         switch (this.Culture?.ToLower())
         {
@@ -18,6 +18,9 @@ public CultureInfo GetCultureInfo() {
             case "current": 
             case "currentculture":
                 return CultureInfo.CurrentCulture;
+            case "":
+            case null:
+                throw new ArgumentNullException();
             default: return CultureInfo.GetCultureInfo(this.Culture!);
         }
     }