Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -40,8 +40,7 @@ { var sectionResultEntity = new WaterPressureAsphaltCoverSectionResultEntity { - LayerOne = Convert.ToByte(result.AssessmentLayerOne), - LayerThree = result.AssessmentLayerThree.ToNaNAsNull() + LayerOne = Convert.ToByte(result.AssessmentLayerOne) }; return sectionResultEntity; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -21,7 +21,6 @@ using System; using Application.Ringtoets.Storage.DbContext; -using Core.Common.Base.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -48,7 +47,6 @@ throw new ArgumentNullException(nameof(sectionResult)); } sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne; - sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -23,7 +23,6 @@ using Application.Ringtoets.Storage.Create.WaterPressureAsphaltCover; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.TestUtil; -using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,36 +39,17 @@ // Setup var random = new Random(); var assessmentLayerOneResult = random.NextEnumValue(); - const double assessmentLayerThreeResult = 3.2; var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()) { - AssessmentLayerOne = assessmentLayerOneResult, - AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult + AssessmentLayerOne = assessmentLayerOneResult }; // Call WaterPressureAsphaltCoverSectionResultEntity result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); - Assert.AreEqual(assessmentLayerThreeResult, result.LayerThree); } - - [Test] - public void Create_WithNaNLevel3Result_ReturnsEntityWithExpectedResults() - { - // Setup - var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()) - { - AssessmentLayerThree = RoundedDouble.NaN - }; - - // Call - WaterPressureAsphaltCoverSectionResultEntity result = sectionResult.Create(); - - // Assert - Assert.IsNull(result.LayerThree); - } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 802d3cd39b925ac9873ea277588ecd1933e374f6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -394,7 +394,6 @@ (expectedItem, actualItem) => { Assert.AreEqual(expectedItem.AssessmentLayerOne, actualItem.AssessmentLayerOne); - Assert.AreEqual(expectedItem.AssessmentLayerThree, actualItem.AssessmentLayerThree); }); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -rb8df616ca911988b921b933bead5f1ef6862d076 -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision b8df616ca911988b921b933bead5f1ef6862d076) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -73,35 +73,6 @@ // Assert Assert.IsNotNull(sectionResult); Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne); - Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6); } - - [Test] - public void Read_EntityWithNullValues_SectionResultWithNaNValues() - { - // Setup - var random = new Random(21); - var layerOne = random.NextEnumValue(); - - var collector = new ReadConversionCollector(); - - var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); - collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); - var entity = new WaterPressureAsphaltCoverSectionResultEntity - { - LayerThree = null, - LayerOne = Convert.ToByte(layerOne), - FailureMechanismSectionEntity = failureMechanismSectionEntity - }; - var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - entity.Read(sectionResult); - - // Assert - Assert.IsNotNull(sectionResult); - Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne); - Assert.IsNaN(sectionResult.AssessmentLayerThree); - } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 802d3cd39b925ac9873ea277588ecd1933e374f6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -214,11 +214,9 @@ private static void SetSectionResults(IEnumerable sectionResults) { - var random = new Random(21); foreach (WaterPressureAsphaltCoverFailureMechanismSectionResult sectionResult in sectionResults) { sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState(); - sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResult.cs =================================================================== diff -u -r7bd24b7b29d22e92f3e82453d4db798c73c6389b -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResult.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResult.cs) (revision 7bd24b7b29d22e92f3e82453d4db798c73c6389b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResult.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResult.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Core.Common.Base.Data; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Primitives; @@ -36,12 +35,12 @@ /// /// Creates a new instance of . /// - public WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSection section) : base(section) + public WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSection section) + : base(section) { SimpleAssessmentResult = SimpleAssessmentResultType.None; TailorMadeAssessmentResult = TailorMadeAssessmentResultType.None; ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None; - AssessmentLayerThree = RoundedDouble.NaN; } /// @@ -63,10 +62,5 @@ /// Gets or sets the manually selected assembly category group. /// public FailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; } - - /// - /// Gets or sets the value of the tailored assessment of safety. - /// - public RoundedDouble AssessmentLayerThree { get; set; } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResultTest.cs =================================================================== diff -u -r7bd24b7b29d22e92f3e82453d4db798c73c6389b -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultTest.cs) (revision 7bd24b7b29d22e92f3e82453d4db798c73c6389b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultTest.cs) (revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d) @@ -19,7 +19,6 @@ // 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.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; @@ -48,28 +47,6 @@ Assert.AreEqual(TailorMadeAssessmentResultType.None, result.TailorMadeAssessmentResult); Assert.IsFalse(result.UseManualAssemblyCategoryGroup); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup); - - Assert.IsNaN(result.AssessmentLayerThree); } - - [Test] - [TestCase(double.NaN)] - [TestCase(double.PositiveInfinity)] - [TestCase(double.NegativeInfinity)] - [TestCase(5)] - [TestCase(0.5)] - public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var failureMechanismSectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(section); - - // Call - failureMechanismSectionResult.AssessmentLayerThree = (RoundedDouble) newValue; - - // Assert - Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, - failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); - } } } \ No newline at end of file