Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/HydraulicLoadsOutputCreateExtensionsTest.cs =================================================================== diff -u -r46caddf3f9694166feba0eb8647821bd15488cc1 -rc89ce995a19e908e86018319d8560e14ac2183de --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/HydraulicLoadsOutputCreateExtensionsTest.cs (.../HydraulicLoadsOutputCreateExtensionsTest.cs) (revision 46caddf3f9694166feba0eb8647821bd15488cc1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/HydraulicLoadsOutputCreateExtensionsTest.cs (.../HydraulicLoadsOutputCreateExtensionsTest.cs) (revision c89ce995a19e908e86018319d8560e14ac2183de) @@ -52,7 +52,7 @@ { // Setup var random = new Random(21); - var output = new HydraulicLoadsOutput( + var output = new DikeHeightOutput( random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextEnumValue()); @@ -74,8 +74,8 @@ { // Setup var random = new Random(21); - var output = new HydraulicLoadsOutput(double.NaN, double.NaN, double.NaN, - double.NaN, double.NaN, random.NextEnumValue()); + var output = new DikeHeightOutput(double.NaN, double.NaN, double.NaN, + double.NaN, double.NaN, random.NextEnumValue()); // Call GrassCoverErosionInwardsDikeHeightOutputEntity entity = output.CreateDikeHeight(); @@ -109,7 +109,7 @@ { // Setup var random = new Random(21); - var output = new HydraulicLoadsOutput( + var output = new OvertoppingRateOutput( random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextEnumValue()); @@ -131,8 +131,8 @@ { // Setup var random = new Random(21); - var output = new HydraulicLoadsOutput(double.NaN, double.NaN, double.NaN, - double.NaN, double.NaN, random.NextEnumValue()); + var output = new OvertoppingRateOutput(double.NaN, double.NaN, double.NaN, + double.NaN, double.NaN, random.NextEnumValue()); // Call GrassCoverErosionInwardsOvertoppingRateOutputEntity entity = output.CreateOvertoppingRate(); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -rc89ce995a19e908e86018319d8560e14ac2183de --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs (.../HydraulicLoadsOutput.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs (.../HydraulicLoadsOutput.cs) (revision c89ce995a19e908e86018319d8560e14ac2183de) @@ -27,9 +27,9 @@ namespace Ringtoets.GrassCoverErosionInwards.Data { /// - /// This class contains the result of a hydraulic loads calculation. + /// Base class for the result of a hydraulic loads calculation. /// - public class HydraulicLoadsOutput + public abstract class HydraulicLoadsOutput { /// /// Creates a new instance of . @@ -42,9 +42,9 @@ /// The convergence status of the calculation. /// Thrown when /// or falls outside the [0.0, 1.0] range and is not . - public HydraulicLoadsOutput(double result, double targetProbability, double targetReliability, - double calculatedProbability, double calculatedReliability, - CalculationConvergence calculationConvergence) + protected HydraulicLoadsOutput(double result, double targetProbability, double targetReliability, + double calculatedProbability, double calculatedReliability, + CalculationConvergence calculationConvergence) { ProbabilityHelper.ValidateProbability(targetProbability, nameof(targetProbability), true); ProbabilityHelper.ValidateProbability(calculatedProbability, nameof(calculatedProbability), true); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -rc89ce995a19e908e86018319d8560e14ac2183de --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs (.../HydraulicLoadsOutputTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs (.../HydraulicLoadsOutputTest.cs) (revision c89ce995a19e908e86018319d8560e14ac2183de) @@ -45,11 +45,11 @@ var convergence = random.NextEnumValue(); // Call - TestDelegate call = () => new HydraulicLoadsOutput(result, targetProbability, - targetReliability, - calculatedProbability, - calculatedReliability, - convergence); + TestDelegate call = () => new TestHydraulicLoadsOutput(result, targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence); // Assert var exception = Assert.Throws(call); @@ -72,11 +72,11 @@ var convergence = random.NextEnumValue(); // Call - TestDelegate call = () => new HydraulicLoadsOutput(result, targetProbability, - targetReliability, - calculatedProbability, - calculatedReliability, - convergence); + TestDelegate call = () => new TestHydraulicLoadsOutput(result, targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence); // Assert var exception = Assert.Throws(call); @@ -97,11 +97,11 @@ var convergence = random.NextEnumValue(); // Call - var output = new HydraulicLoadsOutput(result, targetProbability, - targetReliability, - calculatedProbability, - calculatedReliability, - convergence); + var output = new TestHydraulicLoadsOutput(result, targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence); // Assert Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); @@ -111,5 +111,13 @@ Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual(convergence, output.CalculationConvergence); } + + private class TestHydraulicLoadsOutput : HydraulicLoadsOutput + { + public TestHydraulicLoadsOutput(double result, double targetProbability, double targetReliability, + double calculatedProbability, double calculatedReliability, CalculationConvergence calculationConvergence) + : base(result, targetProbability, targetReliability, calculatedProbability, + calculatedReliability, calculationConvergence) {} + } } } \ No newline at end of file