Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r9806465f26a0c0e98420161d43c2e1b64ac6b0b4 -r832a1476e30d67e8514f9a26ff800b8907de386b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 9806465f26a0c0e98420161d43c2e1b64ac6b0b4) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 832a1476e30d67e8514f9a26ff800b8907de386b) @@ -83,10 +83,10 @@ Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); Assert.AreSame(hydraRingSection, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); - HydraRingVariableAssert.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.Variables.ToArray()); + HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultVariables() { yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 9.81, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, double.NaN, HydraRingDeviationType.Standard, 0.1, double.NaN, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r9806465f26a0c0e98420161d43c2e1b64ac6b0b4 -r832a1476e30d67e8514f9a26ff800b8907de386b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 9806465f26a0c0e98420161d43c2e1b64ac6b0b4) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 832a1476e30d67e8514f9a26ff800b8907de386b) @@ -90,7 +90,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); Assert.AreSame(hydraRingSection, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); - HydraRingVariableAssert.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.Variables.ToArray()); + HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -113,7 +113,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultVariables() { yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 9.81, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, double.NaN, HydraRingDeviationType.Standard, 0.1, double.NaN, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r9806465f26a0c0e98420161d43c2e1b64ac6b0b4 -r832a1476e30d67e8514f9a26ff800b8907de386b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 9806465f26a0c0e98420161d43c2e1b64ac6b0b4) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 832a1476e30d67e8514f9a26ff800b8907de386b) @@ -96,7 +96,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); Assert.AreSame(hydraRingSection, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); - HydraRingVariableAssert.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.Variables.ToArray()); + HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -120,7 +120,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultVariables() { yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 9.81, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 1.1, 0.3, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r9806465f26a0c0e98420161d43c2e1b64ac6b0b4 -r832a1476e30d67e8514f9a26ff800b8907de386b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 9806465f26a0c0e98420161d43c2e1b64ac6b0b4) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 832a1476e30d67e8514f9a26ff800b8907de386b) @@ -95,7 +95,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.StructuresClosure, input.FailureMechanismType); Assert.AreSame(hydraRingSection, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); - HydraRingVariableAssert.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.Variables.ToArray()); + HydraRingVariableAssert.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -119,7 +119,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultVariables() { yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 9.81, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 0.09, 0.06, double.NaN);