Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exporters/PipingConfigurationExporterTest.cs =================================================================== diff -u -raf27351920210528ed4f8e121bcca04f6400434d -r69617e58c64b2b6a92da02e30c308e77f9176968 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exporters/PipingConfigurationExporterTest.cs (.../PipingConfigurationExporterTest.cs) (revision af27351920210528ed4f8e121bcca04f6400434d) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exporters/PipingConfigurationExporterTest.cs (.../PipingConfigurationExporterTest.cs) (revision 69617e58c64b2b6a92da02e30c308e77f9176968) @@ -78,17 +78,18 @@ // Setup string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, "PipingConfigurationWriter"); - Directory.CreateDirectory(directoryPath); string filePath = Path.Combine(directoryPath, "test.xml"); - var calculation = PipingTestDataGenerator.GetPipingCalculation(); - calculation.InputParameters.ExitPointL = (RoundedDouble)0.2; + PipingCalculation calculation = PipingTestDataGenerator.GetPipingCalculation(); + calculation.InputParameters.EntryPointL = (RoundedDouble) 0.1; + calculation.InputParameters.ExitPointL = (RoundedDouble) 0.2; - var calculation2 = PipingTestDataGenerator.GetPipingCalculation(); + PipingCalculation calculation2 = PipingTestDataGenerator.GetPipingCalculation(); 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.ExitPointL = (RoundedDouble)0.2; + calculation2.InputParameters.EntryPointL = (RoundedDouble) 0.3; + calculation2.InputParameters.ExitPointL = (RoundedDouble) 0.4; calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Piping", string.Empty); calculation2.InputParameters.StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) { @@ -123,21 +124,20 @@ } }; - var expoter = new PipingConfigurationExporter(rootGroup, filePath); + var exporter = new PipingConfigurationExporter(rootGroup, filePath); try { // Call - bool isExported = expoter.Export(); + bool isExported = exporter.Export(); // Assert Assert.IsTrue(isExported); Assert.IsTrue(File.Exists(filePath)); - var actualXml = File.ReadAllText(filePath); - var expectedXml = File.ReadAllText(Path.Combine(directoryPath, "folderWithSubfolderAndCalculation.xml")); + string actualXml = File.ReadAllText(filePath); + string expectedXml = File.ReadAllText(Path.Combine(directoryPath, "folderWithSubfolderAndCalculation.xml")); - Assert.AreEqual(expectedXml, actualXml); } finally @@ -170,7 +170,7 @@ using (new DirectoryPermissionsRevoker(directoryPath, FileSystemRights.Write)) { // Call - bool isExported = true; + var isExported = true; Action call = () => isExported = exporter.Export(); // Assert Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exporters/PipingConfigurationWriterTest.cs =================================================================== diff -u -r82d0d520e61fceff9d0acacd0e46f07048239a6e -r69617e58c64b2b6a92da02e30c308e77f9176968 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exporters/PipingConfigurationWriterTest.cs (.../PipingConfigurationWriterTest.cs) (revision 82d0d520e61fceff9d0acacd0e46f07048239a6e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exporters/PipingConfigurationWriterTest.cs (.../PipingConfigurationWriterTest.cs) (revision 69617e58c64b2b6a92da02e30c308e77f9176968) @@ -39,6 +39,32 @@ [TestFixture] public class PipingConfigurationWriterTest { + private static IEnumerable Calculations + { + get + { + yield return new TestCaseData("calculationWithoutHydraulicLocation", + PipingTestDataGenerator.GetPipingCalculationWithoutHydraulicLocationAndAssessmentLevel()) + .SetName("calculationWithoutHydraulicLocation"); + + yield return new TestCaseData("calculationWithAssessmentLevel", + PipingTestDataGenerator.GetPipingCalculationWithAssessmentLevel()) + .SetName("calculationWithAssessmentLevel"); + + yield return new TestCaseData("calculationWithoutSurfaceLine", + PipingTestDataGenerator.GetPipingCalculationWithoutSurfaceLine()) + .SetName("calculationWithoutSurfaceLine"); + + yield return new TestCaseData("calculationWithoutSoilModel", + PipingTestDataGenerator.GetPipingCalculationWithoutSoilModel()) + .SetName("calculationWithoutSoilModel"); + + yield return new TestCaseData("calculationWithoutSoilProfile", + PipingTestDataGenerator.GetPipingCalculationWithoutSoilProfile()) + .SetName("calculationWithoutSoilProfile"); + } + } + [Test] public void Write_CalculationGroupNull_ThrowArgumentNullException() { @@ -125,21 +151,22 @@ // Setup string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, "PipingConfigurationWriter"); - Directory.CreateDirectory(directoryPath); string filePath = Path.Combine(directoryPath, "test.xml"); - var calculation = PipingTestDataGenerator.GetPipingCalculation(); + PipingCalculation calculation = PipingTestDataGenerator.GetPipingCalculation(); + calculation.InputParameters.EntryPointL = (RoundedDouble) 0.1; calculation.InputParameters.ExitPointL = (RoundedDouble) 0.2; - var calculation2 = PipingTestDataGenerator.GetPipingCalculation(); + PipingCalculation calculation2 = PipingTestDataGenerator.GetPipingCalculation(); 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.ExitPointL = (RoundedDouble) 0.2; + calculation2.InputParameters.EntryPointL = (RoundedDouble) 0.3; + calculation2.InputParameters.ExitPointL = (RoundedDouble) 0.4; calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Piping", string.Empty); calculation2.InputParameters.StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile("W1-6_4_1D1", 0, new [] + SoilProfile = new PipingSoilProfile("W1-6_4_1D1", 0, new[] { new PipingSoilLayer(0) }, SoilProfileType.SoilProfile1D, 0) @@ -178,10 +205,9 @@ // Assert Assert.IsTrue(File.Exists(filePath)); - var actualXml = File.ReadAllText(filePath); - var expectedXml = File.ReadAllText(Path.Combine(directoryPath, "folderWithSubfolderAndCalculation.xml")); + string actualXml = File.ReadAllText(filePath); + string expectedXml = File.ReadAllText(Path.Combine(directoryPath, "folderWithSubfolderAndCalculation.xml")); - Assert.AreEqual(expectedXml, actualXml); } finally @@ -197,11 +223,15 @@ // Setup string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, "PipingConfigurationWriter"); - Directory.CreateDirectory(directoryPath); string filePath = Path.Combine(directoryPath, "test.xml"); - var rootCalculationGroup = new CalculationGroup("group", false); - rootCalculationGroup.Children.Add(calculation); + var rootCalculationGroup = new CalculationGroup("group", false) + { + Children = + { + calculation + } + }; try { @@ -211,8 +241,8 @@ // Assert Assert.IsTrue(File.Exists(filePath)); - var actualXml = File.ReadAllText(filePath); - var expectedXml = File.ReadAllText(Path.Combine(directoryPath, $"{expectedFileName}.xml")); + string actualXml = File.ReadAllText(filePath); + string expectedXml = File.ReadAllText(Path.Combine(directoryPath, $"{expectedFileName}.xml")); Assert.AreEqual(expectedXml, actualXml); } @@ -221,31 +251,5 @@ File.Delete(filePath); } } - - private static IEnumerable Calculations - { - get - { - yield return new TestCaseData("calculationWithoutHydraulicLocation", - PipingTestDataGenerator.GetPipingCalculationWithoutHydraulicLocationAndAssessmentLevel()) - .SetName("calculationWithoutHydraulicLocation"); - - yield return new TestCaseData("calculationWithAssessmentLevel", - PipingTestDataGenerator.GetPipingCalculationWithAssessmentLevel()) - .SetName("calculationWithAssessmentLevel"); - - yield return new TestCaseData("calculationWithoutSurfaceLine", - PipingTestDataGenerator.GetPipingCalculationWithoutSurfaceLine()) - .SetName("calculationWithoutSurfaceLine"); - - yield return new TestCaseData("calculationWithoutSoilModel", - PipingTestDataGenerator.GetPipingCalculationWithoutSoilModel()) - .SetName("calculationWithoutSoilModel"); - - yield return new TestCaseData("calculationWithoutSoilProfile", - PipingTestDataGenerator.GetPipingCalculationWithoutSoilProfile()) - .SetName("calculationWithoutSoilProfile"); - } - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rfa2634f050b168fadd328ed154706389e0e722d7 -r69617e58c64b2b6a92da02e30c308e77f9176968 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision fa2634f050b168fadd328ed154706389e0e722d7) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 69617e58c64b2b6a92da02e30c308e77f9176968) @@ -4,7 +4,7 @@ PUNT_KAT_18 PK001_0001 - 0.00 + 0.10 0.20 PK001_0001_Piping W1-6_0_1D1 @@ -23,8 +23,8 @@ PUNT_SCH_17 PK001_0002 - 0.00 - 0.20 + 0.30 + 0.40 PK001_0002_Piping W1-6_4_1D1 Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs =================================================================== diff -u -r12a9ead82127655ac387f26588ac84f40d10ef3d -r69617e58c64b2b6a92da02e30c308e77f9176968 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs (.../PipingTestDataGeneratorTest.cs) (revision 12a9ead82127655ac387f26588ac84f40d10ef3d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs (.../PipingTestDataGeneratorTest.cs) (revision 69617e58c64b2b6a92da02e30c308e77f9176968) @@ -23,9 +23,9 @@ using System.Linq; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Data; -using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Integration.TestUtils.Test { @@ -50,7 +50,7 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); - var hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated(); + HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated(); // Call PipingTestDataGenerator.ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydraulicBoundaryLocation); @@ -190,13 +190,13 @@ Assert.AreEqual(0.1, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); } - private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculations, - TestHydraulicBoundaryLocation hydraulicBoundaryLocation) + private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup, + HydraulicBoundaryLocation hydraulicBoundaryLocation) { IEnumerable calculationsWithHydraulicBoundaryLocation = - calculations.Children - .OfType() - .Where(calc => calc.InputParameters.HydraulicBoundaryLocation != null); + calculationGroup.Children + .OfType() + .Where(calc => calc.InputParameters.HydraulicBoundaryLocation != null); foreach (PipingCalculation calculation in calculationsWithHydraulicBoundaryLocation) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs =================================================================== diff -u -r12a9ead82127655ac387f26588ac84f40d10ef3d -r69617e58c64b2b6a92da02e30c308e77f9176968 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision 12a9ead82127655ac387f26588ac84f40d10ef3d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision 69617e58c64b2b6a92da02e30c308e77f9176968) @@ -70,7 +70,7 @@ calculation.InputParameters.UseAssessmentLevelManualInput = true; calculation.InputParameters.AssessmentLevel = (RoundedDouble) 3.0; - return calculation; + return calculation; } /// @@ -168,7 +168,7 @@ /// This method assumes is a newly /// created instance. public static void ConfigureFailureMechanismWithAllCalculationConfigurations(PipingFailureMechanism failureMechanism, - HydraulicBoundaryLocation hydraulicBoundaryLocation) + HydraulicBoundaryLocation hydraulicBoundaryLocation) { var surfaceline1 = new RingtoetsPipingSurfaceLine {