Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -34,11 +34,8 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - var generalInputParameters = new GeneralMacroStabilityInwardsInput(); - // Call - var scenario = new MacroStabilityInwardsCalculationScenario(generalInputParameters); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Assert Assert.IsInstanceOf(scenario); @@ -54,7 +51,7 @@ public void IsRelevant_Always_ReturnsSetValue(bool isRelevant) { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Call scenario.IsRelevant = isRelevant; @@ -69,7 +66,7 @@ public void Contribution_Always_ReturnsSetValue(double newValue) { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); var roundedDouble = (RoundedDouble) newValue; // Call @@ -85,7 +82,7 @@ // Setup const double expectedProbability = 1.0 / 49862180; - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(expectedProbability) @@ -102,7 +99,7 @@ public void Probability_ScenarioStatusNotDone_ThrowsInvalidOperationException() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Call TestDelegate call = () => @@ -118,7 +115,7 @@ public void CalculationScenarioStatus_OutputNull_ReturnsStatusNotCalculated() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Call CalculationScenarioStatus status = scenario.Status; @@ -131,7 +128,7 @@ public void CalculationScenarioStatus_SemiProbabilisticOutputNull_ReturnsStatusFailed() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = null @@ -148,7 +145,7 @@ public void CalculationScenarioStatus_ScenarioInvalid_ReturnsStatusFailed() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(double.NaN) @@ -167,7 +164,7 @@ // Setup const double expectedProbability = 1.0 / 49862180; - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(expectedProbability)