Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs =================================================================== diff -u -r5980 -r5984 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 5980) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 5984) @@ -106,7 +106,7 @@ Z = -2.0 // Expected Z-value is location data Polderlevel of 'Purmer_PU0042+00_K': -2.0 } ] - }).SetName("Only location data"); + }).SetName("OnlyLocationData"); yield return new TestCaseData( // This is the case that all values are taken from the sensor data new SensorConfiguration @@ -169,7 +169,7 @@ Z = -2.0 // Expected Z-value is location data Polderlevel of 'Purmer_PU0042+00_K': -2.0 } ] - }).SetName("Only sensor data"); + }).SetName("OnlySensorData"); } } @@ -182,7 +182,8 @@ public void GivenStabilityInsideProfile1DProject_WhenCalculatingWithVariatonsOnSpecifiedSensorLocationData_ThenExpectedResultIsGenerated(SensorConfiguration sensorConfiguration, PlLinePoints plLinePoints) { var projectPath = "SensorProfile1DTests"; - const string calcDir = "DAMLive.Calc"; + string testCaseName = TestContext.CurrentContext.Test.Name; + string calcDir = $"DAMLive.Calc.{testCaseName}"; const string testFilesLocation = @".\TestFiles\Operational\SensorProfile1DTests\"; string inputFilename = testFilesLocation + "CalculateStabilityInsideBishopGrid1InputFile.xml"; string outputFilename = testFilesLocation + "CalculateStabilityInsideBishopGrid1OutputFile.xml"; @@ -192,6 +193,7 @@ } Input input = DamXmlSerialization.LoadInputFromXmlFile(inputFilename); + input.CalculationMap = calcDir; input.ProjectPath = projectPath; Location location = input.Locations[0]; FillSensorLocation(input.SensorData.SensorLocations[0], location, sensorConfiguration); @@ -200,7 +202,7 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString, true, outputFilename); Assert.That(output, Is.Not.Null); // Read the kernel input data from the input file - var kernelInputFilename = $"{projectPath}\\DAMLive.Calc\\Stability\\Bishop\\Dik(dike)_Loc(Purmer_PU0042+00_K)_Stp(0)_Mdl(Bishop)_2016-03-02T03_10_00_Pro(Purmer_PU0042+00K).skx"; + var kernelInputFilename = $"{projectPath}\\{calcDir}\\Stability\\Bishop\\Dik(dike)_Loc(Purmer_PU0042+00_K)_Stp(0)_Mdl(Bishop)_2016-03-02T03_10_00_Pro(Purmer_PU0042+00K).skx"; FullInputModelType expectedMacrostabilityInput = MacroStabilityXmlSerialization.LoadInputFromXmlFile(kernelInputFilename); const double tolerance = 0.0005; List phreaticLine = expectedMacrostabilityInput.StabilityModel.ConstructionStages[0].Waternet.PhreaticLine.WaternetLine.Points.ToList();