Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructuresParameterRowsValidatorTest.cs
===================================================================
diff -u -rdcbb6f2651d8901f3bd2bfa2b2f9a0aa76fd8830 -re2f6cc5264140cea6d5a3559fdbf400eb123551f
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructuresParameterRowsValidatorTest.cs	(.../StructuresParameterRowsValidatorTest.cs)	(revision dcbb6f2651d8901f3bd2bfa2b2f9a0aa76fd8830)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructuresParameterRowsValidatorTest.cs	(.../StructuresParameterRowsValidatorTest.cs)	(revision e2f6cc5264140cea6d5a3559fdbf400eb123551f)
@@ -1694,6 +1694,87 @@
             CollectionAssert.AreEqual(expectedParameterRows, parameters);
         }
 
+        #region Height structures
+
+        private static List<StructuresParameterRow> GetAllValidHeightStructuresParameterRows()
+        {
+            return new List<StructuresParameterRow>
+            {
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword1,
+                    NumericalValue = 180.0,
+                    LineNumber = 1
+                },
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword2,
+                    NumericalValue = 5.9,
+                    VarianceValue = 0.01,
+                    VarianceType = VarianceType.StandardDeviation,
+                    LineNumber = 2
+                },
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword3,
+                    NumericalValue = 18.5,
+                    VarianceValue = 0.05,
+                    VarianceType = VarianceType.StandardDeviation,
+                    LineNumber = 3
+                },
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword4,
+                    NumericalValue = 0.1,
+                    VarianceValue = 0.15,
+                    VarianceType = VarianceType.CoefficientOfVariation,
+                    LineNumber = 4
+                },
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword5,
+                    NumericalValue = 4,
+                    VarianceValue = 0.05,
+                    VarianceType = VarianceType.StandardDeviation,
+                    LineNumber = 5
+                },
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword6,
+                    NumericalValue = 1,
+                    LineNumber = 6
+                },
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword7,
+                    NumericalValue = 500000,
+                    VarianceValue = 0.1,
+                    VarianceType = VarianceType.CoefficientOfVariation,
+                    LineNumber = 7
+                },
+                new StructuresParameterRow
+                {
+                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword8,
+                    NumericalValue = 6.5,
+                    VarianceValue = 0.1,
+                    VarianceType = VarianceType.StandardDeviation,
+                    LineNumber = 8
+                }
+            };
+        }
+
+        private static IEnumerable<TestCaseData> HeightStructureParameters()
+        {
+            foreach (StructuresParameterRow parameterRow in GetAllValidHeightStructuresParameterRows())
+            {
+                yield return new TestCaseData(parameterRow).SetName(parameterRow.ParameterId);
+            }
+        }
+
+        #endregion
+
+        #region Closing structures
+
         private static List<StructuresParameterRow> GetAllValidClosingStructuresParameterRows()
         {
             return new List<StructuresParameterRow>
@@ -1809,73 +1890,18 @@
             };
         }
 
-        private static List<StructuresParameterRow> GetAllValidHeightStructuresParameterRows()
+        private static IEnumerable<TestCaseData> ClosingStructureParameters()
         {
-            return new List<StructuresParameterRow>
+            foreach (StructuresParameterRow parameterRow in GetAllValidClosingStructuresParameterRows())
             {
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword1,
-                    NumericalValue = 180.0,
-                    LineNumber = 1
-                },
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword2,
-                    NumericalValue = 5.9,
-                    VarianceValue = 0.01,
-                    VarianceType = VarianceType.StandardDeviation,
-                    LineNumber = 2
-                },
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword3,
-                    NumericalValue = 18.5,
-                    VarianceValue = 0.05,
-                    VarianceType = VarianceType.StandardDeviation,
-                    LineNumber = 3
-                },
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword4,
-                    NumericalValue = 0.1,
-                    VarianceValue = 0.15,
-                    VarianceType = VarianceType.CoefficientOfVariation,
-                    LineNumber = 4
-                },
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword5,
-                    NumericalValue = 4,
-                    VarianceValue = 0.05,
-                    VarianceType = VarianceType.StandardDeviation,
-                    LineNumber = 5
-                },
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword6,
-                    NumericalValue = 1,
-                    LineNumber = 6
-                },
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword7,
-                    NumericalValue = 500000,
-                    VarianceValue = 0.1,
-                    VarianceType = VarianceType.CoefficientOfVariation,
-                    LineNumber = 7
-                },
-                new StructuresParameterRow
-                {
-                    ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword8,
-                    NumericalValue = 6.5,
-                    VarianceValue = 0.1,
-                    VarianceType = VarianceType.StandardDeviation,
-                    LineNumber = 8
-                }
-            };
+                yield return new TestCaseData(parameterRow).SetName(parameterRow.ParameterId);
+            }
         }
 
+        #endregion
+
+        #region Stability point structures
+
         private static List<StructuresParameterRow> GetAllValidStabilityPointStructuresParameterRows()
         {
             return new List<StructuresParameterRow>
@@ -2049,327 +2075,14 @@
             };
         }
 
-        private static IEnumerable<TestCaseData> HeightStructureParameters()
-        {
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword1,
-                NumericalValue = 180.0
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword1);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword2,
-                NumericalValue = 5.9,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword2);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword3,
-                NumericalValue = 18.5,
-                VarianceValue = 0.05,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword3);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword4,
-                NumericalValue = 0.1,
-                VarianceValue = 0.15,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword4);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword5,
-                NumericalValue = 4,
-                VarianceValue = 0.05,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword5);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword6,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword6);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword7,
-                NumericalValue = 500000,
-                VarianceValue = 0.1,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword7);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.HeightStructureParameterKeyword8,
-                NumericalValue = 6.5,
-                VarianceValue = 0.1,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.HeightStructureParameterKeyword8);
-        }
-
-        private static IEnumerable<TestCaseData> ClosingStructureParameters()
-        {
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword1,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword1);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword2,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword2);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword3,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword3);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword4,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword4);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword5,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword5);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword6,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword6);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword7,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword7);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword8,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword8);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword9,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword9);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword10,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword10);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword11,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword11);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword12,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword12);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword13,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword13);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword14,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword14);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.ClosingStructureParameterKeyword15,
-                AlphanumericValue = "LageDrempel"
-            }).SetName(StructureFilesKeywords.ClosingStructureParameterKeyword15);
-        }
-
         private static IEnumerable<TestCaseData> StabilityPointStructureParameters()
         {
-            yield return new TestCaseData(new StructuresParameterRow
+            foreach (StructuresParameterRow parameterRow in GetAllValidStabilityPointStructuresParameterRows())
             {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword1,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword1);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword2,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword2);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword3,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword3);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword4,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword4);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword5,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword5);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword6,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword6);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword7,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword7);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword8,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword8);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword9,
-                NumericalValue = 1,
-                VarianceValue = 0.01,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword9);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword10,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword10);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword11,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword11);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword12,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword12);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword13,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword13);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword14,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword14);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword15,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword15);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword16,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword16);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword17,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword17);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword18,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword18);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword19,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword19);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword20,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword20);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword21,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword21);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword22,
-                NumericalValue = 1
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword22);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword23,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword23);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword24,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.CoefficientOfVariation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword24);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword25,
-                NumericalValue = 1,
-                VarianceValue = 0,
-                VarianceType = VarianceType.StandardDeviation
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword25);
-            yield return new TestCaseData(new StructuresParameterRow
-            {
-                ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword26,
-                AlphanumericValue = "LageDrempel"
-            }).SetName(StructureFilesKeywords.StabilityPointStructureParameterKeyword26);
+                yield return new TestCaseData(parameterRow).SetName(parameterRow.ParameterId);
+            }
         }
+
+        #endregion
     }
 }
\ No newline at end of file