Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs =================================================================== diff -u -r2539713cb27674daed011f260add32abcaddb958 -r43fb57f1865c214be077f8649799d005fcc07c2c --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision 2539713cb27674daed011f260add32abcaddb958) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -111,7 +111,7 @@ FlowVelocityStructureClosable = calculationElement.GetStochastConfiguration(StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName), FlowWidthAtBottomProtection = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName), ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement), - HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld), + HydraulicBoundaryLocationName = calculationElement.GetHydraulicBoundaryLocationName(), InflowModelType = (ConfigurationStabilityPointStructuresInflowModelType?) calculationElement.GetConvertedValueFromDescendantStringElement( StabilityPointStructuresConfigurationSchemaIdentifiers.InflowModelTypeElement), Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r657fc4dff6a3c7aa33b182078fea0825a107c89c -r43fb57f1865c214be077f8649799d005fcc07c2c --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 657fc4dff6a3c7aa33b182078fea0825a107c89c) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -379,8 +379,10 @@ } [Test] - [TestCase("validFullConfiguration")] - [TestCase("validFullConfiguration_differentOrder")] + [TestCase("validFullConfigurationOld")] + [TestCase("validFullConfigurationNew")] + [TestCase("validFullConfiguration_differentOrder_old")] + [TestCase("validFullConfiguration_differentOrder_new")] public void Read_ValidFullConfigurations_ExpectedValues(string fileName) { // Setup @@ -494,10 +496,12 @@ } [Test] - public void Read_ValidPartialConfigurations_ExpectedValues() + [TestCase("validPartialConfigurationOld")] + [TestCase("validPartialConfigurationNew")] + public void Read_ValidPartialConfigurations_ExpectedValues(string fileName) { // Setup - string filePath = Path.Combine(testDirectoryPath, "validPartialConfiguration.xml"); + string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml"); var reader = new StabilityPointStructuresCalculationConfigurationReader(filePath); // Call Fisheye: Tag 43fb57f1865c214be077f8649799d005fcc07c2c refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationNew.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationNew.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationNew.xml (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -0,0 +1,116 @@ + + + + Locatie1 + 9.81 + 0.01 + kunstwerk1 + 7 + verdronkenkoker + lineair + 0.1 + 2 + 0.001 + 1 + 1E-05 + 0.0001 + true + profiel1 + + true + havendam + 1.23 + false + + + + 6 + 0.12 + + + 0.5 + 0.1 + + + 0.7 + 0.1 + + + 0.1 + 0.12 + + + 0.1 + 0.12 + + + 15.2 + 0.1 + + + 80.5 + 1 + + + 15.2 + 0.1 + + + 15000 + 0.01 + + + 0.2 + 0.01 + + + 4.3 + 0.1 + + + 1.2 + 0.1 + + + 2 + 0.1 + + + 1.1 + 0.12 + + + 2 + 0.1 + + + 2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 16000 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + + \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationOld.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationOld.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationOld.xml (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -0,0 +1,116 @@ + + + + Locatie1 + 9.81 + 0.01 + kunstwerk1 + 7 + verdronkenkoker + lineair + 0.1 + 2 + 0.001 + 1 + 1E-05 + 0.0001 + true + profiel1 + + true + havendam + 1.23 + false + + + + 6 + 0.12 + + + 0.5 + 0.1 + + + 0.7 + 0.1 + + + 0.1 + 0.12 + + + 0.1 + 0.12 + + + 15.2 + 0.1 + + + 80.5 + 1 + + + 15.2 + 0.1 + + + 15000 + 0.01 + + + 0.2 + 0.01 + + + 4.3 + 0.1 + + + 1.2 + 0.1 + + + 2 + 0.1 + + + 1.1 + 0.12 + + + 2 + 0.1 + + + 2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 16000 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + + \ No newline at end of file Fisheye: Tag 43fb57f1865c214be077f8649799d005fcc07c2c refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_new.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_new.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_new.xml (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -0,0 +1,116 @@ + + + + Locatie1 + kunstwerk1 + 7 + true + 0.0001 + profiel1 + 0.1 + 0.01 + 0.001 + verdronkenkoker + lineair + 1 + 1E-05 + 2 + 9.81 + + true + havendam + 1.23 + false + + + + 15.2 + 0.1 + + + 15.2 + 0.1 + + + 15000 + 0.01 + + + 2 + 0.1 + + + 0.1 + 0.12 + + + 0.2 + 0.01 + + + 6 + 0.12 + + + 80.5 + 1 + + + 1.2 + 0.1 + + + 2 + 0.1 + + + 2 + 0.1 + + + 0.1 + 0.12 + + + 1.2 + 0.1 + + + 1.1 + 0.12 + + + 0.5 + 0.1 + + + 0.7 + 0.1 + + + 4.3 + 0.1 + + + 16000 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + + \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_old.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_old.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_old.xml (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -0,0 +1,116 @@ + + + + Locatie1 + kunstwerk1 + 7 + true + 0.0001 + profiel1 + 0.1 + 0.01 + 0.001 + verdronkenkoker + lineair + 1 + 1E-05 + 2 + 9.81 + + true + havendam + 1.23 + false + + + + 15.2 + 0.1 + + + 15.2 + 0.1 + + + 15000 + 0.01 + + + 2 + 0.1 + + + 0.1 + 0.12 + + + 0.2 + 0.01 + + + 6 + 0.12 + + + 80.5 + 1 + + + 1.2 + 0.1 + + + 2 + 0.1 + + + 2 + 0.1 + + + 0.1 + 0.12 + + + 1.2 + 0.1 + + + 1.1 + 0.12 + + + 0.5 + 0.1 + + + 0.7 + 0.1 + + + 4.3 + 0.1 + + + 16000 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + + \ No newline at end of file Fisheye: Tag 43fb57f1865c214be077f8649799d005fcc07c2c refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validPartialConfiguration.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validPartialConfigurationNew.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validPartialConfigurationNew.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validPartialConfigurationNew.xml (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -0,0 +1,30 @@ + + + + Locatie1 + 9.81 + 0.01 + kunstwerk1 + profiel1 + + true + havendam + 1.23 + + + + 6 + + + 0.1 + + + 0.01 + + + 1.2 + 0.1 + + + + \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validPartialConfigurationOld.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validPartialConfigurationOld.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validPartialConfigurationOld.xml (revision 43fb57f1865c214be077f8649799d005fcc07c2c) @@ -0,0 +1,30 @@ + + + + Locatie1 + 9.81 + 0.01 + kunstwerk1 + profiel1 + + true + havendam + 1.23 + + + + 6 + + + 0.1 + + + 0.01 + + + 1.2 + 0.1 + + + + \ No newline at end of file