Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenarioRow.cs =================================================================== diff -u -reb4e08c0608aa4d157d50dba3fa4a85976eece20 -r0daacea4233a09e4b0a747a483a6dd2fd3b34e6c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenarioRow.cs (.../MacroStabilityInwardsScenarioRow.cs) (revision eb4e08c0608aa4d157d50dba3fa4a85976eece20) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenarioRow.cs (.../MacroStabilityInwardsScenarioRow.cs) (revision 0daacea4233a09e4b0a747a483a6dd2fd3b34e6c) @@ -100,7 +100,7 @@ { get { - return new RoundedDouble(0, Calculation.Contribution * 100); + return new RoundedDouble(2, Calculation.Contribution * 100); } set { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs =================================================================== diff -u -r54183ecdf6905b5cc1b182cedea52e607636358f -r0daacea4233a09e4b0a747a483a6dd2fd3b34e6c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision 54183ecdf6905b5cc1b182cedea52e607636358f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision 0daacea4233a09e4b0a747a483a6dd2fd3b34e6c) @@ -120,6 +120,7 @@ Assert.AreSame(calculation, row.Calculation); Assert.AreEqual(name, row.Name); Assert.AreEqual(isRelevant, row.IsRelevant); + Assert.AreEqual(2, row.Contribution.NumberOfDecimalPlaces); Assert.AreEqual(contribution * 100, row.Contribution, row.Contribution.GetAccuracy()); DerivedMacroStabilityInwardsOutput expectedDerivedOutput = DerivedMacroStabilityInwardsOutputFactory.Create( calculation.Output, failureMechanism, assessmentSection); @@ -156,6 +157,7 @@ Assert.AreSame(calculation, row.Calculation); Assert.AreEqual(name, row.Name); Assert.AreEqual(isRelevant, row.IsRelevant); + Assert.AreEqual(2, row.Contribution.NumberOfDecimalPlaces); Assert.AreEqual(contribution * 100, row.Contribution, row.Contribution.GetAccuracy()); Assert.AreEqual("-", row.FailureProbabilityMacroStabilityInwards); mocks.VerifyAll(); @@ -189,7 +191,7 @@ } [Test] - public void Contribution_AlwaysOnChange_NotifyObserverAndCalculationPropertyChanged() + public void Contribution_AlwaysOnChange_ValueSetToRowNotifyObserverAndCalculationPropertyChanged() { // Setup var calculation = new MacroStabilityInwardsCalculationScenario(); @@ -205,14 +207,15 @@ var row = new MacroStabilityInwardsScenarioRow(calculation, failureMechanism, assessmentSection); - int newValue = new Random(21).Next(0, 100); + double newValue = new Random(21).NextDouble() * 100; // Call row.Contribution = (RoundedDouble) newValue; // Assert - Assert.AreEqual(2, calculation.Contribution.NumberOfDecimalPlaces); - Assert.AreEqual(newValue, calculation.Contribution * 100, calculation.Contribution.GetAccuracy()); + Assert.AreEqual(2, row.Contribution.NumberOfDecimalPlaces); + Assert.AreEqual(newValue, row.Contribution, row.Contribution.GetAccuracy()); + Assert.AreEqual(newValue / 100, calculation.Contribution, calculation.Contribution.GetAccuracy()); mocks.VerifyAll(); }