Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataTest.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -rdc162fb43a2d8ef5263cccaf4679ead8ada5ced2 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataTest.cs (.../DikeProfileDataTest.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataTest.cs (.../DikeProfileDataTest.cs) (revision dc162fb43a2d8ef5263cccaf4679ead8ada5ced2) @@ -22,6 +22,7 @@ using System; using System.Linq; using Core.Common.Base.Geometry; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.IO.DikeProfiles; @@ -68,7 +69,7 @@ public void Orientation_SetNewValue_GetNewlySetValue() { // Setup - double newValue = new Random(21).NextDouble() * 360; + double newValue = new Random(21).NextDouble(0, 360); var dikeProfileData = new DikeProfileData(); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs =================================================================== diff -u -re5df8d50aabeb35e723c6ae1778569898ad0cafe -rdc162fb43a2d8ef5263cccaf4679ead8ada5ced2 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision e5df8d50aabeb35e723c6ae1778569898ad0cafe) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision dc162fb43a2d8ef5263cccaf4679ead8ada5ced2) @@ -136,10 +136,10 @@ MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario3 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(0.0, section); macroStabilityInwardsCalculationScenario1.IsRelevant = true; - macroStabilityInwardsCalculationScenario1.Contribution = (RoundedDouble) 0.211; + macroStabilityInwardsCalculationScenario1.Contribution = (RoundedDouble) 0.2111; macroStabilityInwardsCalculationScenario2.IsRelevant = true; - macroStabilityInwardsCalculationScenario2.Contribution = (RoundedDouble) 0.789; + macroStabilityInwardsCalculationScenario2.Contribution = (RoundedDouble) 0.7889; macroStabilityInwardsCalculationScenario3.IsRelevant = false; @@ -154,7 +154,7 @@ double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); // Assert - Assert.AreEqual(0.99012934868838343, detailedAssessmentProbability, 1e-8); + Assert.AreEqual(0.99012835996547233, detailedAssessmentProbability, 1e-8); mocks.VerifyAll(); } @@ -343,10 +343,10 @@ var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); - macroStabilityInwardsCalculationScenario.Contribution = (RoundedDouble) 0.321; + macroStabilityInwardsCalculationScenario.Contribution = (RoundedDouble) 0.3211; MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); - macroStabilityInwardsCalculationScenario2.Contribution = (RoundedDouble) 0.543; + macroStabilityInwardsCalculationScenario2.Contribution = (RoundedDouble) 0.5435; MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario3 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); @@ -361,7 +361,7 @@ RoundedDouble totalContribution = failureMechanismSectionResult.GetTotalContribution(calculationScenarios); // Assert - Assert.AreEqual((RoundedDouble) 0.864, totalContribution); + Assert.AreEqual((RoundedDouble) 0.8646, totalContribution); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs =================================================================== diff -u -r6e1eecbf07561b3913cbe1552dabcbacdd977d06 -rdc162fb43a2d8ef5263cccaf4679ead8ada5ced2 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision 6e1eecbf07561b3913cbe1552dabcbacdd977d06) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision dc162fb43a2d8ef5263cccaf4679ead8ada5ced2) @@ -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(); @@ -205,7 +207,7 @@ var row = new MacroStabilityInwardsScenarioRow(calculation, failureMechanism, assessmentSection); - double newValue = new Random(21).NextDouble() * 100; + double newValue = new Random(21).NextDouble(0, 100); // Call row.Contribution = (RoundedDouble) newValue; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs =================================================================== diff -u -re5df8d50aabeb35e723c6ae1778569898ad0cafe -rdc162fb43a2d8ef5263cccaf4679ead8ada5ced2 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision e5df8d50aabeb35e723c6ae1778569898ad0cafe) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision dc162fb43a2d8ef5263cccaf4679ead8ada5ced2) @@ -133,11 +133,11 @@ PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); pipingCalculationScenario1.IsRelevant = true; - pipingCalculationScenario1.Contribution = (RoundedDouble) 0.211; + pipingCalculationScenario1.Contribution = (RoundedDouble) 0.2111; pipingCalculationScenario1.Output = PipingOutputTestFactory.Create(1.1, 2.2, 3.3); pipingCalculationScenario2.IsRelevant = true; - pipingCalculationScenario2.Contribution = (RoundedDouble) 0.789; + pipingCalculationScenario2.Contribution = (RoundedDouble) 0.7889; pipingCalculationScenario1.Output = PipingOutputTestFactory.Create(4.4, 5.5, 6.6); pipingCalculationScenario3.IsRelevant = false; @@ -153,7 +153,7 @@ double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); // Assert - Assert.AreEqual(0.022638809368856008, detailedAssessmentProbability); + Assert.AreEqual(0.022635940064759167, detailedAssessmentProbability); mocks.VerifyAll(); } @@ -342,10 +342,10 @@ var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); - pipingCalculationScenario.Contribution = (RoundedDouble) 0.321; + pipingCalculationScenario.Contribution = (RoundedDouble) 0.3211; PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); - pipingCalculationScenario2.Contribution = (RoundedDouble) 0.543; + pipingCalculationScenario2.Contribution = (RoundedDouble) 0.5435; PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section); @@ -360,7 +360,7 @@ RoundedDouble totalContribution = failureMechanismSectionResult.GetTotalContribution(calculationScenarios); // Assert - Assert.AreEqual((RoundedDouble) 0.864, totalContribution); + Assert.AreEqual((RoundedDouble) 0.8646, totalContribution); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs =================================================================== diff -u -r6c3b79bca501f337ad8c9e758cd60e0b6c9d490a -rdc162fb43a2d8ef5263cccaf4679ead8ada5ced2 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision 6c3b79bca501f337ad8c9e758cd60e0b6c9d490a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision dc162fb43a2d8ef5263cccaf4679ead8ada5ced2) @@ -119,6 +119,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(ProbabilityFormattingHelper.Format(expectedDerivedOutput.PipingProbability), row.FailureProbabilityPiping); Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedDerivedOutput.UpliftProbability), row.FailureProbabilityUplift); @@ -154,6 +155,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.FailureProbabilityPiping); Assert.AreEqual("-", row.FailureProbabilityUplift); @@ -197,7 +199,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - double newValue = new Random(21).NextDouble() * 100; + double newValue = new Random(21).NextDouble(0, 100); var calculation = new PipingCalculationScenario(new GeneralPipingInput()); calculation.Attach(observer); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs =================================================================== diff -u -r39e941a3f116d264000cd6f46a61f64674063933 -rdc162fb43a2d8ef5263cccaf4679ead8ada5ced2 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision 39e941a3f116d264000cd6f46a61f64674063933) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision dc162fb43a2d8ef5263cccaf4679ead8ada5ced2) @@ -92,7 +92,7 @@ // Setup var input = new PipingCalculatorInput(CreateSimpleConstructionProperties()); var testPipingSubCalculatorFactory = new TestPipingSubCalculatorFactory(); - double bottomAquitardLayerAboveExitPointZ = new Random(21).NextDouble() * 10; + double bottomAquitardLayerAboveExitPointZ = new Random(21).NextDouble(0, 10); testPipingSubCalculatorFactory.LastCreatedPipingProfilePropertyCalculator.BottomAquitardLayerAboveExitPointZ = bottomAquitardLayerAboveExitPointZ; // Call Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rba834431b63ea0985c60a0987ca8fb720f801ab6 -rdc162fb43a2d8ef5263cccaf4679ead8ada5ced2 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision dc162fb43a2d8ef5263cccaf4679ead8ada5ced2) @@ -22,6 +22,7 @@ using System; using Core.Common.Base.Data; using Core.Common.Base.Geometry; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Data; @@ -369,7 +370,7 @@ private static double? GetRandomNullableDoubleInRange(Random random, double lowerLimit, double upperLimit) { double difference = upperLimit - lowerLimit; - return lowerLimit + random.NextDouble() * difference; + return lowerLimit + random.NextDouble(0, difference); } } } \ No newline at end of file