Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -rab1121dee05c5484181bb1b0470d49eb48d325fe -rf57667ae790c7ec25c771819e4efe75c2d221d9b --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision ab1121dee05c5484181bb1b0470d49eb48d325fe) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision f57667ae790c7ec25c771819e4efe75c2d221d9b) @@ -38,17 +38,14 @@ public class PipingCalculationActivityTest { [Test] - public void ParameteredConstructor_ExpectedValues() + public void Constructor_ExpectedValues() { // Setup var calculation = new PipingCalculation(new GeneralPipingInput()); // Call var activity = new PipingCalculationActivity(calculation, - RoundedDouble.NaN, - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + RoundedDouble.NaN); // Assert Assert.IsInstanceOf(activity); @@ -58,39 +55,18 @@ } [Test] - public void ParameteredConstructor_CalculationNull_ThrowsArgumentNullException() + public void Constructor_CalculationNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new PipingCalculationActivity(null, - RoundedDouble.NaN, - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + RoundedDouble.NaN); // Assert var exception = Assert.Throws(call); Assert.AreEqual("calculation", exception.ParamName); } [Test] - public void ParameteredConstructor_PipingProbabilityAssessmentInputNull_ThrowsArgumentNullException() - { - // Setup - var calculation = new PipingCalculation(new GeneralPipingInput()); - - // Call - TestDelegate call = () => new PipingCalculationActivity(calculation, - RoundedDouble.NaN, - null, - int.MinValue, - double.NaN); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("pipingProbabilityAssessmentInput", exception.ParamName); - } - - [Test] public void Run_InvalidPipingCalculationWithOutput_LogValidationStartAndEndWithErrors() { // Setup @@ -100,10 +76,7 @@ invalidPipingCalculation.Output = originalOutput; var activity = new PipingCalculationActivity(invalidPipingCalculation, - GetCalculatedTestAssessmentLevel(), - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + GetCalculatedTestAssessmentLevel()); // Call Action call = () => activity.Run(); @@ -135,12 +108,8 @@ PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); validPipingCalculation.Output = null; - double norm = new Random(21).NextDouble(); var activity = new PipingCalculationActivity(validPipingCalculation, - GetCalculatedTestAssessmentLevel(), - new PipingProbabilityAssessmentInput(), - norm, - double.NaN); + GetCalculatedTestAssessmentLevel()); activity.Run(); // Call @@ -175,10 +144,7 @@ validPipingCalculation.Attach(observer); var activity = new PipingCalculationActivity(validPipingCalculation, - GetCalculatedTestAssessmentLevel(), - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + GetCalculatedTestAssessmentLevel()); activity.Run();