reading testdata from CSV file

VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

@@ -10,30 +10,23 @@ using TUGraz.VectoCore.Tests.Utils;
 
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 {
+
     [TestClass]
     public class CombustionEngineTest
     {
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            Directory.SetCurrentDirectory("TestData\\EngineOnly\\Test1");
-	     
-			AppDomain.CurrentDomain.SetData("DataDirectory", Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
-        }
+		public TestContext TestContext { get; set; }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            // Set the current directory back to the application path
-            var assemblyLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
-            Directory.SetCurrentDirectory(Path.GetDirectoryName(assemblyLocation));
+        [ClassInitialize]
+		public static void ClassInitialize(TestContext ctx)
+        {     
+			AppDomain.CurrentDomain.SetData("DataDirectory", Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
         }
 
 
         [TestMethod]
         public void TestEngineHasOutPort()
         {
-            var engineData = CombustionEngineData.ReadFromFile("24t Coach.veng");
+            var engineData = CombustionEngineData.ReadFromFile("TestData\\EngineOnly\\EngineMaps\\24t Coach.veng");
             var engine = new CombustionEngine(engineData);
 
             var port = engine.OutShaft();
@@ -43,7 +36,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
         [TestMethod]
         public void TestOutPortRequestNotFailing()
         {
-            var engineData = CombustionEngineData.ReadFromFile("24t Coach.veng");
+			var engineData = CombustionEngineData.ReadFromFile("TestData\\EngineOnly\\EngineMaps\\24t Coach.veng");
             var engine = new CombustionEngine(engineData);
 
             var port = engine.OutShaft();
@@ -59,7 +52,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
         [TestMethod]
         public void TestSimpleModalData()
         {
-            var engineData = CombustionEngineData.ReadFromFile("24t Coach.veng");
+			var engineData = CombustionEngineData.ReadFromFile("TestData\\EngineOnly\\EngineMaps\\24t Coach.veng");
             var engine = new CombustionEngine(engineData);
             var port = engine.OutShaft();
 
@@ -81,14 +74,17 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
             Assert.AreEqual(dataWriter[ModalResultField.FCWHTCc], 15000);
         }
 
-        [TestMethod]
+		[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\TestData\\EngineTests.csv", "EngineTests#csv", DataAccessMethod.Sequential)]
+		[TestMethod]
         public void TestEngineOnlyDrivingCycle()
         {
-            var engineData = CombustionEngineData.ReadFromFile("24t Coach.veng");
-            var engine = new CombustionEngine(engineData);
+			var engineData = CombustionEngineData.ReadFromFile(TestContext.DataRow["EngineFile"].ToString());
+			var data = EngineOnlyDrivingCycle.ReadFromFile(TestContext.DataRow["CycleFile"].ToString());
+			// var expectedResults = ....
+
+			var engine = new CombustionEngine(engineData);
             var port = engine.OutShaft();
 
-            var data = EngineOnlyDrivingCycle.ReadFromFile("Coach Engine Only.vdri");
 
             var absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0);
             var dt = new TimeSpan(seconds: 1, minutes: 0, hours: 0);
@@ -113,17 +109,6 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
             Assert.AreEqual(dataWriter[ModalResultField.FCWHTCc], 15000);
         }
 
-		public TestContext TestContext { get; set; }
 
-		[DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\TestData\\EngineTests.csv", "EngineTests#csv", DataAccessMethod.Sequential)]
-	    [TestMethod]
-	    public void TestAllEngineOnlyCycles()
-	    {
-		    var a = Convert.ToDouble(TestContext.DataRow["Add1"].ToString());
-		    var b = Convert.ToDouble(TestContext.DataRow["Add2"].ToString());
-		    var res = Convert.ToDouble(TestContext.DataRow["Sum"].ToString());
-
-		    Assert.AreEqual(a + b, res);
-		}
     }
 }

VectoCoreTest/TestData/EngineOnly/ResultFiles/Test1_results.vsum

+Job [-],Input File [-],Cycle [-],time [s],Ppos [kW],Pneg [kW],FC [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+1,24t Coach.vecto,LOT2_rural Engine Only.vdri,3951,29.5999634846317,-1.63579455196953,ERROR,-,-

VectoCoreTest/TestData/EngineTests.csv

-Add1,Add2,Sum
-7,2,9
-5,2,7
-3,2,5
-4,3,7
\ No newline at end of file
+TestName,EngineFile,CycleFile,ResultFile
+Test1,EngineOnly\EngineMaps\24t Coach.veng,EngineOnly\Cycles\Coach Engine Only.vdri,EngineOnly\ResultFiles\test1.vmod
\ No newline at end of file

VectoCoreTest/VectoCoreTest.csproj

@@ -111,6 +111,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="TestData\EngineOnly\ResultFiles\" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

VectoCoreTest/default.runsettings

 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
 	<MSTest>
-		<DeleteDeploymentDirectoryAfterTestRunIsComplete>False</DeleteDeploymentDirectoryAfterTestRunIsComplete>
+		<DeleteDeploymentDirectoryAfterTestRunIsComplete>True</DeleteDeploymentDirectoryAfterTestRunIsComplete>
 		<DeploymentEnabled>False></DeploymentEnabled>
 	</MSTest>
 </RunSettings>
\ No newline at end of file