Index: Ringtoets/Common/src/Ringtoets.Common.IO/Resources/GolfReductieSchema.xsd
===================================================================
diff -u -r3834797c4aa82d6ae80fcd9301853c5babe9da3f -r4f3f2104e2bc7287411c5e59090676ba20c199ae
--- Ringtoets/Common/src/Ringtoets.Common.IO/Resources/GolfReductieSchema.xsd (.../GolfReductieSchema.xsd) (revision 3834797c4aa82d6ae80fcd9301853c5babe9da3f)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Resources/GolfReductieSchema.xsd (.../GolfReductieSchema.xsd) (revision 4f3f2104e2bc7287411c5e59090676ba20c199ae)
@@ -28,12 +28,12 @@
gebruik maakt van dit element.-->
-
+
-
+
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -r4f3f2104e2bc7287411c5e59090676ba20c199ae
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision 4f3f2104e2bc7287411c5e59090676ba20c199ae)
@@ -100,14 +100,14 @@
"The 'damgebruiken' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'")
.SetName("invalidUseBreakWaterNoBoolean");
yield return new TestCaseData("invalidMultipleUseBreakWaters.xml",
- "The element 'golfreductie' has invalid child element 'damgebruiken'.")
+ "Element 'damgebruiken' cannot appear more than once if content model type is \"all\".")
.SetName("invalidMultipleUseBreakWaters");
yield return new TestCaseData("invalidBreakWaterTypeEmpty.xml",
"The 'damtype' element is invalid - The value '' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
.SetName("invalidBreakWaterTypeEmpty");
yield return new TestCaseData("invalidMultipleBreakWaterTypes.xml",
- "The element 'golfreductie' has invalid child element 'damtype'.")
+ "Element 'damtype' cannot appear more than once if content model type is \"all\".")
.SetName("invalidMultipleBreakWaterTypes");
yield return new TestCaseData("invalidBreakWaterTypeUnsupportedString.xml",
"The 'damtype' element is invalid - The value 'invalid' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
@@ -123,7 +123,7 @@
"The 'damhoogte' element is invalid - The value '1,2' is invalid according to its datatype 'Double'")
.SetName("invalidBreakWaterHeightWrongCulture");
yield return new TestCaseData("invalidMultipleBreakWaterHeights.xml",
- "The element 'golfreductie' has invalid child element 'damhoogte'.")
+ "Element 'damhoogte' cannot appear more than once if content model type is \"all\".")
.SetName("invalidMultipleBreakWaterHeights");
yield return new TestCaseData("invalidUseForeshoreEmpty.xml",
@@ -133,7 +133,7 @@
"The 'voorlandgebruiken' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'")
.SetName("invalidUseForeshoreNoBoolean");
yield return new TestCaseData("invalidMultipleUseForeshore.xml",
- "The element 'golfreductie' has invalid child element 'voorlandgebruiken'.")
+ "Element 'voorlandgebruiken' cannot appear more than once if content model type is \"all\".")
.SetName("invalidMultipleUseForeshores");
yield return new TestCaseData("invalidMultipleCriticalFlowRateStochast.xml",
@@ -307,10 +307,12 @@
}
[Test]
- public void Read_ValidConfigurationWithFullCalculation_ReturnExpectedReadCalculation()
+ [TestCase("validConfigurationFullCalculation.xml")]
+ [TestCase("validConfigurationFullCalculation_differentOrder.xml")]
+ public void Read_ValidConfigurationWithFullCalculation_ReturnExpectedReadCalculation(string fileName)
{
// Setup
- string filePath = Path.Combine(testDirectoryPath, "validConfigurationFullCalculation.xml");
+ string filePath = Path.Combine(testDirectoryPath, fileName);
var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath);
// Call
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (revision 0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (revision 4f3f2104e2bc7287411c5e59090676ba20c199ae)
@@ -0,0 +1,22 @@
+
+
+
+
+
+ 0.2
+ 0.1
+
+
+
+ false
+ 1.234
+ havendam
+ true
+
+ norm
+ 3.45
+ 67.1
+ some_dike_profile
+ Some_hydraulic_boundary_location
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -r4f3f2104e2bc7287411c5e59090676ba20c199ae
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 4f3f2104e2bc7287411c5e59090676ba20c199ae)
@@ -71,16 +71,16 @@
"Element 'golfreductie' cannot appear more than once if content model type is \"all\".")
.SetName("invalidCalculationMultipleWaveReduction");
yield return new TestCaseData("invalidCalculationMultipleDamUsage.xml",
- "The element 'golfreductie' has invalid child element 'damgebruiken'.")
+ "Element 'damgebruiken' cannot appear more than once if content model type is \"all\".")
.SetName("invalidCalculationMultipleDamUsage");
yield return new TestCaseData("invalidCalculationMultipleDamType.xml",
- "The element 'golfreductie' has invalid child element 'damtype'.")
+ "Element 'damtype' cannot appear more than once if content model type is \"all\".")
.SetName("invalidCalculationMultipleDamType");
yield return new TestCaseData("invalidCalculationMultipleDamHeight.xml",
- "The element 'golfreductie' has invalid child element 'damhoogte'.")
+ "Element 'damhoogte' cannot appear more than once if content model type is \"all\".")
.SetName("invalidCalculationMultipleDamHeight");
yield return new TestCaseData("invalidCalculationMultipleForeshoreUsage.xml",
- "The element 'golfreductie' has invalid child element 'voorlandgebruiken'.")
+ "Element 'voorlandgebruiken' cannot appear more than once if content model type is \"all\".")
.SetName("invalidCalculationMultipleForeshoreUsage");
yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml",
"The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
@@ -310,10 +310,12 @@
}
[Test]
- public void Read_ValidConfigurationWithFullCalculation_ReturnExpectedReadWaveConditionsCalculation()
+ [TestCase("validConfigurationFullCalculation.xml")]
+ [TestCase("validConfigurationFullCalculation_differentOrder.xml")]
+ public void Read_ValidConfigurationWithFullCalculation_ReturnExpectedReadWaveConditionsCalculation(string fileName)
{
// Setup
- string filePath = Path.Combine(testDirectoryPath, "validConfigurationFullCalculation.xml");
+ string filePath = Path.Combine(testDirectoryPath, fileName);
var reader = new WaveConditionsCalculationConfigurationReader(filePath);
// Call
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (revision 4f3f2104e2bc7287411c5e59090676ba20c199ae)
@@ -0,0 +1,19 @@
+
+
+
+
+ false
+ 6.6
+ true
+ caisson
+
+ 5.5
+ Voorlandprofiel
+ 0.5
+ 4.4
+ 3.3
+ 2.2
+ 1.1
+ HRlocatie
+
+