Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -40,9 +40,7 @@ { var sectionResultEntity = new GrassCoverSlipOffOutwardsSectionResultEntity { - LayerOne = Convert.ToByte(result.AssessmentLayerOne), - LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA), - LayerThree = result.AssessmentLayerThree.ToNaNAsNull() + LayerOne = Convert.ToByte(result.AssessmentLayerOne) }; return sectionResultEntity; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -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; @@ -49,8 +48,6 @@ } sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne; - sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult) entity.LayerTwoA; - sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -rb8df616ca911988b921b933bead5f1ef6862d076 -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision b8df616ca911988b921b933bead5f1ef6862d076) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -23,11 +23,9 @@ using Application.Ringtoets.Storage.Create.GrassCoverSlipOffOutwards; 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; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone.SectionResults; namespace Application.Ringtoets.Storage.Test.Create.GrassCoverSlipOffOutwards @@ -43,35 +41,14 @@ var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection()) { - AssessmentLayerOne = random.NextEnumValue(), - AssessmentLayerTwoA = random.NextEnumValue(), - AssessmentLayerThree = random.NextRoundedDouble() + AssessmentLayerOne = random.NextEnumValue() }; // Call GrassCoverSlipOffOutwardsSectionResultEntity result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne); - Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerTwoA), result.LayerTwoA); - Assert.AreEqual(sectionResult.AssessmentLayerThree, result.LayerThree, - sectionResult.AssessmentLayerThree.GetAccuracy()); } - - [Test] - public void Create_WithNaNLevel3Result_ReturnsEntityWithExpectedResults() - { - // Setup - var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection()) - { - AssessmentLayerThree = RoundedDouble.NaN - }; - - // Call - GrassCoverSlipOffOutwardsSectionResultEntity 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 -r590e1aeba4a1e5a622c8e8d89270167907920b43 -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 590e1aeba4a1e5a622c8e8d89270167907920b43) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -420,8 +420,6 @@ (expectedItem, actualItem) => { Assert.AreEqual(expectedItem.AssessmentLayerOne, actualItem.AssessmentLayerOne); - Assert.AreEqual(expectedItem.AssessmentLayerTwoA, actualItem.AssessmentLayerTwoA); - Assert.AreEqual(expectedItem.AssessmentLayerThree, actualItem.AssessmentLayerThree); }); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -rb8df616ca911988b921b933bead5f1ef6862d076 -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs) (revision b8df616ca911988b921b933bead5f1ef6862d076) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -75,39 +75,6 @@ // Assert Assert.IsNotNull(sectionResult); Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne); - Assert.AreEqual(layerTwoA, sectionResult.AssessmentLayerTwoA); - Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6); } - - [Test] - public void Read_EntityWithNullValues_SectionResultWithNaNValues() - { - // Setup - var random = new Random(21); - var layerOne = random.NextEnumValue(); - var layerTwoA = random.NextEnumValue(); - - var collector = new ReadConversionCollector(); - - var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); - collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); - var entity = new GrassCoverSlipOffOutwardsSectionResultEntity - { - LayerThree = null, - LayerTwoA = Convert.ToByte(layerTwoA), - LayerOne = Convert.ToByte(layerOne), - FailureMechanismSectionEntity = failureMechanismSectionEntity - }; - var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - entity.Read(sectionResult); - - // Assert - Assert.IsNotNull(sectionResult); - Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne); - Assert.AreEqual(layerTwoA, sectionResult.AssessmentLayerTwoA); - Assert.IsNaN(sectionResult.AssessmentLayerThree); - } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r590e1aeba4a1e5a622c8e8d89270167907920b43 -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 590e1aeba4a1e5a622c8e8d89270167907920b43) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -245,12 +245,9 @@ private static void SetSectionResults(IEnumerable sectionResults) { - var random = new Random(21); foreach (GrassCoverSlipOffOutwardsFailureMechanismSectionResult sectionResult in sectionResults) { sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState(); - sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult(); - sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResult.cs =================================================================== diff -u -r0bd28ca0dd82f99c1abce42ca904d4f607c7d6ec -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResult.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResult.cs) (revision 0bd28ca0dd82f99c1abce42ca904d4f607c7d6ec) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResult.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResult.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Primitives; @@ -45,10 +44,6 @@ DetailedAssessmentResult = DetailedAssessmentResultType.None; TailorMadeAssessmentResult = TailorMadeAssessmentResultType.None; ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None; - - SimpleAssessmentResult = SimpleAssessmentResultType.None; - AssessmentLayerTwoA = AssessmentLayerTwoAResult.NotCalculated; - AssessmentLayerThree = RoundedDouble.NaN; } /// @@ -75,16 +70,5 @@ /// Gets or sets the manually selected assembly category group. /// public FailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; } - - /// - /// Gets or sets the value of the detailed assessment of safety per failure mechanism section, for which - /// the result is a value of . - /// - public AssessmentLayerTwoAResult AssessmentLayerTwoA { 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/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r0bd28ca0dd82f99c1abce42ca904d4f607c7d6ec -r64fdab6f623c85ae3ad1b030ff4046c61773a38e --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs) (revision 0bd28ca0dd82f99c1abce42ca904d4f607c7d6ec) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs) (revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e) @@ -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; @@ -49,29 +48,6 @@ Assert.AreEqual(TailorMadeAssessmentResultType.None, result.TailorMadeAssessmentResult); Assert.IsFalse(result.UseManualAssemblyCategoryGroup); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup); - - Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA); - 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 GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section); - - // Call - failureMechanismSectionResult.AssessmentLayerThree = (RoundedDouble) newValue; - - // Assert - Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, - failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); - } } } \ No newline at end of file