Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs (.../MacroStabilityInwardsCalculationTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs (.../MacroStabilityInwardsCalculationTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -43,11 +43,8 @@ [Test] public void Constructor_DefaultPropertyValuesAreSet() { - // Setup - var generalInputParameters = new GeneralMacroStabilityInwardsInput(); - // Call - var calculation = new MacroStabilityInwardsCalculation(generalInputParameters); + var calculation = new MacroStabilityInwardsCalculation(); // Assert Assert.IsInstanceOf(calculation); @@ -63,16 +60,6 @@ } [Test] - public void Constructor_GeneralInputIsNull_ThrowArgumentNullException() - { - // Call - TestDelegate call = () => new MacroStabilityInwardsCalculation(null); - - // Assert - Assert.Throws(call); - } - - [Test] public void Notify_SingleListenerAttached_ListenerIsNotified() { // Setup @@ -81,7 +68,7 @@ mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observer); @@ -98,7 +85,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Never(); mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observer); calculation.Detach(observer); @@ -120,7 +107,7 @@ mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observerA); calculation.Attach(observerB); @@ -142,7 +129,7 @@ mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observerA); calculation.Attach(observerB); @@ -158,7 +145,7 @@ { // Setup var observer = mockRepository.StrictMock(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); // Call & Assert calculation.Detach(observer); @@ -168,7 +155,7 @@ public void ClearOutput_Always_SetsOutputAndSemiProbabilisticOutputToNull() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -186,7 +173,7 @@ public void HasOutput_OutputAndSemiProbabilisticOutputNull_ReturnsFalse() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = null, SemiProbabilisticOutput = null @@ -203,7 +190,7 @@ public void HasOutput_OutputSet_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = new TestMacroStabilityInwardsOutput() }; @@ -219,7 +206,7 @@ public void HasOutput_SemiProbabilisticOutputSet_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() };