Index: Ringtoets/Common/src/Ringtoets.Common.IO/Resources/GolfReductieSchema.xsd
===================================================================
diff -u -rb84f4b9c37b5ce0bd49b65269c4984c0bc1543e8 -r3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd
--- Ringtoets/Common/src/Ringtoets.Common.IO/Resources/GolfReductieSchema.xsd (.../GolfReductieSchema.xsd) (revision b84f4b9c37b5ce0bd49b65269c4984c0bc1543e8)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Resources/GolfReductieSchema.xsd (.../GolfReductieSchema.xsd) (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -28,12 +28,12 @@
gebruik maakt van dit element.-->
-
+
-
+
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs
===================================================================
diff -u -rd2d252d2b40a3c449f0ce7e7c7344213543af590 -r3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision d2d252d2b40a3c449f0ce7e7c7344213543af590)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -165,7 +165,7 @@
// Assert
var exception = Assert.Throws(call);
Assert.IsInstanceOf(exception.InnerException);
- Assert.IsTrue(exception.InnerException?.Message.Contains(expectedParsingMessage));
+ StringAssert.Contains(expectedParsingMessage, exception.InnerException?.Message);
}
[Test]
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsInputConfigurationReaderTest.cs
===================================================================
diff -u -r7cccf1ec324774f5cc68ce9efcb7754b757c9370 -r3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsInputConfigurationReaderTest.cs (.../WaveConditionsInputConfigurationReaderTest.cs) (revision 7cccf1ec324774f5cc68ce9efcb7754b757c9370)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsInputConfigurationReaderTest.cs (.../WaveConditionsInputConfigurationReaderTest.cs) (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -64,6 +64,21 @@
yield return new TestCaseData("invalidCalculationMultipleStepSize.xml",
"The element 'berekening' has invalid child element 'stapgrootte'.")
.SetName("invalidCalculationMultipleStepSize");
+ yield return new TestCaseData("invalidCalculationMultipleWaveReduction.xml",
+ "The element 'berekening' has invalid child element 'golfreductie'.")
+ .SetName("invalidCalculationMultipleWaveReduction");
+ yield return new TestCaseData("invalidCalculationMultipleDamUsage.xml",
+ "The element 'golfreductie' has invalid child element 'damgebruiken'.")
+ .SetName("invalidCalculationMultipleDamUsage");
+ yield return new TestCaseData("invalidCalculationMultipleDamType.xml",
+ "The element 'golfreductie' has invalid child element 'damtype'.")
+ .SetName("invalidCalculationMultipleDamType");
+ yield return new TestCaseData("invalidCalculationMultipleDamHeight.xml",
+ "The element 'golfreductie' has invalid child element 'damhoogte'.")
+ .SetName("invalidCalculationMultipleDamHeight");
+ yield return new TestCaseData("invalidCalculationMultipleForeshoreUsage.xml",
+ "The element 'golfreductie' has invalid child element 'voorlandgebruiken'.")
+ .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.")
.SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation");
@@ -127,6 +142,33 @@
yield return new TestCaseData("invalidOrientationWrongCulture.xml",
"The 'orientatie' element is invalid - The value '0,5' is invalid according to its datatype 'Double'")
.SetName("invalidOrientationWrongCulture");
+ yield return new TestCaseData("invalidDamUsageEmpty.xml",
+ "The 'damgebruiken' element is invalid - The value '' is invalid according to its datatype 'Boolean'")
+ .SetName("invalidDamUsageEmpty");
+ yield return new TestCaseData("invalidDamUsageNoBoolean.xml",
+ "The 'damgebruiken' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'")
+ .SetName("invalidDamUsageNoBoolean");
+ yield return new TestCaseData("invalidDamTypeEmpty.xml",
+ "The 'damtype' element is invalid - The value '' is invalid according to its datatype 'String'")
+ .SetName("invalidDamTypeEmpty");
+ yield return new TestCaseData("invalidDamTypeUnknownValue.xml",
+ "The 'damtype' element is invalid - The value 'text' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
+ .SetName("invalidDamTypeUnknownValue");
+ yield return new TestCaseData("invalidDamHeightEmpty.xml",
+ "The 'damhoogte' element is invalid - The value '' is invalid according to its datatype 'Double'")
+ .SetName("invalidDamHeightEmpty");
+ yield return new TestCaseData("invalidDamHeightNoDouble.xml",
+ "The 'damhoogte' element is invalid - The value 'string' is invalid according to its datatype 'Double'")
+ .SetName("invalidDamHeightNoDouble");
+ yield return new TestCaseData("invalidDamHeightWrongCulture.xml",
+ "The 'damhoogte' element is invalid - The value '0,5' is invalid according to its datatype 'Double'")
+ .SetName("invalidDamHeightWrongCulture");
+ yield return new TestCaseData("invalidForeshoreUsageEmpty.xml",
+ "The 'voorlandgebruiken' element is invalid - The value '' is invalid according to its datatype 'Boolean'")
+ .SetName("invalidForeshoreUsageEmpty");
+ yield return new TestCaseData("invalidForeshoreUsageNoBoolean.xml",
+ "The 'voorlandgebruiken' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'")
+ .SetName("invalidForeshoreUsageNoBoolean");
}
}
@@ -156,7 +198,7 @@
// Assert
var exception = Assert.Throws(call);
Assert.IsInstanceOf(exception.InnerException);
- Assert.IsTrue(exception.InnerException?.Message.Contains(expectedParsingMessage));
+ StringAssert.Contains(expectedParsingMessage, exception.InnerException?.Message);
}
}
}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamHeight.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamHeight.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamHeight.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,9 @@
+
+
+
+
+ 1.3
+ 1.2
+
+
+
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamType.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamType.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamType.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,9 @@
+
+
+
+
+ verticalewand
+ havendam
+
+
+
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamUsage.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamUsage.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleDamUsage.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,9 @@
+
+
+
+
+ true
+ false
+
+
+
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleForeshoreUsage.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleForeshoreUsage.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleForeshoreUsage.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,9 @@
+
+
+
+
+ true
+ false
+
+
+
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleWaveReduction.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleWaveReduction.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidCalculationMultipleWaveReduction.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightEmpty.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightEmpty.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightEmpty.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightNoDouble.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightNoDouble.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightNoDouble.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+ string
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightWrongCulture.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightWrongCulture.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamHeightWrongCulture.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+ 0,5
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamTypeEmpty.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamTypeEmpty.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamTypeEmpty.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamTypeUnknownValue.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamTypeUnknownValue.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamTypeUnknownValue.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+ text
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamUsageEmpty.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamUsageEmpty.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamUsageEmpty.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamUsageNoBoolean.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamUsageNoBoolean.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidDamUsageNoBoolean.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+ string
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidForeshoreUsageEmpty.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidForeshoreUsageEmpty.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidForeshoreUsageEmpty.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidForeshoreUsageNoBoolean.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidForeshoreUsageNoBoolean.xml (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsInputConfigurationReader/invalidForeshoreUsageNoBoolean.xml (revision 3fbce64e43a4c8bcd6928e9f5df916a0bc47c8dd)
@@ -0,0 +1,8 @@
+
+
+
+
+ string
+
+
+
\ No newline at end of file