Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -49,7 +49,7 @@ calculation2.Name = "PK001_0002 W1-6_4_1D1"; calculation2.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_SCH_17", 0, 0); calculation2.InputParameters.SurfaceLine.Name = "PK001_0002"; - calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Piping", string.Empty); + calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Macrostabiliteit", string.Empty); calculation2.InputParameters.StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) { SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_4_1D1", 0, new[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationConfigurationWriterTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -79,7 +79,7 @@ calculation2.Name = "PK001_0002 W1-6_4_1D1"; calculation2.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_SCH_17", 0, 0); calculation2.InputParameters.SurfaceLine.Name = "PK001_0002"; - calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Piping", string.Empty); + calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Macrostabiliteit", string.Empty); calculation2.InputParameters.StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) { SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_4_1D1", 0, new[] @@ -149,7 +149,9 @@ Assert.IsTrue(File.Exists(filePath)); string actualXml = File.ReadAllText(filePath); - string expectedXmlFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO, Path.Combine("MacroStabilityInwardsCalculationConfigurationWriter", $"{expectedFileName}.xml")); + string expectedXmlFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO, + Path.Combine("MacroStabilityInwardsCalculationConfigurationWriter", + $"{expectedFileName}.xml")); string expectedXml = File.ReadAllText(expectedXmlFilePath); Assert.AreEqual(expectedXml, actualXml); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -4,14 +4,14 @@ PUNT_KAT_18 PK001_0001 - PK001_0001_Piping + PK001_0001_Macrostabiliteit W1-6_0_1D1 PUNT_SCH_17 PK001_0002 - PK001_0002_Piping + PK001_0002_Macrostabiliteit W1-6_4_1D1 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithAssessmentLevel.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -3,7 +3,7 @@ 3 PK001_0001 - PK001_0001_Piping + PK001_0001_Macrostabiliteit W1-6_0_1D1 \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithInfinities.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -3,7 +3,7 @@ -INF PK001_0001 - PK001_0001_Piping + PK001_0001_Macrostabiliteit W1-6_0_1D1 \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithNaNs.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -3,7 +3,7 @@ NaN PK001_0001 - PK001_0001_Piping + PK001_0001_Macrostabiliteit W1-6_0_1D1 \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutHydraulicLocation.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -2,7 +2,7 @@ PK001_0001 - PK001_0001_Piping + PK001_0001_Macrostabiliteit W1-6_0_1D1 \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSoilProfile.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -3,6 +3,6 @@ PUNT_KAT_18 PK001_0001 - PK001_0001_Piping + PK001_0001_Macrostabiliteit \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSurfaceline.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -2,7 +2,7 @@ PUNT_KAT_18 - PK001_0001_Piping + PK001_0001_Macrostabiliteit W1-6_0_1D1 \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -4,14 +4,14 @@ PUNT_KAT_18 PK001_0001 - PK001_0001_Piping + PK001_0001_Macrostabiliteit W1-6_0_1D1 PUNT_SCH_17 PK001_0002 - PK001_0002_Piping + PK001_0002_Macrostabiliteit W1-6_4_1D1 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils.Test/MacroStabilityInwardsTestDataGeneratorTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -137,7 +137,7 @@ Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name); Assert.AreEqual(double.NaN, calculation.InputParameters.AssessmentLevel.Value); Assert.AreEqual("PK001_0001", calculation.InputParameters.SurfaceLine.Name); - Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); + Assert.AreEqual("PK001_0001_Macrostabiliteit", calculation.InputParameters.StochasticSoilModel.Name); Assert.AreEqual("W1-6_0_1D1", calculation.InputParameters.StochasticSoilProfile.SoilProfile.Name); } @@ -151,7 +151,7 @@ Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name); Assert.AreEqual(double.NegativeInfinity, calculation.InputParameters.AssessmentLevel.Value); Assert.AreEqual("PK001_0001", calculation.InputParameters.SurfaceLine.Name); - Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); + Assert.AreEqual("PK001_0001_Macrostabiliteit", calculation.InputParameters.StochasticSoilModel.Name); Assert.AreEqual("W1-6_0_1D1", calculation.InputParameters.StochasticSoilProfile.SoilProfile.Name); } @@ -193,7 +193,7 @@ if (hasSoilModel) { Assert.AreEqual(1, calculation.InputParameters.StochasticSoilModel.Id); - Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); + Assert.AreEqual("PK001_0001_Macrostabiliteit", calculation.InputParameters.StochasticSoilModel.Name); if (hasSoilProfile) { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -134,7 +134,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_KAT_18", 0, 0), SurfaceLine = surfaceline, - StochasticSoilModel = new StochasticSoilModel(1, "PK001_0001_Piping", string.Empty), + StochasticSoilModel = new StochasticSoilModel(1, "PK001_0001_Macrostabiliteit", string.Empty), StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) { SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_0_1D1", 0, new[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r4f7dea208a70e4e3862a47a44028d6601e6f695f -r2be53684917500e68a60645ffc2e69d79460a77e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 2be53684917500e68a60645ffc2e69d79460a77e) @@ -662,8 +662,8 @@ } [Test] - [TestCase(true, "GivenCalculation_WhenClearingOutputFromContextMenu_ThenOutputClearedAndNotified(true)")] - [TestCase(false, "GivenCalculation_WhenClearingOutputFromContextMenu_ThenOutputClearedAndNotified(false)")] + [TestCase(true, TestName = "GivenCalculation_WhenClearingOutputFromContextMenu_ThenOutputClearedAndNotified(true)")] + [TestCase(false, TestName = "GivenCalculation_WhenClearingOutputFromContextMenu_ThenOutputClearedAndNotified(false)")] public void GivenCalculationWithOutput_WhenClearingOutputFromContextMenu_ThenCalculationOutputClearedAndNotified(bool confirm) { // Given