Simplify CurveData data structures

2018-08-24 21:28:00 -04:00
parent cc49f05d7e
commit ad41465c05
10 changed files with 55 additions and 96 deletions
@@ -19,7 +19,7 @@ namespace LeafWeb.Core.Tests.Charter
 			using (var parser = new LeafGasComparisonParser(fileInfo))
 				leafGasComparisons = parser.Parse();

-			var curves = CurveDataConverter.Convert(leafGasComparisons);
+			var curves = CurveDataConverter.Convert(leafGasComparisons).ToArray();
 			Assert.That(curves.Count(),Is.EqualTo(1));
 		}

@@ -36,7 +36,7 @@ namespace LeafWeb.Core.Tests.Charter
 		}

 		[Test]
-		public void Convert_ThrowsExpectionWhenNotEnoughDataSets()
+		public void Convert_PartialCurveData()
 		{
 			var fileInfo = FileUtility.GetContentFile(ContentDirectory, "leafgascomparison_PartialCurveData.csv");

@@ -44,9 +44,10 @@ namespace LeafWeb.Core.Tests.Charter
 			using (var parser = new LeafGasComparisonParser(fileInfo))
 				leafGasComparisons = parser.Parse();

-		    //var h = CurveDataConverter.Convert(leafGasComparisons).ToArray();
+            //var h = CurveDataConverter.Convert(leafGasComparisons).ToArray();

-            Assert.Throws<ParseException>(() => CurveDataConverter.Convert(leafGasComparisons).ToArray());
-		}
-	}
+		    var curves = CurveDataConverter.Convert(leafGasComparisons).ToArray();
+		    Assert.That(curves.Count(), Is.EqualTo(1));
+        }
+    }
 }