Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r2539713cb27674daed011f260add32abcaddb958 -r95ebee00d81b5da3fd34d1a148331bc93a6ae80c
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision 2539713cb27674daed011f260add32abcaddb958)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -106,7 +106,7 @@
ProbabilityOpenStructureBeforeFlooding = calculationElement.GetDoubleValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.ProbabilityOpenStructureBeforeFlooding),
IdenticalApertures = calculationElement.GetIntegerValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.IdenticalApertures),
ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
- HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld),
+ HydraulicBoundaryLocationName = calculationElement.GetHydraulicBoundaryLocationName(),
StructureId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
WaveReduction = calculationElement.GetWaveReductionParameters(),
AreaFlowApertures = calculationElement.GetStochastConfiguration(ClosingStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName),
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rf2065f1cf7559c364a201381f08c0985044e7a1d -r95ebee00d81b5da3fd34d1a148331bc93a6ae80c
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision f2065f1cf7559c364a201381f08c0985044e7a1d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -338,8 +338,10 @@
}
[Test]
- [TestCase("validFullConfiguration")]
- [TestCase("validFullConfiguration_differentOrder")]
+ [TestCase("validFullConfigurationOld")]
+ [TestCase("validFullConfiguration_differentOrder_old")]
+ [TestCase("validFullConfigurationNew")]
+ [TestCase("validFullConfiguration_differentOrder_new")]
public void Read_ValidFullConfigurations_ExpectedValues(string fileName)
{
// Setup
@@ -507,10 +509,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 ClosingStructuresCalculationConfigurationReader(filePath);
// Call
Fisheye: Tag 95ebee00d81b5da3fd34d1a148331bc93a6ae80c refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfigurationNew.xml
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfigurationNew.xml (revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfigurationNew.xml (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -0,0 +1,72 @@
+
+
+
+ Locatie1
+ kunstwerk1
+ 67.1
+ 0.001
+ 0.002
+ 0.03
+ 0.22
+ 0.0006
+ 4
+ verticalewand
+ profiel1
+
+ true
+ havendam
+ 1.234
+ true
+
+
+
+ 6.0
+ 0.12
+
+
+ 1.10
+ 0.12
+
+
+ 15.2
+ 0.1
+
+
+ 15.2
+ 0.1
+
+
+ 15000
+ 0.01
+
+
+ 0.2
+ 0.01
+
+
+ 2
+ 0.1
+
+
+ 1.1
+ 0.1
+
+
+ 0.5
+ 0.1
+
+
+ 80.5
+ 1
+
+
+ 1.2
+ 0.1
+
+
+ 4.3
+ 0.2
+
+
+
+
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfigurationOld.xml
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfigurationOld.xml (revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfigurationOld.xml (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -0,0 +1,72 @@
+
+
+
+ Locatie1
+ kunstwerk1
+ 67.1
+ 0.001
+ 0.002
+ 0.03
+ 0.22
+ 0.0006
+ 4
+ verticalewand
+ profiel1
+
+ true
+ havendam
+ 1.234
+ true
+
+
+
+ 6.0
+ 0.12
+
+
+ 1.10
+ 0.12
+
+
+ 15.2
+ 0.1
+
+
+ 15.2
+ 0.1
+
+
+ 15000
+ 0.01
+
+
+ 0.2
+ 0.01
+
+
+ 2
+ 0.1
+
+
+ 1.1
+ 0.1
+
+
+ 0.5
+ 0.1
+
+
+ 80.5
+ 1
+
+
+ 1.2
+ 0.1
+
+
+ 4.3
+ 0.2
+
+
+
+
Fisheye: Tag 95ebee00d81b5da3fd34d1a148331bc93a6ae80c refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_new.xml
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_new.xml (revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_new.xml (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -0,0 +1,72 @@
+
+
+
+
+
+ 1.1
+ 0.1
+
+
+ 0.5
+ 0.1
+
+
+ 80.5
+ 1
+
+
+ 1.2
+ 0.1
+
+
+ 4.3
+ 0.2
+
+
+ 6.0
+ 0.12
+
+
+ 2
+ 0.1
+
+
+ 1.10
+ 0.12
+
+
+ 15.2
+ 0.1
+
+
+ 15000
+ 0.01
+
+
+ 15.2
+ 0.1
+
+
+ 0.2
+ 0.01
+
+
+
+ true
+ 1.234
+ havendam
+ true
+
+ profiel1
+ verticalewand
+ 4
+ 0.0006
+ 0.22
+ 0.03
+ 0.002
+ 0.001
+ 67.1
+ kunstwerk1
+ Locatie1
+
+
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_old.xml
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_old.xml (revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_old.xml (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -0,0 +1,72 @@
+
+
+
+
+
+ 1.1
+ 0.1
+
+
+ 0.5
+ 0.1
+
+
+ 80.5
+ 1
+
+
+ 1.2
+ 0.1
+
+
+ 4.3
+ 0.2
+
+
+ 6.0
+ 0.12
+
+
+ 2
+ 0.1
+
+
+ 1.10
+ 0.12
+
+
+ 15.2
+ 0.1
+
+
+ 15000
+ 0.01
+
+
+ 15.2
+ 0.1
+
+
+ 0.2
+ 0.01
+
+
+
+ true
+ 1.234
+ havendam
+ true
+
+ profiel1
+ verticalewand
+ 4
+ 0.0006
+ 0.22
+ 0.03
+ 0.002
+ 0.001
+ 67.1
+ kunstwerk1
+ Locatie1
+
+
Fisheye: Tag 95ebee00d81b5da3fd34d1a148331bc93a6ae80c refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validPartialConfiguration.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validPartialConfigurationNew.xml
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validPartialConfigurationNew.xml (revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validPartialConfigurationNew.xml (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -0,0 +1,26 @@
+
+
+
+ Locatie1
+ profiel1
+
+ true
+ true
+
+
+
+ 6.0
+
+
+ 0.1
+
+
+ 15000
+
+
+ 2
+ 0.1
+
+
+
+
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validPartialConfigurationOld.xml
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validPartialConfigurationOld.xml (revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/validPartialConfigurationOld.xml (revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
@@ -0,0 +1,26 @@
+
+
+
+ Locatie1
+ profiel1
+
+ true
+ true
+
+
+
+ 6.0
+
+
+ 0.1
+
+
+ 15000
+
+
+ 2
+ 0.1
+
+
+
+