Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -r2d40530f727a2e56821b962d627492f885bffda0 -r2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 2d40530f727a2e56821b962d627492f885bffda0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9) @@ -128,7 +128,8 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1, 1, 1, 1, 1); - var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, null, null); + var overtoppingRateOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, null, overtoppingRateOutput); // Call GrassCoverErosionInwardsOutputEntity entity = output.Create(); @@ -142,7 +143,8 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1, 1, 1, 1, 1); - var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, null, null); + var dikeHeightOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, dikeHeightOutput, null); // Call GrassCoverErosionInwardsOutputEntity entity = output.Create(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r809badc1bc6d0bdc0fb769994bdb875f11485876 -r2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 809badc1bc6d0bdc0fb769994bdb875f11485876) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9) @@ -1565,11 +1565,12 @@ Assert.AreEqual(expectedOutput.WaveHeight, actualOutput.WaveHeight); Assert.AreEqual(expectedOutput.IsOvertoppingDominant, actualOutput.IsOvertoppingDominant); AssertProbabilityAssessmentOutput(expectedOutput.ProbabilityAssessmentOutput, actualOutput.ProbabilityAssessmentOutput); - AssertDikeHeightOutput(expectedOutput.DikeHeightOutput, actualOutput.DikeHeightOutput); + AssertHydraulicLoadsOutput(expectedOutput.DikeHeightOutput, actualOutput.DikeHeightOutput); + AssertHydraulicLoadsOutput(expectedOutput.OvertoppingRateOutput, actualOutput.OvertoppingRateOutput); } - private static void AssertDikeHeightOutput(HydraulicLoadsOutput expectedOutput, - HydraulicLoadsOutput actualOutput) + private static void AssertHydraulicLoadsOutput(HydraulicLoadsOutput expectedOutput, + HydraulicLoadsOutput actualOutput) { if (expectedOutput == null) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r2d40530f727a2e56821b962d627492f885bffda0 -r2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 2d40530f727a2e56821b962d627492f885bffda0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9) @@ -52,6 +52,7 @@ Assert.AreEqual(entity.WaveHeight, output.WaveHeight.Value); Assert.IsFalse(output.IsOvertoppingDominant); Assert.IsNull(output.DikeHeightOutput); + Assert.IsNull(output.OvertoppingRateOutput); Assert.AreEqual(entity.FactorOfSafety, output.ProbabilityAssessmentOutput.FactorOfSafety.Value); Assert.AreEqual(entity.Probability, output.ProbabilityAssessmentOutput.Probability); Assert.AreEqual(entity.RequiredProbability, output.ProbabilityAssessmentOutput.RequiredProbability); @@ -81,6 +82,7 @@ Assert.IsNaN(output.WaveHeight); Assert.IsTrue(output.IsOvertoppingDominant); Assert.IsNull(output.DikeHeightOutput); + Assert.IsNull(output.OvertoppingRateOutput); Assert.IsNaN(output.ProbabilityAssessmentOutput.FactorOfSafety); Assert.IsNaN(output.ProbabilityAssessmentOutput.Probability); Assert.IsNaN(output.ProbabilityAssessmentOutput.RequiredProbability); @@ -89,7 +91,7 @@ } [Test] - public void Read_ValidEntityWithOutputEntity_ReturnGrassCoverErosionInwardsOutputWithOutput() + public void Read_ValidEntityWithDikeHeightOutputEntity_ReturnGrassCoverErosionInwardsOutputWithDikeHeightOutput() { // Setup var entity = new GrassCoverErosionInwardsOutputEntity @@ -106,5 +108,24 @@ // Assert Assert.IsNotNull(output.DikeHeightOutput); } + + [Test] + public void Read_ValidEntityWithOvertoppingRateOutputEntity_ReturnGrassCoverErosionInwardsOutputWithOvertoppingRateOutput() + { + // Setup + var entity = new GrassCoverErosionInwardsOutputEntity + { + GrassCoverErosionInwardsOvertoppingRateOutputEntities = + { + new GrassCoverErosionInwardsOvertoppingRateOutputEntity() + } + }; + + // Call + GrassCoverErosionInwardsOutput output = entity.Read(); + + // Assert + Assert.IsNotNull(output.OvertoppingRateOutput); + } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9) @@ -517,7 +517,7 @@ yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { AssessmentLayerOne = AssessmentLayerOneState.Sufficient, - Calculation = new GrassCoverErosionInwardsCalculation() + Calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.1, true, new ProbabilityAssessmentOutput(1.0, 1.0, double.NaN, 1.0, 1.0), @@ -528,7 +528,7 @@ yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { AssessmentLayerOne = AssessmentLayerOneState.Sufficient, - Calculation = new GrassCoverErosionInwardsCalculation() + Calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.1, true, new ProbabilityAssessmentOutput(1.0, 1.0, probability, 1.0, 1.0),