Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -r12d68f588f3d39996a3a34577f9ec94a87bec865 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 12d68f588f3d39996a3a34577f9ec94a87bec865) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -27,7 +27,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Data.IllustrationPoints; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; @@ -136,9 +135,9 @@ { // Setup var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); + var overtoppingOutput = new OvertoppingOutput(1, true, probabilityAssessmentOutput, null); var overtoppingRateOutput = new TestOvertoppingRateOutput(double.NaN, CalculationConvergence.CalculatedConverged); - var output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(1, true, probabilityAssessmentOutput, null), - null, overtoppingRateOutput); + var output = new GrassCoverErosionInwardsOutput(overtoppingOutput, null, overtoppingRateOutput); // Call GrassCoverErosionInwardsOutputEntity entity = output.Create(); @@ -152,9 +151,9 @@ { // Setup var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); + var overtoppingOutput = new OvertoppingOutput(1, true, probabilityAssessmentOutput, null); var dikeHeightOutput = new TestDikeHeightOutput(double.NaN, CalculationConvergence.CalculatedConverged); - var output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(1, true, probabilityAssessmentOutput, null), - dikeHeightOutput, null); + var output = new GrassCoverErosionInwardsOutput(overtoppingOutput, dikeHeightOutput, null); // Call GrassCoverErosionInwardsOutputEntity entity = output.Create(); @@ -167,13 +166,13 @@ public void Create_WithGeneralResult_ReturnsGrassCoverErosionInwardsOutputEntityWithGeneralResultEntity() { // Setup - var output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(double.NaN, - true, - new TestProbabilityAssessmentOutput(), - new TestGeneralResultFaultTreeIllustrationPoint()), - null, - null); + var overtoppingOutput = new OvertoppingOutput(double.NaN, + true, + new TestProbabilityAssessmentOutput(), + new TestGeneralResultFaultTreeIllustrationPoint()); + var output = new GrassCoverErosionInwardsOutput(overtoppingOutput, null, null); + // Call GrassCoverErosionInwardsOutputEntity entity = output.Create(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r659839900c53f9f65ffe8c811e0cb876de55398f -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 659839900c53f9f65ffe8c811e0cb876de55398f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -1495,16 +1495,20 @@ private static void AssertGrassCoverErosionInwardsOutput(GrassCoverErosionInwardsOutput expectedOutput, GrassCoverErosionInwardsOutput actualOutput) { - OvertoppingOutput expectedOvertoppingOutput = expectedOutput.OvertoppingOutput; - OvertoppingOutput actualOvertoppingOutput = actualOutput.OvertoppingOutput; - - Assert.AreEqual(expectedOvertoppingOutput.WaveHeight, actualOvertoppingOutput.WaveHeight); - Assert.AreEqual(expectedOvertoppingOutput.IsOvertoppingDominant, actualOvertoppingOutput.IsOvertoppingDominant); - AssertProbabilityAssessmentOutput(expectedOvertoppingOutput.ProbabilityAssessmentOutput, actualOvertoppingOutput.ProbabilityAssessmentOutput); + AssertOvertoppingOutput(expectedOutput.OvertoppingOutput, actualOutput.OvertoppingOutput); AssertDikeHeightOutput(expectedOutput.DikeHeightOutput, actualOutput.DikeHeightOutput); AssertOvertoppingRateOutput(expectedOutput.OvertoppingRateOutput, actualOutput.OvertoppingRateOutput); } + private static void AssertOvertoppingOutput(OvertoppingOutput expectedOutput, + OvertoppingOutput actualOutput) + { + Assert.AreEqual(expectedOutput.WaveHeight, actualOutput.WaveHeight); + Assert.AreEqual(expectedOutput.IsOvertoppingDominant, actualOutput.IsOvertoppingDominant); + + AssertProbabilityAssessmentOutput(expectedOutput.ProbabilityAssessmentOutput, actualOutput.ProbabilityAssessmentOutput); + } + private static void AssertDikeHeightOutput(DikeHeightOutput expectedOutput, DikeHeightOutput actualOutput) { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb28a844780b613e1901fa82328ba3917f485c729 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision b28a844780b613e1901fa82328ba3917f485c729) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -22,7 +22,6 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.Probability; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; namespace Ringtoets.GrassCoverErosionInwards.Data.Test @@ -86,12 +85,11 @@ // Setup FailureMechanismSection section = CreateSection(); - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1.0, 1.0, double.NaN, 1.0, 1.0); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = new GrassCoverErosionInwardsCalculation { - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(1.0, false, probabilityAssessmentOutput, null), + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(double.NaN), new TestDikeHeightOutput(double.NaN), new TestOvertoppingRateOutput(double.NaN)) } @@ -111,12 +109,11 @@ FailureMechanismSection section = CreateSection(); const double probability = 0.65; - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1.0, 1.0, probability, 1.0, 1.0); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = new GrassCoverErosionInwardsCalculation { - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(1.0, false, probabilityAssessmentOutput, null), + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(probability), new TestDikeHeightOutput(double.NaN), new TestOvertoppingRateOutput(double.NaN)) } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -rb28a844780b613e1901fa82328ba3917f485c729 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision b28a844780b613e1901fa82328ba3917f485c729) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -23,7 +23,6 @@ using Core.Common.Base; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; namespace Ringtoets.GrassCoverErosionInwards.Data.Test @@ -49,16 +48,10 @@ public void ParameteredConstructor_DefaultValues() { // Setup - const double waveHeight = 3.2934; - const double dikeHeight = 7.3892; - const double overtoppingRate = 0.9; + var overtoppingOutput = new TestOvertoppingOutput(double.NaN); + var dikeHeightOutput = new TestDikeHeightOutput(double.NaN); + var overtoppingRateOutput = new TestOvertoppingRateOutput(double.NaN); - var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); - - var overtoppingOutput = new OvertoppingOutput(waveHeight, true, probabilityAssessmentOutput, null); - var dikeHeightOutput = new TestDikeHeightOutput(dikeHeight); - var overtoppingRateOutput = new TestOvertoppingRateOutput(overtoppingRate); - // Call var output = new GrassCoverErosionInwardsOutput(overtoppingOutput, dikeHeightOutput, overtoppingRateOutput); @@ -67,8 +60,6 @@ Assert.IsInstanceOf(output); Assert.AreSame(overtoppingOutput, output.OvertoppingOutput); - Assert.AreSame(probabilityAssessmentOutput, output.OvertoppingOutput.ProbabilityAssessmentOutput); - Assert.IsNull(output.OvertoppingOutput.GeneralResult); Assert.AreSame(dikeHeightOutput, output.DikeHeightOutput); Assert.AreSame(overtoppingRateOutput, output.OvertoppingRateOutput); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -ra64e778ac45d89e0bc35900b5c5b4a85e1f24089 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision a64e778ac45d89e0bc35900b5c5b4a85e1f24089) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -19,8 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Core.Common.Base.Data; using NUnit.Framework; -using Ringtoets.Common.Data.Probability; namespace Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test { @@ -35,13 +35,12 @@ // Assert Assert.IsInstanceOf(output); - OvertoppingOutput overtoppingOutput = output.OvertoppingOutput; - - Assert.AreEqual(1.0, overtoppingOutput.WaveHeight.Value); - Assert.IsTrue(overtoppingOutput.IsOvertoppingDominant); - Assert.IsInstanceOf(overtoppingOutput.ProbabilityAssessmentOutput); + Assert.IsInstanceOf(output.OvertoppingOutput); + Assert.AreEqual(0, output.OvertoppingOutput.ProbabilityAssessmentOutput.Probability); Assert.IsInstanceOf(output.DikeHeightOutput); + Assert.AreEqual((RoundedDouble) 0, output.DikeHeightOutput.DikeHeight); Assert.IsInstanceOf(output.OvertoppingRateOutput); + Assert.AreEqual((RoundedDouble) 0, output.OvertoppingRateOutput.OvertoppingRate); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs =================================================================== diff -u -rce064290e953de172eb5823ad4caceb0342a0796 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision ce064290e953de172eb5823ad4caceb0342a0796) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -26,10 +26,8 @@ using Core.Common.Utils; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Data.IllustrationPoints; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.Data.TestUtil.IllustrationPoints; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.GrassCoverErosionInwards.Data; @@ -184,7 +182,7 @@ public void PropertyAttributes_WithDikeHeightAndOvertoppingRateCalculated_ReturnExpectedValues() { // Setup - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); var resultOutput = new OvertoppingOutput(10, true, probabilityAssessmentOutput, @@ -215,7 +213,7 @@ bool overtoppingRateCalculated) { // Setup - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); DikeHeightOutput dikeHeightOutput = null; OvertoppingRateOutput overtoppingRateOutput = null; @@ -264,7 +262,7 @@ public void PropertyAttributes_WithoutDikeHeightAndOvertoppingRateCalculated_ReturnExpectedValues(double waveHeight) { // Setup - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); var resultOutput = new OvertoppingOutput(waveHeight, true, probabilityAssessmentOutput, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs =================================================================== diff -u -rc072c430cf3193c3ada31a81bd0cd4e75f4a068a -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision c072c430cf3193c3ada31a81bd0cd4e75f4a068a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -143,7 +143,7 @@ public void PropertyAttributes_NoGeneralResult_ReturnExpectedValues(double waveHeight) { // Setup - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); var overtoppingOutput = new OvertoppingOutput(waveHeight, true, probabilityAssessmentOutput, @@ -221,7 +221,7 @@ public void PropertyAttributes_HasGeneralResult_ReturnExpectedValues(double waveHeight) { // Setup - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + var probabilityAssessmentOutput = new TestProbabilityAssessmentOutput(); var overtoppingOutput = new OvertoppingOutput(waveHeight, true, probabilityAssessmentOutput, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -ra64e778ac45d89e0bc35900b5c5b4a85e1f24089 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision a64e778ac45d89e0bc35900b5c5b4a85e1f24089) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -345,8 +345,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(double.NaN), - new TestDikeHeightOutput(0), - new TestOvertoppingRateOutput(0)) + new TestDikeHeightOutput(double.NaN), + new TestOvertoppingRateOutput(double.NaN)) }; FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) @@ -460,8 +460,8 @@ var failedCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(double.NaN), - new TestDikeHeightOutput(0), - new TestOvertoppingRateOutput(0)) + new TestDikeHeightOutput(double.NaN), + new TestOvertoppingRateOutput(double.NaN)) }; FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) @@ -515,8 +515,8 @@ Calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(double.NaN), - new TestDikeHeightOutput(0), - new TestOvertoppingRateOutput(0)) + new TestDikeHeightOutput(double.NaN), + new TestOvertoppingRateOutput(double.NaN)) } }, "-").SetName("SectionWithInvalidCalculationOutput"); yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section) Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra64e778ac45d89e0bc35900b5c5b4a85e1f24089 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision a64e778ac45d89e0bc35900b5c5b4a85e1f24089) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -81,8 +81,8 @@ if (status == CalculationScenarioStatus.Failed) { calculation.Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(double.NaN), - new TestDikeHeightOutput(0), - new TestOvertoppingRateOutput(0)); + new TestDikeHeightOutput(double.NaN), + new TestOvertoppingRateOutput(double.NaN)); } FailureMechanismSection section = CreateSection(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -rce064290e953de172eb5823ad4caceb0342a0796 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionInwardsDataSynchronizationServiceTest.cs) (revision ce064290e953de172eb5823ad4caceb0342a0796) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionInwardsDataSynchronizationServiceTest.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -29,7 +29,6 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service; using Ringtoets.GrassCoverErosionInwards.Data; @@ -569,7 +568,7 @@ var calculation = new GrassCoverErosionInwardsCalculation(); var calculationWithOutput = new GrassCoverErosionInwardsCalculation { - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), null), + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0), new TestDikeHeightOutput(0), new TestOvertoppingRateOutput(0)) }; @@ -579,7 +578,7 @@ { HydraulicBoundaryLocation = hydraulicBoundaryLocation }, - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), null), + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0), new TestDikeHeightOutput(0), new TestOvertoppingRateOutput(0)) }; @@ -618,7 +617,7 @@ var subCalculation = new GrassCoverErosionInwardsCalculation(); var subCalculationWithOutput = new GrassCoverErosionInwardsCalculation { - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), null), + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0), new TestDikeHeightOutput(0), new TestOvertoppingRateOutput(0)) }; Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj =================================================================== diff -u -ree69e9ae048b12022d18677c2773fb1bb0a6e229 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj (.../Ringtoets.Integration.TestUtils.csproj) (revision ee69e9ae048b12022d18677c2773fb1bb0a6e229) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj (.../Ringtoets.Integration.TestUtils.csproj) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -115,6 +115,10 @@ {90de728e-48ef-4665-ab38-3d88e41d9f4d} Ringtoets.GrassCoverErosionInwards.Data + + {BF753DB5-973B-4ADF-B0F6-9437325C3466} + Ringtoets.GrassCoverErosionInwards.Data.TestUtil + {e7225477-577f-4a17-b7ec-6721158e1543} Ringtoets.GrassCoverErosionOutwards.Data Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs =================================================================== diff -u -ree69e9ae048b12022d18677c2773fb1bb0a6e229 -r3c5eb8dc63626571ddee036cac675707bd0b0ff0 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision ee69e9ae048b12022d18677c2773fb1bb0a6e229) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 3c5eb8dc63626571ddee036cac675707bd0b0ff0) @@ -28,11 +28,11 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; using Ringtoets.DuneErosion.Data; using Ringtoets.GrassCoverErosionInwards.Data; +using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data; @@ -325,19 +325,19 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation, DikeProfile = dikeprofile1 }, - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), null), - new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null), - new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null)) + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0), + new TestDikeHeightOutput(0, CalculationConvergence.CalculatedConverged), + new TestOvertoppingRateOutput(0, CalculationConvergence.CalculatedConverged)) }; var calculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { InputParameters = { HydraulicBoundaryLocation = hydraulicBoundaryLocation }, - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), null), - new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null), - new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null)) + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0), + new TestDikeHeightOutput(0, CalculationConvergence.CalculatedConverged), + new TestOvertoppingRateOutput(0, CalculationConvergence.CalculatedConverged)) }; var calculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -363,19 +363,19 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation, DikeProfile = dikeprofile2 }, - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), null), - new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null), - new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null)) + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0), + new TestDikeHeightOutput(0, CalculationConvergence.CalculatedConverged), + new TestOvertoppingRateOutput(0, CalculationConvergence.CalculatedConverged)) }; var subCalculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { InputParameters = { HydraulicBoundaryLocation = hydraulicBoundaryLocation }, - Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), null), - new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null), - new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null)) + Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0), + new TestDikeHeightOutput(0, CalculationConvergence.CalculatedConverged), + new TestOvertoppingRateOutput(0, CalculationConvergence.CalculatedConverged)) }; var subCalculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation {