Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r99389b8c7fc27efb7483fb16e5b5659e07d1a5d6 -r5c393bc8750c1cea8cc6e28e024f331aeea2ae52 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs) (revision 99389b8c7fc27efb7483fb16e5b5659e07d1a5d6) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs) (revision 5c393bc8750c1cea8cc6e28e024f331aeea2ae52) @@ -48,7 +48,7 @@ public void IsDikeProfileIntersectionWithReferenceLineInSection_LineSegmentsNull_ThrowsArgumentNullException() { // Setup - var calculation = new GrassCoverErosionInwardsCalculationScenario(double.NaN); + var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); // Call void Call() => calculation.IsDikeProfileIntersectionWithReferenceLineInSection(null); @@ -62,7 +62,7 @@ public void IsDikeProfileIntersectionWithReferenceLineInSection_CalculationWithoutDikeProfile_ReturnsFalse() { // Setup - var calculation = new GrassCoverErosionInwardsCalculationScenario(double.NaN); + var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); // Call bool intersects = calculation.IsDikeProfileIntersectionWithReferenceLineInSection(Enumerable.Empty()); @@ -83,7 +83,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new GrassCoverErosionInwardsCalculationScenario(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) { InputParameters = { @@ -110,7 +110,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new GrassCoverErosionInwardsCalculationScenario(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) { InputParameters = { @@ -139,7 +139,7 @@ new Point2D(20.0, 0.0) }); - var calculation = new GrassCoverErosionInwardsCalculationScenario(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) { InputParameters = { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioTest.cs =================================================================== diff -u -r4cb44d36bec6a6f1b4c1c2ff2db086b9996a2b42 -r5c393bc8750c1cea8cc6e28e024f331aeea2ae52 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioTest.cs (.../GrassCoverErosionInwardsCalculationScenarioTest.cs) (revision 4cb44d36bec6a6f1b4c1c2ff2db086b9996a2b42) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioTest.cs (.../GrassCoverErosionInwardsCalculationScenarioTest.cs) (revision 5c393bc8750c1cea8cc6e28e024f331aeea2ae52) @@ -37,7 +37,7 @@ public void Constructor_ExpectedValues() { // Call - var scenario = new GrassCoverErosionInwardsCalculationScenario(double.NaN); + var scenario = new GrassCoverErosionInwardsCalculationScenario(0.1); // Assert Assert.IsInstanceOf(scenario); @@ -53,7 +53,7 @@ public void Contribution_SetInvalidValue_ThrowArgumentException(double newValue) { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(double.NaN); + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1); // Call void Call() => calculationScenario.Contribution = (RoundedDouble) newValue; @@ -68,7 +68,7 @@ public void Contribution_SetValidValue_ValueSet(double newValue) { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(double.NaN); + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1); // Call calculationScenario.Contribution = (RoundedDouble) newValue; @@ -109,7 +109,7 @@ { var random = new Random(21); - var calculation = new GrassCoverErosionInwardsCalculationScenario(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) { Name = "A Name", Comments = Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs =================================================================== diff -u -r4cb44d36bec6a6f1b4c1c2ff2db086b9996a2b42 -r5c393bc8750c1cea8cc6e28e024f331aeea2ae52 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs (.../GrassCoverErosionInwardsCalculationTest.cs) (revision 4cb44d36bec6a6f1b4c1c2ff2db086b9996a2b42) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs (.../GrassCoverErosionInwardsCalculationTest.cs) (revision 5c393bc8750c1cea8cc6e28e024f331aeea2ae52) @@ -23,6 +23,7 @@ using System.Collections.Generic; using Core.Common.Base; using Core.Common.Data.TestUtil; +using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.TestUtil.IllustrationPoints; @@ -37,7 +38,7 @@ public void Constructor_ExpectedValues() { // Setup - double norm = new Random(21).NextDouble(); + double norm = new Random(21).NextDouble(1e-15, 0.1); // Call var calculation = new GrassCoverErosionInwardsCalculation(norm); @@ -62,7 +63,7 @@ public void Properties_Name_ReturnsExpectedValues(string name) { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN); + var calculation = new GrassCoverErosionInwardsCalculation(0.1); // Call calculation.Name = name; @@ -78,7 +79,7 @@ public void Property_Comments_ReturnsExpectedValues(string comments) { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN); + var calculation = new GrassCoverErosionInwardsCalculation(0.1); // Call calculation.Comments.Body = comments; @@ -91,7 +92,7 @@ public void ClearOutput_Always_SetsOutputToNull() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculation(0.1) { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -107,7 +108,7 @@ public void HasOutput_OutputNull_ReturnsFalse() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculation(0.1) { Output = null }; @@ -123,7 +124,7 @@ public void HasOutput_OutputSet_ReturnsTrue() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculation(0.1) { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -183,7 +184,7 @@ new TestDikeHeightOutput(new TestGeneralResultFaultTreeIllustrationPoint()), new TestOvertoppingRateOutput(new TestGeneralResultFaultTreeIllustrationPoint())); - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculation(0.1) { Output = originalOutput }; @@ -202,7 +203,7 @@ public void ClearIllustrationPoints_CalculationWithoutOutput_DoesNotThrow() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN); + var calculation = new GrassCoverErosionInwardsCalculation(0.1); // Call void Call() => calculation.ClearIllustrationPoints(); @@ -213,7 +214,7 @@ private static GrassCoverErosionInwardsCalculation CreateRandomCalculationWithoutOutput() { - var calculation = new GrassCoverErosionInwardsCalculation(double.NaN) + var calculation = new GrassCoverErosionInwardsCalculation(0.1) { Comments = { @@ -241,7 +242,7 @@ var overtoppingRateOutputWithoutGeneralResult = new TestOvertoppingRateOutput(1.0); var overtoppingRateOutputWithGeneralResult = new TestOvertoppingRateOutput(new TestGeneralResultFaultTreeIllustrationPoint()); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -257,7 +258,7 @@ }, false) .SetName("OutputSufficientScenario1"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -270,18 +271,18 @@ }, false) .SetName("OutputSufficientScenario2"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { Output = new GrassCoverErosionInwardsOutput(overtoppingOutputWithoutGeneralResult, null, null) }, false) .SetName("OutputSufficientScenario3"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN), true) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1), true) .SetName("NoOutputScenario1"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -291,7 +292,7 @@ }, true) .SetName("NoOutputScenario2"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -304,15 +305,15 @@ }, true) .SetName("NoOutputScenario3"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { Output = new GrassCoverErosionInwardsOutput(overtoppingOutputWithGeneralResult, null, null) }, true) .SetName("OvertoppingOutputWithRedundantGeneralResult"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -324,7 +325,7 @@ }, true) .SetName("OvertoppingOutputWithMissingGeneralResult"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -336,7 +337,7 @@ }, true) .SetName("DikeHeightOutputWithRedundantGeneralResult"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -349,7 +350,7 @@ }, true) .SetName("DikeHeightOutputWithMissingGeneralResult"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { @@ -361,7 +362,7 @@ }, true) .SetName("OvertoppingRateOutputWithRedundantGeneralResult"); - yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(double.NaN) + yield return new TestCaseData(new GrassCoverErosionInwardsCalculation(0.1) { InputParameters = { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs =================================================================== diff -u -r99389b8c7fc27efb7483fb16e5b5659e07d1a5d6 -r5c393bc8750c1cea8cc6e28e024f331aeea2ae52 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision 99389b8c7fc27efb7483fb16e5b5659e07d1a5d6) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision 5c393bc8750c1cea8cc6e28e024f331aeea2ae52) @@ -117,9 +117,9 @@ Children = { new CalculationGroup(), - new GrassCoverErosionInwardsCalculation(double.NaN), + new GrassCoverErosionInwardsCalculation(0.1), mocks.StrictMock(), - new GrassCoverErosionInwardsCalculation(double.NaN) + new GrassCoverErosionInwardsCalculation(0.1) } } }; Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.TestUtil/GrassCoverErosionInwardsCalculationScenarioTestFactory.cs =================================================================== diff -u -rff1fb057078592d0e808d7a6d8dd065a1478cf8b -r5c393bc8750c1cea8cc6e28e024f331aeea2ae52 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.TestUtil/GrassCoverErosionInwardsCalculationScenarioTestFactory.cs (.../GrassCoverErosionInwardsCalculationScenarioTestFactory.cs) (revision ff1fb057078592d0e808d7a6d8dd065a1478cf8b) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.TestUtil/GrassCoverErosionInwardsCalculationScenarioTestFactory.cs (.../GrassCoverErosionInwardsCalculationScenarioTestFactory.cs) (revision 5c393bc8750c1cea8cc6e28e024f331aeea2ae52) @@ -59,7 +59,7 @@ throw new ArgumentNullException(nameof(section)); } - var scenario = new GrassCoverErosionInwardsCalculationScenario(0.0) + var scenario = new GrassCoverErosionInwardsCalculationScenario(0.1) { IsRelevant = true, InputParameters =