Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs =================================================================== diff -u -r71d8173532c9c038e25caf03e296beb8e8f9cbe8 -rb0bd89548893f5b7a71580db36a2008d7d6f17f5 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision 71d8173532c9c038e25caf03e296beb8e8f9cbe8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision b0bd89548893f5b7a71580db36a2008d7d6f17f5) @@ -85,6 +85,8 @@ entityToUpdate.WidthFlowAperturesMean = input.WidthFlowApertures.Mean.ToNaNAsNull(); entityToUpdate.WidthFlowAperturesStandardDeviation = input.WidthFlowApertures.StandardDeviation.ToNaNAsNull(); + + entityToUpdate.ShouldIllustrationPointsBeCalculated = Convert.ToByte(input.ShouldIllustrationPointsBeCalculated); } #region ClosingStructures Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rb0bd89548893f5b7a71580db36a2008d7d6f17f5 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs (.../IStructuresCalculationEntity.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs (.../IStructuresCalculationEntity.cs) (revision b0bd89548893f5b7a71580db36a2008d7d6f17f5) @@ -44,6 +44,7 @@ byte UseForeshore { get; set; } byte BreakWaterType { get; set; } double? BreakWaterHeight { get; set; } + byte ShouldIllustrationPointsBeCalculated { get; set; } HydraulicLocationEntity HydraulicLocationEntity { get; set; } ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs =================================================================== diff -u -r71d8173532c9c038e25caf03e296beb8e8f9cbe8 -rb0bd89548893f5b7a71580db36a2008d7d6f17f5 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 71d8173532c9c038e25caf03e296beb8e8f9cbe8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision b0bd89548893f5b7a71580db36a2008d7d6f17f5) @@ -123,7 +123,8 @@ { Height = (RoundedDouble) random.NextDouble(), Type = BreakWaterType.Dam - } + }, + ShouldIllustrationPointsBeCalculated = random.NextBoolean() } }; @@ -134,8 +135,8 @@ // Assert Assert.AreEqual(0, entity.HeightStructuresCalculationEntityId); - Assert.AreEqual(name, entity.Name); - Assert.AreEqual(comments, entity.Comments); + TestHelper.AssertAreEqualButNotSame(name, entity.Name); + TestHelper.AssertAreEqualButNotSame(comments, entity.Comments); Assert.AreEqual(order, entity.Order); HeightStructuresInput input = calculation.InputParameters; @@ -168,6 +169,8 @@ Assert.AreEqual(Convert.ToByte(input.UseBreakWater), entity.UseBreakWater); Assert.AreEqual(Convert.ToByte(input.UseForeshore), entity.UseForeshore); + Assert.AreEqual(Convert.ToByte(input.ShouldIllustrationPointsBeCalculated), entity.ShouldIllustrationPointsBeCalculated); + CollectionAssert.IsEmpty(entity.HeightStructuresOutputEntities); } @@ -253,36 +256,6 @@ } [Test] - public void CreateForHeightStructures_StringPropertiesDoNotShareReference() - { - // Setup - const string name = "A"; - const string comment = "B"; - var calculation = new StructuresCalculation - { - Name = name, - Comments = - { - Body = comment - } - }; - - var registry = new PersistenceRegistry(); - - // Call - HeightStructuresCalculationEntity entity = calculation.CreateForHeightStructures(registry, 0); - - // Assert - Assert.AreNotSame(name, entity.Name, - "To create stable binary representations/fingerprints, it's really important that strings are not shared."); - Assert.AreEqual(name, entity.Name); - - Assert.AreNotSame(comment, entity.Comments, - "To create stable binary representations/fingerprints, it's really important that strings are not shared."); - Assert.AreEqual(comment, entity.Comments); - } - - [Test] public void CreateForHeightStructures_CalculationWithAlreadySavedHydraulicBoundaryLocation_ReturnEntityWithHydraulicLocationEntity() { // Setup @@ -480,7 +453,8 @@ Mean = (RoundedDouble) random.NextDouble(), StandardDeviation = (RoundedDouble) random.NextDouble() }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = (RoundedDouble) random.NextDouble() + ProbabilityOrFrequencyOpenStructureBeforeFlooding = (RoundedDouble) random.NextDouble(), + ShouldIllustrationPointsBeCalculated = random.NextBoolean() } }; @@ -492,8 +466,8 @@ ClosingStructuresCalculationEntity entity = calculation.CreateForClosingStructures(registry, order); // Assert - Assert.AreEqual(calculation.Name, entity.Name); - Assert.AreEqual(calculation.Comments.Body, entity.Comments); + TestHelper.AssertAreEqualButNotSame(calculation.Name, entity.Name); + TestHelper.AssertAreEqualButNotSame(calculation.Comments.Body, entity.Comments); ClosingStructuresInput inputParameters = calculation.InputParameters; Assert.AreEqual(inputParameters.StormDuration.Mean.Value, entity.StormDurationMean); @@ -533,6 +507,7 @@ Assert.AreEqual(inputParameters.LevelCrestStructureNotClosing.Mean.Value, entity.LevelCrestStructureNotClosingMean); Assert.AreEqual(inputParameters.LevelCrestStructureNotClosing.StandardDeviation.Value, entity.LevelCrestStructureNotClosingStandardDeviation); Assert.AreEqual(inputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding, entity.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(Convert.ToByte(inputParameters.ShouldIllustrationPointsBeCalculated), entity.ShouldIllustrationPointsBeCalculated); Assert.AreEqual(order, entity.Order); CollectionAssert.IsEmpty(entity.ClosingStructuresOutputEntities); @@ -895,7 +870,8 @@ DrainCoefficient = { Mean = (RoundedDouble) random.NextDouble() - } + }, + ShouldIllustrationPointsBeCalculated = random.NextBoolean() } }; @@ -907,8 +883,8 @@ StabilityPointStructuresCalculationEntity entity = calculation.CreateForStabilityPointStructures(registry, order); // Assert - Assert.AreEqual(calculation.Name, entity.Name); - Assert.AreEqual(calculation.Comments.Body, entity.Comments); + TestHelper.AssertAreEqualButNotSame(calculation.Name, entity.Name); + TestHelper.AssertAreEqualButNotSame(calculation.Comments.Body, entity.Comments); StabilityPointStructuresInput inputParameters = calculation.InputParameters; Assert.AreEqual(inputParameters.StormDuration.Mean.Value, entity.StormDurationMean); @@ -970,6 +946,7 @@ Assert.AreEqual(inputParameters.VolumicWeightWater.Value, entity.VolumicWeightWater); Assert.AreEqual(inputParameters.FactorStormDurationOpenStructure.Value, entity.FactorStormDurationOpenStructure); Assert.AreEqual(inputParameters.DrainCoefficient.Mean.Value, entity.DrainCoefficientMean); + Assert.AreEqual(Convert.ToByte(inputParameters.ShouldIllustrationPointsBeCalculated), entity.ShouldIllustrationPointsBeCalculated); Assert.AreEqual(order, entity.Order); CollectionAssert.IsEmpty(entity.StabilityPointStructuresOutputEntities);