Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsCalculationScenario.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r73b83d216aae55f8d37aa8df383ae953b23d983f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsCalculationScenario.cs (.../MacroStabilityInwardsCalculationScenario.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsCalculationScenario.cs (.../MacroStabilityInwardsCalculationScenario.cs) (revision 73b83d216aae55f8d37aa8df383ae953b23d983f) @@ -44,24 +44,8 @@ public RoundedDouble Contribution { - get - { - return contribution; - } - set - { - contribution = value.ToPrecision(contribution.NumberOfDecimalPlaces); - } + get => contribution; + set => contribution = value.ToPrecision(contribution.NumberOfDecimalPlaces); } - - public CalculationScenarioStatus Status - { - get - { - return Output == null - ? CalculationScenarioStatus.NotCalculated - : CalculationScenarioStatus.Done; - } - } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r73b83d216aae55f8d37aa8df383ae953b23d983f --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision 73b83d216aae55f8d37aa8df383ae953b23d983f) @@ -46,7 +46,6 @@ Assert.IsTrue(scenario.IsRelevant); Assert.AreEqual(4, scenario.Contribution.NumberOfDecimalPlaces); Assert.AreEqual(1.0, scenario.Contribution, scenario.Contribution.GetAccuracy()); - Assert.AreEqual(CalculationScenarioStatus.NotCalculated, scenario.Status); } [Test] @@ -82,35 +81,6 @@ } [Test] - public void CalculationScenarioStatus_OutputNull_ReturnsStatusNotCalculated() - { - // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(); - - // Call - CalculationScenarioStatus status = scenario.Status; - - // Assert - Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status); - } - - [Test] - public void CalculationScenarioStatus_OutputSet_ReturnsStatusDone() - { - // Setup - var scenario = new MacroStabilityInwardsCalculationScenario - { - Output = MacroStabilityInwardsOutputTestFactory.CreateOutput() - }; - - // Call - CalculationScenarioStatus status = scenario.Status; - - // Assert - Assert.AreEqual(CalculationScenarioStatus.Done, status); - } - - [Test] public void Clone_NotAllPropertiesSet_ReturnsCopiedInstanceWithPropertiesSet() { // Setup