Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -87,7 +87,7 @@ DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); DistributionAssert.AreEqual(expectedLevelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); - Assert.AreEqual(1.0, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(1.0, input.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(0, input.IdenticalApertures); Assert.AreEqual(0, (int) input.InflowModelType); @@ -170,7 +170,7 @@ DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); DistributionAssert.AreEqual(expectedLevelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); - Assert.AreEqual(1.0, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(1.0, input.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(0, input.IdenticalApertures); Assert.AreEqual(0, (int) input.InflowModelType); @@ -570,13 +570,13 @@ [TestCase(-1e-6)] [TestCase(-23456)] [TestCase(double.NaN)] - public void ProbabilityOrFrequencyOpenStructureBeforeFlooding_InvalidValues_ThrowsArgumentOutOfRangeException(double probability) + public void ProbabilityOpenStructureBeforeFlooding_InvalidValues_ThrowsArgumentOutOfRangeException(double probability) { // Setup var input = new ClosingStructuresInput(); // Call - TestDelegate call = () => input.ProbabilityOrFrequencyOpenStructureBeforeFlooding = probability; + TestDelegate call = () => input.ProbabilityOpenStructureBeforeFlooding = probability; // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."); @@ -586,16 +586,16 @@ [TestCase(0)] [TestCase(0.5)] [TestCase(1.0)] - public void ProbabilityOrFrequencyOpenStructureBeforeFlooding_ValidValues_ExpectedValues(double probability) + public void ProbabilityOpenStructureBeforeFlooding_ValidValues_ExpectedValues(double probability) { // Setup var input = new ClosingStructuresInput(); // Call - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding = probability; + input.ProbabilityOpenStructureBeforeFlooding = probability; // Assert - Assert.AreEqual(probability, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(probability, input.ProbabilityOpenStructureBeforeFlooding); } #endregion @@ -622,7 +622,7 @@ Assert.AreEqual(defaultInput.FailureProbabilityReparation, input.FailureProbabilityReparation); Assert.AreEqual(defaultInput.IdenticalApertures, input.IdenticalApertures); DistributionAssert.AreEqual(defaultInput.InsideWaterLevel, input.InsideWaterLevel); - Assert.AreEqual(defaultInput.ProbabilityOrFrequencyOpenStructureBeforeFlooding, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(defaultInput.ProbabilityOpenStructureBeforeFlooding, input.ProbabilityOpenStructureBeforeFlooding); DistributionAssert.AreEqual(defaultInput.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); } else @@ -641,7 +641,7 @@ Assert.AreEqual(expectedClosingStructure.FailureProbabilityReparation, input.FailureProbabilityReparation); Assert.AreEqual(expectedClosingStructure.IdenticalApertures, input.IdenticalApertures); DistributionAssert.AreEqual(expectedClosingStructure.InsideWaterLevel, input.InsideWaterLevel); - Assert.AreEqual(expectedClosingStructure.ProbabilityOpenStructureBeforeFlooding, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(expectedClosingStructure.ProbabilityOpenStructureBeforeFlooding, input.ProbabilityOpenStructureBeforeFlooding); DistributionAssert.AreEqual(expectedClosingStructure.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); } }