Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs =================================================================== diff -u -rf03b47d0d73983de35188874a094ae07f1ea13fa -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision f03b47d0d73983de35188874a094ae07f1ea13fa) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -30,7 +30,10 @@ /// /// Exports a macro stability inwards calculation configuration and stores it as an XML file. /// - public class MacroStabilityInwardsCalculationConfigurationExporter : CalculationConfigurationExporter + public class MacroStabilityInwardsCalculationConfigurationExporter : SchemaCalculationConfigurationExporter< + MacroStabilityInwardsCalculationConfigurationWriter, + MacroStabilityInwardsCalculation, + MacroStabilityInwardsCalculationConfiguration> { /// /// Creates a new instance of . @@ -40,5 +43,39 @@ /// Thrown when is null. /// Thrown when is invalid. public MacroStabilityInwardsCalculationConfigurationExporter(IEnumerable configuration, string filePath) : base(configuration, filePath) {} + + protected override MacroStabilityInwardsCalculationConfigurationWriter CreateWriter(string filePath) + { + return new MacroStabilityInwardsCalculationConfigurationWriter(filePath); + } + + protected override MacroStabilityInwardsCalculationConfiguration ToConfiguration(MacroStabilityInwardsCalculation calculation) + { + MacroStabilityInwardsInput input = calculation.InputParameters; + + var calculationConfiguration = new MacroStabilityInwardsCalculationConfiguration(calculation.Name); + + if (input.HydraulicBoundaryLocation != null) + { + calculationConfiguration.HydraulicBoundaryLocation = input.HydraulicBoundaryLocation.Name; + } + else if (input.UseAssessmentLevelManualInput) + { + calculationConfiguration.AssessmentLevel = input.AssessmentLevel; + } + + if (input.SurfaceLine != null) + { + calculationConfiguration.SurfaceLine = input.SurfaceLine.Name; + } + + if (input.StochasticSoilModel != null) + { + calculationConfiguration.StochasticSoilModel = input.StochasticSoilModel.Name; + calculationConfiguration.StochasticSoilProfile = input.StochasticSoilProfile?.SoilProfile.Name; + } + + return calculationConfiguration; + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs =================================================================== diff -u -rf03b47d0d73983de35188874a094ae07f1ea13fa -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision f03b47d0d73983de35188874a094ae07f1ea13fa) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Xml; using Ringtoets.Common.IO.Configurations; using Ringtoets.Common.IO.Configurations.Export; @@ -29,44 +30,44 @@ /// /// Writer for writing a macro stability inwards calculation configuration to XML. /// - public class MacroStabilityInwardsCalculationConfigurationWriter : CalculationConfigurationWriter + public class MacroStabilityInwardsCalculationConfigurationWriter : SchemaCalculationConfigurationWriter { - protected override void WriteCalculation(MacroStabilityInwardsCalculation calculation, XmlWriter writer) + /// + /// Creates a new instance of . + /// + /// The path of the file to write to. + /// Thrown when is invalid. + /// A valid path: + /// + /// is not empty or null, + /// does not consist out of only whitespace characters, + /// does not contain an invalid character, + /// does not end with a directory or path separator (empty file name). + /// + public MacroStabilityInwardsCalculationConfigurationWriter(string filePath) : base(filePath) {} + + protected override void WriteCalculation(MacroStabilityInwardsCalculationConfiguration configuration, XmlWriter writer) { writer.WriteStartElement(ConfigurationSchemaIdentifiers.CalculationElement); - writer.WriteAttributeString(ConfigurationSchemaIdentifiers.NameAttribute, calculation.Name); + writer.WriteAttributeString(ConfigurationSchemaIdentifiers.NameAttribute, configuration.Name); - MacroStabilityInwardsInput calculationInputParameters = calculation.InputParameters; + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement, + configuration.AssessmentLevel); + WriteElementWhenContentAvailable(writer, + ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement, + configuration.HydraulicBoundaryLocation); - if (calculationInputParameters.UseAssessmentLevelManualInput) - { - writer.WriteElementString(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement, - XmlConvert.ToString(calculationInputParameters.AssessmentLevel)); - } - else if (calculationInputParameters.HydraulicBoundaryLocation != null) - { - writer.WriteElementString(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement, - calculationInputParameters.HydraulicBoundaryLocation.Name); - } + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SurfaceLineElement, + configuration.SurfaceLine); + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilModelElement, + configuration.StochasticSoilModel); + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement, + configuration.StochasticSoilProfile); - if (calculationInputParameters.SurfaceLine != null) - { - writer.WriteElementString(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SurfaceLineElement, - calculationInputParameters.SurfaceLine.Name); - } - - if (calculationInputParameters.StochasticSoilModel != null) - { - writer.WriteElementString(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilModelElement, - calculationInputParameters.StochasticSoilModel.Name); - - if (calculationInputParameters.StochasticSoilProfile?.SoilProfile != null) - { - writer.WriteElementString(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement, - calculationInputParameters.StochasticSoilProfile.SoilProfile.Name); - } - } - writer.WriteEndElement(); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -rf03b47d0d73983de35188874a094ae07f1ea13fa -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision f03b47d0d73983de35188874a094ae07f1ea13fa) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.IO; using Core.Common.TestUtil; using NUnit.Framework; @@ -34,11 +35,40 @@ { [TestFixture] public class MacroStabilityInwardsCalculationConfigurationExporterTest - : CustomCalculationConfigurationExporterDesignGuidelinesTestFixture< + : CustomSchemaCalculationConfigurationExporterDesignGuidelinesTestFixture< MacroStabilityInwardsCalculationConfigurationExporter, MacroStabilityInwardsCalculationConfigurationWriter, - MacroStabilityInwardsCalculation> + MacroStabilityInwardsCalculation, + MacroStabilityInwardsCalculationConfiguration> { + private static IEnumerable Calculations + { + get + { + yield return new TestCaseData("calculationWithoutHydraulicLocation", + MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutHydraulicLocationAndAssessmentLevel()) + .SetName("calculationWithoutHydraulicLocation"); + yield return new TestCaseData("calculationWithAssessmentLevel", + MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithAssessmentLevel()) + .SetName("calculationWithAssessmentLevel"); + yield return new TestCaseData("calculationWithoutSurfaceLine", + MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutSurfaceLine()) + .SetName("calculationWithoutSurfaceLine"); + yield return new TestCaseData("calculationWithoutSoilModel", + MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutSoilModel()) + .SetName("calculationWithoutSoilModel"); + yield return new TestCaseData("calculationWithoutSoilProfile", + MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutSoilProfile()) + .SetName("calculationWithoutSoilProfile"); + yield return new TestCaseData("calculationWithNaNs", + MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithNaNs()) + .SetName("calculationWithNaNs"); + yield return new TestCaseData("calculationWithInfinities", + MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithInfinities()) + .SetName("calculationWithInfinities"); + } + } + [Test] public void Export_ValidData_ReturnTrueAndWritesFile() { @@ -86,9 +116,30 @@ }, expectedXmlFilePath); } + [Test] + [TestCaseSource(nameof(Calculations))] + public void Write_ValidCalculation_ValidFile(string expectedFileName, MacroStabilityInwardsCalculation calculation) + { + // Setup + string expectedXmlFilePath = TestHelper.GetTestDataPath( + TestDataPath.Ringtoets.MacroStabilityInwards.IO, + Path.Combine(nameof(MacroStabilityInwardsCalculationConfigurationExporter), $"{expectedFileName}.xml")); + + // Call and Assert + WriteAndValidate(new[] + { + calculation + }, expectedXmlFilePath); + } + protected override MacroStabilityInwardsCalculation CreateCalculation() { return MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculation(); } + + protected override MacroStabilityInwardsCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) + { + return new MacroStabilityInwardsCalculationConfigurationExporter(calculations, filePath); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs =================================================================== diff -u -rf03b47d0d73983de35188874a094ae07f1ea13fa -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision f03b47d0d73983de35188874a094ae07f1ea13fa) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -19,106 +19,74 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; using System.IO; +using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.IO.Configurations; using Ringtoets.Common.IO.TestUtil; -using Ringtoets.MacroStabilityInwards.Data; -using Ringtoets.MacroStabilityInwards.Integration.TestUtils; using Ringtoets.MacroStabilityInwards.IO.Configurations; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.IO.Test.Configurations { [TestFixture] public class MacroStabilityInwardsCalculationConfigurationWriterTest - : CustomCalculationConfigurationWriterDesignGuidelinesTestFixture< + : CustomSchemaCalculationConfigurationWriterDesignGuidelinesTestFixture< MacroStabilityInwardsCalculationConfigurationWriter, - MacroStabilityInwardsCalculation> + MacroStabilityInwardsCalculationConfiguration> { - private static IEnumerable Calculations - { - get - { - yield return new TestCaseData("calculationWithoutHydraulicLocation", - MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutHydraulicLocationAndAssessmentLevel()) - .SetName("calculationWithoutHydraulicLocation"); - yield return new TestCaseData("calculationWithAssessmentLevel", - MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithAssessmentLevel()) - .SetName("calculationWithAssessmentLevel"); - yield return new TestCaseData("calculationWithoutSurfaceLine", - MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutSurfaceLine()) - .SetName("calculationWithoutSurfaceLine"); - yield return new TestCaseData("calculationWithoutSoilModel", - MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutSoilModel()) - .SetName("calculationWithoutSoilModel"); - yield return new TestCaseData("calculationWithoutSoilProfile", - MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithoutSoilProfile()) - .SetName("calculationWithoutSoilProfile"); - yield return new TestCaseData("calculationWithNaNs", - MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithNaNs()) - .SetName("calculationWithNaNs"); - yield return new TestCaseData("calculationWithInfinities", - MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationWithInfinities()) - .SetName("calculationWithInfinities"); - } - } - [Test] public void Write_CalculationGroupsAndCalculation_ValidFile() { // Setup string filePath = TestHelper.GetScratchPadPath("test.xml"); - MacroStabilityInwardsCalculation calculation = MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculation(); - - MacroStabilityInwardsCalculation calculation2 = MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculation(); - 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_Macrostabiliteit", string.Empty); - calculation2.InputParameters.StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) + var surfaceline = new RingtoetsMacroStabilityInwardsSurfaceLine { - SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_4_1D1", 0, new[] - { - new MacroStabilityInwardsSoilLayer(0) - }, SoilProfileType.SoilProfile1D, 0) + ReferenceLineIntersectionWorldPoint = new Point2D(0, 5), + Name = "PK001_0001" }; + surfaceline.SetGeometry(new[] + { + new Point3D(0, 0, 0), + new Point3D(0, 10, 0) + }); - var calculationGroup2 = new CalculationGroup("PK001_0002", false) + var calculation = CreateFullCalculationConfiguration(); + + var calculation2 = CreateFullCalculationConfiguration(); + calculation2.Name = "PK001_0002 W1-6_4_1D1"; + calculation2.HydraulicBoundaryLocation = "PUNT_SCH_17"; + calculation2.SurfaceLine = "PK001_0002"; + calculation2.StochasticSoilModel = "PK001_0002_Macrostabiliteit"; + calculation2.StochasticSoilProfile = "W1-6_4_1D1"; + + var calculationGroup2 = new CalculationGroupConfiguration("PK001_0002", new IConfigurationItem[] { - Children = - { - calculation2 - } - }; + calculation2 + }); - var calculationGroup = new CalculationGroup("PK001_0001", false) + var calculationGroup = new CalculationGroupConfiguration("PK001_0001", new IConfigurationItem[] { - Children = - { - calculation, - calculationGroup2 - } - }; + calculation, + calculationGroup2 + }); try { // Call - new MacroStabilityInwardsCalculationConfigurationWriter().Write(new[] + new MacroStabilityInwardsCalculationConfigurationWriter(filePath).Write(new[] { calculationGroup - }, filePath); + }); // Assert Assert.IsTrue(File.Exists(filePath)); string actualXml = File.ReadAllText(filePath); string expectedXmlFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO, - Path.Combine("MacroStabilityInwardsCalculationConfigurationWriter", + Path.Combine(nameof(MacroStabilityInwardsCalculationConfigurationWriter), "folderWithSubfolderAndCalculation.xml")); string expectedXml = File.ReadAllText(expectedXmlFilePath); @@ -130,36 +98,20 @@ } } - [Test] - [TestCaseSource(nameof(Calculations))] - public void Write_ValidCalculation_ValidFile(string expectedFileName, MacroStabilityInwardsCalculation calculation) + private static MacroStabilityInwardsCalculationConfiguration CreateFullCalculationConfiguration() { - // Setup - string filePath = TestHelper.GetScratchPadPath("test.xml"); - - try + return new MacroStabilityInwardsCalculationConfiguration("PK001_0001 W1-6_0_1D1") { - // Call - new MacroStabilityInwardsCalculationConfigurationWriter().Write(new[] - { - calculation - }, filePath); + HydraulicBoundaryLocation = "PUNT_KAT_18", + SurfaceLine = "PK001_0001", + StochasticSoilModel = "PK001_0001_Macrostabiliteit", + StochasticSoilProfile = "W1-6_0_1D1" + }; + } - // Assert - Assert.IsTrue(File.Exists(filePath)); - - string actualXml = File.ReadAllText(filePath); - string expectedXmlFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO, - Path.Combine("MacroStabilityInwardsCalculationConfigurationWriter", - $"{expectedFileName}.xml")); - string expectedXml = File.ReadAllText(expectedXmlFilePath); - - Assert.AreEqual(expectedXml, actualXml); - } - finally - { - File.Delete(filePath); - } + protected override MacroStabilityInwardsCalculationConfigurationWriter CreateWriterInstance(string filePath) + { + return new MacroStabilityInwardsCalculationConfigurationWriter(filePath); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,9 @@ + + + + 3 + PK001_0001 + PK001_0001_Macrostabiliteit + W1-6_0_1D1 + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,9 @@ + + + + -INF + PK001_0001 + PK001_0001_Macrostabiliteit + W1-6_0_1D1 + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,9 @@ + + + + NaN + PK001_0001 + PK001_0001_Macrostabiliteit + W1-6_0_1D1 + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,8 @@ + + + + PK001_0001 + PK001_0001_Macrostabiliteit + W1-6_0_1D1 + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,8 @@ + + + + PUNT_KAT_18 + PK001_0001 + PK001_0001_Macrostabiliteit + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,7 @@ + + + + PUNT_KAT_18 + PK001_0001 + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,8 @@ + + + + PUNT_KAT_18 + PK001_0001_Macrostabiliteit + W1-6_0_1D1 + + \ No newline at end of file Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithAssessmentLevel.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithInfinities.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithNaNs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutHydraulicLocation.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSoilProfile.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSoilmodel.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/calculationWithoutSurfaceline.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs =================================================================== diff -u -r4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -42,7 +42,6 @@ PipingCalculation, PipingCalculationConfiguration> { - private static IEnumerable Calculations { get @@ -127,7 +126,9 @@ public void Write_ValidCalculation_ValidFile(string expectedFileName, PipingCalculation calculation) { // Setup - string expectedXmlFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, Path.Combine("PipingCalculationConfigurationWriter", $"{expectedFileName}.xml")); + string expectedXmlFilePath = TestHelper.GetTestDataPath( + TestDataPath.Ringtoets.Piping.IO, + Path.Combine(nameof(PipingCalculationConfigurationExporter), $"{expectedFileName}.xml")); // Call and Assert WriteAndValidate(new[] Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationWriterTest.cs =================================================================== diff -u -r4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationWriterTest.cs (.../PipingCalculationConfigurationWriterTest.cs) (revision 4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationWriterTest.cs (.../PipingCalculationConfigurationWriterTest.cs) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -88,7 +88,7 @@ string actualXml = File.ReadAllText(filePath); string expectedXmlFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, - Path.Combine("PipingCalculationConfigurationWriter", + Path.Combine(nameof(PipingCalculationConfigurationWriter), "folderWithSubfolderAndCalculation.xml")); string expectedXml = File.ReadAllText(expectedXmlFilePath); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,21 @@ + + + + 3 + PK001_0001 + 0 + 10 + PK001_0001_Piping + W1-6_0_1D1 + + + 0 + 0.1 + + + 0.7 + 0.1 + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,21 @@ + + + + -INF + PK001_0001 + -INF + INF + PK001_0001_Piping + W1-6_0_1D1 + + + -INF + INF + + + INF + INF + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,21 @@ + + + + NaN + PK001_0001 + NaN + NaN + PK001_0001_Piping + W1-6_0_1D1 + + + NaN + NaN + + + NaN + NaN + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,20 @@ + + + + PK001_0001 + 0 + 10 + PK001_0001_Piping + W1-6_0_1D1 + + + 0 + 0.1 + + + 0.7 + 0.1 + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,20 @@ + + + + PUNT_KAT_18 + PK001_0001 + 0 + 10 + PK001_0001_Piping + + + 0 + 0.1 + + + 0.7 + 0.1 + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,19 @@ + + + + PUNT_KAT_18 + PK001_0001 + 0 + 10 + + + 0 + 0.1 + + + 0.7 + 0.1 + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) @@ -0,0 +1,18 @@ + + + + PUNT_KAT_18 + PK001_0001_Piping + W1-6_0_1D1 + + + 0 + 0.1 + + + 0.7 + 0.1 + + + + \ No newline at end of file Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/calculationWithAssessmentLevel.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/calculationWithInfinities.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/calculationWithNaNs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/calculationWithoutHydraulicLocation.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/calculationWithoutSoilProfile.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/calculationWithoutSoilmodel.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5a34759978bfb0c2982463f8f8c2adfc29b1c666 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/calculationWithoutSurfaceline.xml'. Fisheye: No comparison available. Pass `N' to diff?