Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r73a1d6d9249e3c0e40603afaec38ff3c3f404764 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision 73a1d6d9249e3c0e40603afaec38ff3c3f404764) @@ -85,6 +85,9 @@ inputParameters.BreakWater.Type = (BreakWaterType) entity.BreakWaterType; inputParameters.DikeHeightCalculationType = (DikeHeightCalculationType) entity.DikeHeightCalculationType; inputParameters.OvertoppingRateCalculationType = (OvertoppingRateCalculationType) entity.OvertoppingRateCalculationType; + inputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + inputParameters.ShouldDikeHeightIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldDikeHeightIllustrationPointsBeCalculated); + inputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldOvertoppingRateIllustrationPointsBeCalculated); } private static void ReadOutput(GrassCoverErosionInwardsCalculation calculation, GrassCoverErosionInwardsCalculationEntity entity) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r73a1d6d9249e3c0e40603afaec38ff3c3f404764 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 73a1d6d9249e3c0e40603afaec38ff3c3f404764) @@ -56,7 +56,6 @@ { // Setup var random = new Random(14); - bool flagValue = random.NextBoolean(); var breakWaterType = random.NextEnumValue(); var dikeHeightCalculationType = random.NextEnumValue(); var overtoppingRateCalculationType = random.NextEnumValue(); @@ -69,13 +68,16 @@ Orientation = 5.6, CriticalFlowRateMean = 3.4, CriticalFlowRateStandardDeviation = 1.2, - UseForeshore = Convert.ToByte(flagValue), + UseForeshore = Convert.ToByte(random.NextBoolean()), DikeHeight = 2.3, - UseBreakWater = Convert.ToByte(flagValue), + UseBreakWater = Convert.ToByte(random.NextBoolean()), BreakWaterType = Convert.ToByte(breakWaterType), BreakWaterHeight = 5.7, DikeHeightCalculationType = Convert.ToByte(dikeHeightCalculationType), - OvertoppingRateCalculationType = Convert.ToByte(overtoppingRateCalculationType) + OvertoppingRateCalculationType = Convert.ToByte(overtoppingRateCalculationType), + ShouldOvertoppingOutputIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean()), + ShouldDikeHeightIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean()), + ShouldOvertoppingRateIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean()) }; var collector = new ReadConversionCollector(); @@ -91,13 +93,19 @@ Assert.AreEqual(entity.Orientation, input.Orientation.Value); Assert.AreEqual(entity.CriticalFlowRateMean, input.CriticalFlowRate.Mean.Value); Assert.AreEqual(entity.CriticalFlowRateStandardDeviation, input.CriticalFlowRate.StandardDeviation.Value); - Assert.AreEqual(flagValue, input.UseForeshore); + AssertBoolean(entity.UseForeshore, input.UseForeshore); Assert.AreEqual(entity.DikeHeight, input.DikeHeight.Value); - Assert.AreEqual(flagValue, input.UseBreakWater); + AssertBoolean(entity.UseBreakWater, input.UseBreakWater); Assert.AreEqual(breakWaterType, input.BreakWater.Type); Assert.AreEqual(entity.BreakWaterHeight, input.BreakWater.Height.Value); Assert.AreEqual(dikeHeightCalculationType, input.DikeHeightCalculationType); Assert.AreEqual(overtoppingRateCalculationType, input.OvertoppingRateCalculationType); + AssertBoolean(entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated, + input.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + AssertBoolean(entity.ShouldDikeHeightIllustrationPointsBeCalculated, + input.ShouldDikeHeightIllustrationPointsBeCalculated); + AssertBoolean(entity.ShouldOvertoppingRateIllustrationPointsBeCalculated, + input.ShouldOvertoppingRateIllustrationPointsBeCalculated); Assert.IsNull(input.DikeProfile); Assert.IsNull(input.HydraulicBoundaryLocation); @@ -293,5 +301,10 @@ // Assert Assert.AreSame(calculation, returnedCalculation); } + + private static void AssertBoolean(byte expectedByte, bool actual) + { + Assert.AreEqual(Convert.ToBoolean(expectedByte), actual); + } } } \ No newline at end of file