Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs =================================================================== diff -u -rb2f4b307c254c747a5cf01d2fb94970e5e954c36 -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision b2f4b307c254c747a5cf01d2fb94970e5e954c36) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d) @@ -38,13 +38,13 @@ public class MacroStabilityInwardsCalculationActivityTest { [Test] - public void ParameteredConstructor_ExpectedValues() + public void Constructor_ExpectedValues() { // Setup var calculation = new MacroStabilityInwardsCalculation(); // Call - var activity = new MacroStabilityInwardsCalculationActivity(calculation, new MacroStabilityInwardsProbabilityAssessmentInput(), int.MinValue, double.NaN); + var activity = new MacroStabilityInwardsCalculationActivity(calculation); // Assert Assert.IsInstanceOf(activity); @@ -54,42 +54,26 @@ } [Test] - public void ParameteredConstructor_CalculationNull_ThrowsArgumentNullException() + public void Constructor_CalculationNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new MacroStabilityInwardsCalculationActivity(null, new MacroStabilityInwardsProbabilityAssessmentInput(), int.MinValue, double.NaN); + TestDelegate call = () => new MacroStabilityInwardsCalculationActivity(null); // Assert var exception = Assert.Throws(call); Assert.AreEqual("calculation", exception.ParamName); } - [Test] - public void ParameteredConstructor_MacroStabilityInwardsProbabilityAssessmentInputNull_ThrowsArgumentNullException() - { - // Setup - var calculation = new MacroStabilityInwardsCalculation(); - - // Call - TestDelegate call = () => new MacroStabilityInwardsCalculationActivity(calculation, null, int.MinValue, double.NaN); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("macroStabilityInwardsProbabilityAssessmentInput", exception.ParamName); - } - - [Test] + [Test] public void Run_InvalidMacroStabilityInwardsCalculationWithOutput_LogValidationStartAndEndWithErrors() { // Setup MacroStabilityInwardsOutput originalOutput = MacroStabilityInwardsOutputTestFactory.CreateOutput(); - MacroStabilityInwardsSemiProbabilisticOutput originalSemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(); MacroStabilityInwardsCalculationScenario invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); invalidMacroStabilityInwardsCalculation.Output = originalOutput; - invalidMacroStabilityInwardsCalculation.SemiProbabilisticOutput = originalSemiProbabilisticOutput; - var activity = new MacroStabilityInwardsCalculationActivity(invalidMacroStabilityInwardsCalculation, new MacroStabilityInwardsProbabilityAssessmentInput(), int.MinValue, double.NaN); + var activity = new MacroStabilityInwardsCalculationActivity(invalidMacroStabilityInwardsCalculation); // Call Action call = () => activity.Run(); @@ -110,7 +94,6 @@ }); Assert.AreEqual(ActivityState.Failed, activity.State); Assert.AreSame(originalOutput, invalidMacroStabilityInwardsCalculation.Output); - Assert.AreSame(originalSemiProbabilisticOutput, invalidMacroStabilityInwardsCalculation.SemiProbabilisticOutput); } [Test] @@ -119,13 +102,10 @@ // Setup MacroStabilityInwardsCalculationScenario validMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validMacroStabilityInwardsCalculation.Output = null; - validMacroStabilityInwardsCalculation.SemiProbabilisticOutput = null; - double norm = new Random(21).NextDouble(); - using (new MacroStabilityInwardsCalculatorFactoryConfig()) { - var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, new MacroStabilityInwardsProbabilityAssessmentInput(), norm, double.NaN); + var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation); activity.Run(); // Call @@ -144,7 +124,6 @@ }); Assert.AreEqual(ActivityState.Executed, activity.State); Assert.IsNotNull(validMacroStabilityInwardsCalculation.Output); - Assert.IsNotNull(validMacroStabilityInwardsCalculation.SemiProbabilisticOutput); } } @@ -159,10 +138,9 @@ MacroStabilityInwardsCalculationScenario validMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validMacroStabilityInwardsCalculation.Output = null; - validMacroStabilityInwardsCalculation.SemiProbabilisticOutput = null; validMacroStabilityInwardsCalculation.Attach(observer); - var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, new MacroStabilityInwardsProbabilityAssessmentInput(), int.MinValue, double.NaN); + var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation); activity.Run();