Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -48,6 +48,12 @@
                 yield return new TestCaseData("invalidAssessmentLevelNoDouble.xml",
                                               "The 'toetspeil' element is invalid - The value 'string' is invalid according to its datatype 'Double'")
                     .SetName("invalidAssessmentLevelNoDouble");
+                yield return new TestCaseData("invalidWaterLevelEmpty.xml",
+                                              "The 'waterstand' element is invalid - The value '' is invalid according to its datatype 'Double'")
+                    .SetName("invalidWaterLevelEmpty");
+                yield return new TestCaseData("invalidWaterLevelNoDouble.xml",
+                                              "The 'waterstand' element is invalid - The value 'string' is invalid according to its datatype 'Double'")
+                    .SetName("invalidWaterLevelNoDouble");
                 yield return new TestCaseData("invalidEntryPointEmpty.xml",
                                               "The 'intredepunt' element is invalid - The value '' is invalid according to its datatype 'Double'")
                     .SetName("invalidEntryPointEmpty");
@@ -90,15 +96,30 @@
                 yield return new TestCaseData("invalidMultipleDampingFactorExitStochast.xml",
                                               "There is a duplicate key sequence 'dempingsfactor' for the 'uniqueStochastNameConstraint' key or unique identity constraint.")
                     .SetName("invalidMultipleDampingFactorExitStochast");
-                yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml",
+                yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml",
                                               "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation");
+                    .SetName("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld");
+                yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml",
+                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew");
+                yield return new TestCaseData("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml",
+                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld");
+                yield return new TestCaseData("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml",
+                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew");
                 yield return new TestCaseData("invalidCalculationMultipleAssessmentLevel.xml",
                                               "Element 'toetspeil' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleAssessmentLevel");
-                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocation.xml",
+                yield return new TestCaseData("invalidCalculationMultipleWaterLevel.xml",
+                                              "Element 'waterstand' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidCalculationMultipleWaterLevel");
+                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationOld.xml",
                                               "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocation");
+                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationOld");
+                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationNew.xml",
+                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationNew");
                 yield return new TestCaseData("invalidCalculationMultipleSurfaceLine.xml",
                                               "Element 'profielschematisatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleSurfaceLine");
@@ -117,9 +138,12 @@
                 yield return new TestCaseData("invalidCalculationMultipleStochasts.xml",
                                               "Element 'stochasten' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleStochasts");
-                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml",
+                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld.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");
+                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld");
+                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew.xml",
+                                              "The 'hblocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
+                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew");
                 yield return new TestCaseData("invalidConfigurationCalculationContainingEmptySurfaceLine.xml",
                                               "The 'profielschematisatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
                     .SetName("invalidConfigurationCalculationContainingEmptySurfaceLine");
@@ -150,6 +174,12 @@
                 yield return new TestCaseData("invalidScenarioRelevantNoBoolean.xml",
                                               "The 'gebruik' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'")
                     .SetName("invalidScenarioRelevantNoBoolean");
+                yield return new TestCaseData("invalidContainingBothAssessmentLevelAndWaterLevel.xml",
+                                              "Element 'toetspeil' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidContainingBothAssessmentLevelAndWaterLevel");
+                yield return new TestCaseData("invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml",
+                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidContainingBothHydraulicBoundaryLocationOldAndNew");
             }
         }
 
Fisheye: Tag 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie>HRlocatie 1</hblocatie>
+    <hblocatie>HRlocatie 2</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie>HRlocatie 1</hrlocatie>
+    <hrlocatie>HRlocatie 2</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <waterstand>2.2</waterstand>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <toetspeil>1.1</toetspeil>
+    <hblocatie>HBlocatie</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <toetspeil>1.1</toetspeil>
+    <hrlocatie>HRlocatie</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndWaterLevel.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndWaterLevel.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndWaterLevel.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <toetspeil>2.2</toetspeil>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie>HBlocatie</hblocatie>
+    <hrlocatie>HBlocatie</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <hblocatie>HBlocatie</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <hrlocatie>HBlocatie</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelEmpty.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelEmpty.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelEmpty.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelNoDouble.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelNoDouble.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelNoDouble.xml	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>string</waterstand>
+  </berekening>
+</configuratie>
\ No newline at end of file