Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rb8df616ca911988b921b933bead5f1ef6862d076 -rf84b3a8a54b6b95f0263732e6e5b5472c0b584e2 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision b8df616ca911988b921b933bead5f1ef6862d076) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision f84b3a8a54b6b95f0263732e6e5b5472c0b584e2) @@ -701,7 +701,7 @@ } [Test] - public void Read_WithMacroStabilityOutwardsFailureMechanismProperties_ReturnsNewAssessmentSectionWithPropertiesInMacroStabilityInwardsFailureMechanism() + public void Read_WithMacroStabilityOutwardsFailureMechanismProperties_ReturnsNewAssessmentSectionWithPropertiesInMacroStabilityOutwardsFailureMechanism() { // Setup AssessmentSectionEntity entity = CreateAssessmentSectionEntity(); @@ -715,7 +715,6 @@ var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismType = (int) FailureMechanismType.MacroStabilityOutwards, - CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), InputComments = inputComments, OutputComments = outputComments, @@ -788,6 +787,7 @@ Assert.AreEqual(originalInput, section.GrassCoverErosionInwards.InputComments.Body); Assert.AreEqual(originalOutput, section.GrassCoverErosionInwards.OutputComments.Body); Assert.AreEqual(originalNotRelevantText, section.GrassCoverErosionInwards.NotRelevantComments.Body); + RoundedDouble actualN = section.GrassCoverErosionInwards.GeneralInput.N; Assert.AreEqual(n, actualN, actualN.GetAccuracy()); } @@ -909,6 +909,7 @@ Assert.AreEqual(inputComments, section.GrassCoverErosionOutwards.InputComments.Body); Assert.AreEqual(outputComments, section.GrassCoverErosionOutwards.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.GrassCoverErosionOutwards.NotRelevantComments.Body); + RoundedDouble actualN = section.GrassCoverErosionOutwards.GeneralInput.N; Assert.AreEqual(n, actualN, actualN.GetAccuracy()); } @@ -1053,7 +1054,9 @@ Assert.AreEqual(inputComments, section.StabilityStoneCover.InputComments.Body); Assert.AreEqual(outputComments, section.StabilityStoneCover.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.StabilityStoneCover.NotRelevantComments.Body); - Assert.AreEqual(n, section.StabilityStoneCover.GeneralInput.N, section.StabilityStoneCover.GeneralInput.N.GetAccuracy()); + + RoundedDouble actualN = section.StabilityStoneCover.GeneralInput.N; + Assert.AreEqual(n, actualN, actualN.GetAccuracy()); } [Test] @@ -1200,9 +1203,9 @@ Assert.AreEqual(inputComments, section.WaveImpactAsphaltCover.InputComments.Body); Assert.AreEqual(outputComments, section.WaveImpactAsphaltCover.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.WaveImpactAsphaltCover.NotRelevantComments.Body); - Assert.AreEqual(deltaL, - section.WaveImpactAsphaltCover.GeneralWaveImpactAsphaltCoverInput.DeltaL, - section.WaveImpactAsphaltCover.GeneralWaveImpactAsphaltCoverInput.DeltaL.GetAccuracy()); + + RoundedDouble actualDeltaL = section.WaveImpactAsphaltCover.GeneralWaveImpactAsphaltCoverInput.DeltaL; + Assert.AreEqual(deltaL, actualDeltaL, actualDeltaL.GetAccuracy()); } [Test] @@ -1346,9 +1349,9 @@ Assert.AreEqual(inputComments, section.HeightStructures.InputComments.Body); Assert.AreEqual(outputComments, section.HeightStructures.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.HeightStructures.NotRelevantComments.Body); - Assert.AreEqual(n, - section.HeightStructures.GeneralInput.N, - section.HeightStructures.GeneralInput.N.GetAccuracy()); + + RoundedDouble actualN = section.HeightStructures.GeneralInput.N; + Assert.AreEqual(n, actualN, actualN.GetAccuracy()); } [Test] @@ -1436,9 +1439,9 @@ Assert.AreEqual(inputComments, section.StabilityPointStructures.InputComments.Body); Assert.AreEqual(outputComments, section.StabilityPointStructures.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.StabilityPointStructures.NotRelevantComments.Body); - Assert.AreEqual(n, - section.StabilityPointStructures.GeneralInput.N, - section.StabilityPointStructures.GeneralInput.N.GetAccuracy()); + + RoundedDouble actualN = section.StabilityPointStructures.GeneralInput.N; + Assert.AreEqual(n, actualN, actualN.GetAccuracy()); } [Test] @@ -1482,9 +1485,9 @@ Assert.AreEqual(inputComments, section.DuneErosion.InputComments.Body); Assert.AreEqual(outputComments, section.DuneErosion.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.DuneErosion.NotRelevantComments.Body); - Assert.AreEqual(n, - section.DuneErosion.GeneralInput.N, - section.DuneErosion.GeneralInput.N.GetAccuracy()); + + RoundedDouble actualN = section.DuneErosion.GeneralInput.N; + Assert.AreEqual(n, actualN, actualN.GetAccuracy()); } [Test] @@ -1518,6 +1521,50 @@ } [Test] + public void Read_WithPipingStructureFailureMechanismProperties_ReturnsNewAssessmentSectionWithPropertiesInPipingStructureFailureMechanism() + { + // Setup + AssessmentSectionEntity entity = CreateAssessmentSectionEntity(); + var random = new Random(21); + bool isRelevant = random.NextBoolean(); + double parameterN = random.NextDouble(); + const string inputComments = "Some input text"; + const string outputComments = "Some output text"; + const string notRelevantComments = "Really not relevant"; + + var failureMechanismEntity = new FailureMechanismEntity + { + FailureMechanismType = (int) FailureMechanismType.PipingAtStructure, + IsRelevant = Convert.ToByte(isRelevant), + InputComments = inputComments, + OutputComments = outputComments, + NotRelevantComments = notRelevantComments, + PipingStructureFailureMechanismMetaEntities = + { + new PipingStructureFailureMechanismMetaEntity + { + N = parameterN + } + } + }; + entity.FailureMechanismEntities.Add(failureMechanismEntity); + entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity()); + + var collector = new ReadConversionCollector(); + + // Call + AssessmentSection section = entity.Read(collector); + + // Assert + Assert.AreEqual(isRelevant, section.MacroStabilityOutwards.IsRelevant); + Assert.AreEqual(inputComments, section.MacroStabilityOutwards.InputComments.Body); + Assert.AreEqual(outputComments, section.MacroStabilityOutwards.OutputComments.Body); + Assert.AreEqual(notRelevantComments, section.MacroStabilityOutwards.NotRelevantComments.Body); + + Assert.AreEqual(parameterN, section.PipingStructure.N); + } + + [Test] public void Read_WithStandAloneFailureMechanisms_ReturnsNewAssessmentSectionWithFailureMechanismsSet() { // Setup Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -rfbe227cf3a6743302f63c1bd3281feda0273192c -rf84b3a8a54b6b95f0263732e6e5b5472c0b584e2 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision f84b3a8a54b6b95f0263732e6e5b5472c0b584e2) @@ -604,7 +604,7 @@ } [Test] - public void ReadAsMacroStabilityInwardsFailureMechanism_WithoutCollector_ThrowsArgumentNullException() + public void ReadAsMacroStabilityInwardsFailureMechanism_CollectorNull_ThrowsArgumentNullException() { // Setup var entity = new FailureMechanismEntity(); @@ -974,7 +974,7 @@ } [Test] - public void ReadAsMacroStabilityOutwardsFailureMechanism_WithoutCollector_ThrowsArgumentNullException() + public void ReadAsMacroStabilityOutwardsFailureMechanism_CollectorNull_ThrowsArgumentNullException() { // Setup var entity = new FailureMechanismEntity(); @@ -2615,7 +2615,7 @@ } [Test] - public void ReadAsPipingStructureFailureMechanism_WithoutCollector_ThrowsArgumentNullException() + public void ReadAsPipingStructureFailureMechanism_CollectorNull_ThrowsArgumentNullException() { // Setup var entity = new FailureMechanismEntity(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -r3061754a4b9696a84aa3979bf271c04c7f357c90 -rf84b3a8a54b6b95f0263732e6e5b5472c0b584e2 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 3061754a4b9696a84aa3979bf271c04c7f357c90) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision f84b3a8a54b6b95f0263732e6e5b5472c0b584e2) @@ -22,7 +22,6 @@ using System; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read.GrassCoverErosionInwards; -using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil;