Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -rdc74c14825ec7f5b994cc50e22451d40f814db89 -rc3ba16593a5299c16920263fae044b9fff0fe407 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision dc74c14825ec7f5b994cc50e22451d40f814db89) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision c3ba16593a5299c16920263fae044b9fff0fe407) @@ -102,7 +102,7 @@ invalidPipingCalculation.SemiProbabilisticOutput = originalSemiProbabilisticOutput; var activity = new PipingCalculationActivity(invalidPipingCalculation, - (RoundedDouble) 1.1, + GetCalculatedTestAssessmentLevel(), new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); @@ -141,7 +141,7 @@ double norm = new Random(21).NextDouble(); var activity = new PipingCalculationActivity(validPipingCalculation, - (RoundedDouble) 1.1, + GetCalculatedTestAssessmentLevel(), new PipingProbabilityAssessmentInput(), norm, double.NaN); @@ -181,7 +181,7 @@ validPipingCalculation.Attach(observer); var activity = new PipingCalculationActivity(validPipingCalculation, - (RoundedDouble) 1.1, + GetCalculatedTestAssessmentLevel(), new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); @@ -194,5 +194,10 @@ // Assert mocks.VerifyAll(); } + + private static RoundedDouble GetCalculatedTestAssessmentLevel() + { + return (RoundedDouble) 1.1; + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r487d53ee7ab88f79d75c4932266eaafe08df1a56 -rc3ba16593a5299c16920263fae044b9fff0fe407 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 487d53ee7ab88f79d75c4932266eaafe08df1a56) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision c3ba16593a5299c16920263fae044b9fff0fe407) @@ -56,7 +56,7 @@ public void Validate_CalculationNull_ThrowArgumentNullException() { // Call - TestDelegate test = () => PipingCalculationService.Validate(null); + TestDelegate test = () => PipingCalculationService.Validate(null, RoundedDouble.NaN); // Assert var exception = Assert.Throws(test); @@ -67,7 +67,7 @@ public void Validate_Always_LogStartAndEndOfValidatingInputs() { // Call - Action call = () => PipingCalculationService.Validate(testCalculation); + Action call = () => PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -87,7 +87,7 @@ invalidPipingCalculation.Output = output; // Call - bool isValid = PipingCalculationService.Validate(invalidPipingCalculation); + bool isValid = PipingCalculationService.Validate(invalidPipingCalculation, GetCalculatedTestAssessmentLevel()); // Assert Assert.IsFalse(isValid); @@ -102,7 +102,7 @@ // Call var isValid = false; - Action call = () => isValid = PipingCalculationService.Validate(calculation); + Action call = () => isValid = PipingCalculationService.Validate(calculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -129,7 +129,7 @@ // Call var isValid = false; - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -156,7 +156,7 @@ // Call var isValid = false; - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -179,7 +179,7 @@ // Call var isValid = false; - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -201,7 +201,7 @@ // Call var isValid = false; - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -225,7 +225,7 @@ // Call var isValid = false; - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -255,7 +255,7 @@ // Call var isValid = false; - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -279,7 +279,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -334,7 +334,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -368,7 +368,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -415,7 +415,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -465,7 +465,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -538,7 +538,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -603,7 +603,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -661,7 +661,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -726,7 +726,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -795,7 +795,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -850,7 +850,7 @@ var isValid = false; // Call - Action call = () => isValid = PipingCalculationService.Validate(testCalculation); + Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -917,7 +917,7 @@ testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); // Call - Action call = () => PipingCalculationService.Validate(testCalculation); + Action call = () => PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -942,7 +942,7 @@ using (new PipingSubCalculatorFactoryConfig()) { // Call - PipingCalculationService.Validate(testCalculation); + PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert AssertSubCalculatorInputs(input); @@ -953,7 +953,7 @@ public void Calculate_CalculationNull_ThrowArgumentNullException() { // Call - TestDelegate test = () => PipingCalculationService.Calculate(null); + TestDelegate test = () => PipingCalculationService.Calculate(null, RoundedDouble.NaN); // Assert var exception = Assert.Throws(test); @@ -966,10 +966,10 @@ Action call = () => { // Precondition - Assert.IsTrue(PipingCalculationService.Validate(testCalculation)); + Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel())); // Call - PipingCalculationService.Calculate(testCalculation); + PipingCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); }; // Assert @@ -988,10 +988,10 @@ { // Precondition Assert.IsNull(testCalculation.Output); - Assert.IsTrue(PipingCalculationService.Validate(testCalculation)); + Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel())); // Call - PipingCalculationService.Calculate(testCalculation); + PipingCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert PipingOutput pipingOutput = testCalculation.Output; @@ -1014,10 +1014,10 @@ testCalculation.Output = output; // Precondition - Assert.IsTrue(PipingCalculationService.Validate(testCalculation)); + Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel())); // Call - PipingCalculationService.Calculate(testCalculation); + PipingCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert Assert.AreNotSame(output, testCalculation.Output); @@ -1032,7 +1032,7 @@ using (new PipingSubCalculatorFactoryConfig()) { // Call - PipingCalculationService.Calculate(testCalculation); + PipingCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); // Assert AssertSubCalculatorInputs(input); @@ -1056,7 +1056,7 @@ Assert.AreEqual(PipingSemiProbabilisticDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), heaveCalculator.PhiPolder, input.PhreaticLevelExit.GetAccuracy()); - Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(input).Value, heaveCalculator.PhiExit); + Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(input, GetCalculatedTestAssessmentLevel()).Value, heaveCalculator.PhiExit); Assert.AreEqual(PipingSemiProbabilisticDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), heaveCalculator.RExit, input.DampingFactorExit.GetAccuracy()); @@ -1066,7 +1066,7 @@ input.PhreaticLevelExit.GetAccuracy()); Assert.AreEqual(input.AssessmentLevel.Value, upliftCalculator.HRiver); Assert.AreEqual(input.UpliftModelFactor, upliftCalculator.ModelFactorUplift); - Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(input).Value, upliftCalculator.PhiExit); + Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(input, GetCalculatedTestAssessmentLevel()).Value, upliftCalculator.PhiExit); Assert.AreEqual(PipingSemiProbabilisticDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), upliftCalculator.PhiPolder, input.PhreaticLevelExit.GetAccuracy()); @@ -1110,5 +1110,10 @@ Assert.AreEqual(input.SandParticlesVolumicWeight, sellmeijerCalculator.GammaSubParticles); Assert.AreEqual(input.Gravity, sellmeijerCalculator.Gravity); } + + private static RoundedDouble GetCalculatedTestAssessmentLevel() + { + return (RoundedDouble) 1.1; + } } } \ No newline at end of file