Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 4000) @@ -65,18 +65,17 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", baseTestDirectory + @"PulauTekong.geometries2D.0\"); inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", baseTestDirectory + @"PulauTekong0.soilmaterials.mdb"); - EngineInterface engineInterface = new EngineInterface(inputString); + var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); string outputString = engineInterface.Run(); File.WriteAllText(outputFileName, outputString, Encoding.Unicode); Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.AreEqual(stabilityOutsideFactor, output.Results.OperationalOutputTimeSeries[0].ParameterId); Assert.AreEqual(valueEntry1, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance); Assert.AreEqual(stabilityOutsideFactor, output.Results.OperationalOutputTimeSeries[1].ParameterId); Assert.AreEqual(valueEntry2, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance); - } [Test, Category("MultiCore")] @@ -87,13 +86,13 @@ { var calcDir = "TestOperationalPulauTekongSingleCore"; var outputFileName = @"PulauTekongSingleCore.OutputFile.xml"; - var output = RunTestProjectCores(calcDir, outputFileName, 1); - var outputSingleCore = DamXmlSerialization.SaveOutputAsXmlString(output); + Output output = RunTestProjectCores(calcDir, outputFileName, 1); + string outputSingleCore = DamXmlSerialization.SaveOutputAsXmlString(output); calcDir = "TestOperationalPulauTekongMultiCore"; outputFileName = @"PulauTekongMultiCore.OutputFile.xml"; output = RunTestProjectCores(calcDir, outputFileName, 4); - var outputMultiCore = DamXmlSerialization.SaveOutputAsXmlString(output); + string outputMultiCore = DamXmlSerialization.SaveOutputAsXmlString(output); Assert.AreEqual(outputSingleCore, outputMultiCore); } @@ -104,6 +103,7 @@ { Directory.Delete(calcDir, true); // delete previous results } + Directory.CreateDirectory(calcDir); const string baseTestDirectory = @".\TestFiles\Operational\PulauTekong\"; @@ -114,13 +114,12 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", baseTestDirectory + @"PulauTekong.geometries2D.0\"); inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", baseTestDirectory + @"PulauTekong0.soilmaterials.mdb"); inputString = XmlAdapter.ChangeValueInXml(inputString, "MaxCalculationCores", coreCount.ToString()); - EngineInterface engineInterface = new EngineInterface(inputString); + var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); string outputString = engineInterface.Run(); File.WriteAllText(outputFileName, outputString, Encoding.Unicode); Assert.IsNotNull(outputString); return DamXmlSerialization.LoadOutputFromXmlString(outputString); } - } -} +} \ No newline at end of file