Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r36881fc8e4d292e0afd803303f54b55c696bce67 -r086f83a97089b51a29a20af7c08b8220e2fb1a24 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 36881fc8e4d292e0afd803303f54b55c696bce67) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 086f83a97089b51a29a20af7c08b8220e2fb1a24) @@ -22,7 +22,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Core.Common.Base.Data; using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data; using Riskeer.Common.Data.Calculation; @@ -412,7 +411,6 @@ { entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadWaterPressureAsphaltCoverMechanismSectionResults(failureMechanism, collector); - entity.ReadWaterPressureAsphaltCoverGeneralInput(failureMechanism.GeneralInput); } private static void ReadWaterPressureAsphaltCoverMechanismSectionResults(this FailureMechanismEntity entity, @@ -430,11 +428,6 @@ } } - private static void ReadWaterPressureAsphaltCoverGeneralInput(this FailureMechanismEntity entity, GeneralInput generalInput) - { - entity.WaterPressureAsphaltCoverFailureMechanismMetaEntities.Single().Read(generalInput); - } - #endregion #region Closing Structures @@ -715,7 +708,6 @@ { entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadGrassCoverSlipOffInwardsMechanismSectionResults(failureMechanism, collector); - entity.ReadGrassCoverSlipOffInwardsGeneralInput(failureMechanism.GeneralInput); } private static void ReadGrassCoverSlipOffInwardsMechanismSectionResults(this FailureMechanismEntity entity, @@ -733,11 +725,6 @@ } } - private static void ReadGrassCoverSlipOffInwardsGeneralInput(this FailureMechanismEntity entity, GeneralInput generalInput) - { - entity.GrassCoverSlipOffInwardsFailureMechanismMetaEntities.Single().Read(generalInput); - } - #endregion #region Grass Cover Slip Off Outwards @@ -756,7 +743,6 @@ { entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadGrassCoverSlipOffOutwardsMechanismSectionResults(failureMechanism, collector); - entity.ReadGrassCoverSlipOffOutwardsGeneralInput(failureMechanism.GeneralInput); } private static void ReadGrassCoverSlipOffOutwardsMechanismSectionResults(this FailureMechanismEntity entity, @@ -774,11 +760,6 @@ } } - private static void ReadGrassCoverSlipOffOutwardsGeneralInput(this FailureMechanismEntity entity, GeneralInput generalInput) - { - entity.GrassCoverSlipOffOutwardsFailureMechanismMetaEntities.Single().Read(generalInput); - } - #endregion #region Microstability @@ -797,7 +778,6 @@ { entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadMicrostabilityMechanismSectionResults(failureMechanism, collector); - entity.ReadMicrostabilityGeneralInput(failureMechanism.GeneralInput); } private static void ReadMicrostabilityMechanismSectionResults(this FailureMechanismEntity entity, @@ -815,11 +795,6 @@ } } - private static void ReadMicrostabilityGeneralInput(this FailureMechanismEntity entity, GeneralInput generalInput) - { - entity.MicrostabilityFailureMechanismMetaEntities.Single().Read(generalInput); - } - #endregion #region Piping Structure @@ -853,8 +828,6 @@ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadPipingStructureMechanismSectionResults(failureMechanism, collector); - - failureMechanism.GeneralInput.N = (RoundedDouble) entity.PipingStructureFailureMechanismMetaEntities.Single().N; } private static void ReadPipingStructureMechanismSectionResults(this FailureMechanismEntity entity, Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/SpecificFailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -r086f83a97089b51a29a20af7c08b8220e2fb1a24 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/SpecificFailureMechanismEntityReadExtensions.cs (.../SpecificFailureMechanismEntityReadExtensions.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/SpecificFailureMechanismEntityReadExtensions.cs (.../SpecificFailureMechanismEntityReadExtensions.cs) (revision 086f83a97089b51a29a20af7c08b8220e2fb1a24) @@ -21,7 +21,6 @@ using System; using System.Linq; -using Core.Common.Base.Data; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Storage.Core.DbContext; using Riskeer.Storage.Core.Read.FailureMechanismSectionResults; @@ -55,12 +54,7 @@ var failureMechanism = new SpecificFailureMechanism { Name = entity.Name, - Code = entity.Code, - GeneralInput = - { - N = (RoundedDouble) entity.N, - ApplyLengthEffectInSection = Convert.ToBoolean(entity.ApplyLengthEffectInSection) - } + Code = entity.Code }; entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); ReadFailureMechanismSectionResults(entity, failureMechanism, collector); Fisheye: Tag 086f83a97089b51a29a20af7c08b8220e2fb1a24 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/StandAloneFailureMechanismMetaEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r36881fc8e4d292e0afd803303f54b55c696bce67 -r086f83a97089b51a29a20af7c08b8220e2fb1a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 36881fc8e4d292e0afd803303f54b55c696bce67) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 086f83a97089b51a29a20af7c08b8220e2fb1a24) @@ -896,9 +896,6 @@ Assert.AreEqual(inAssemblyOutputComments, section.PipingStructure.InAssemblyOutputComments.Body); Assert.AreEqual(notInAssemblyComments, section.PipingStructure.NotInAssemblyComments.Body); Assert.IsNull(section.PipingStructure.FailureMechanismSectionSourcePath); - - RoundedDouble actualN = section.PipingStructure.GeneralInput.N; - Assert.AreEqual(parameterN, actualN, actualN.GetAccuracy()); } [Test] @@ -971,23 +968,19 @@ // Assert AssertFailureMechanismEqual(microstabilityInAssembly, microstabilityEntity, - section.Microstability, - microstabilityEntity.MicrostabilityFailureMechanismMetaEntities.Single().N); + section.Microstability); AssertFailureMechanismEqual(waterPressureAsphaltCoverInAssembly, waterPressureAsphaltCoverEntity, - section.WaterPressureAsphaltCover, - waterPressureAsphaltCoverEntity.WaterPressureAsphaltCoverFailureMechanismMetaEntities.Single().N); + section.WaterPressureAsphaltCover); AssertFailureMechanismEqual(grassCoverSlipOffOutwardsInAssembly, grassRevetmentSlidingOutwardsEntity, - section.GrassCoverSlipOffOutwards, - grassRevetmentSlidingOutwardsEntity.GrassCoverSlipOffOutwardsFailureMechanismMetaEntities.Single().N); + section.GrassCoverSlipOffOutwards); AssertFailureMechanismEqual(grassCoverSlipOffInwardsInAssembly, grassRevetmentSlidingInwardsEntity, - section.GrassCoverSlipOffInwards, - grassRevetmentSlidingInwardsEntity.GrassCoverSlipOffInwardsFailureMechanismMetaEntities.Single().N); + section.GrassCoverSlipOffInwards); } [Test] @@ -1048,7 +1041,6 @@ Assert.AreEqual(inAssemblyInputComments1, firstSpecificFailureMechanism.InAssemblyInputComments.Body); Assert.AreEqual(inAssemblyOutputComments1, firstSpecificFailureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(notInAssemblyComments1, firstSpecificFailureMechanism.NotInAssemblyComments.Body); - Assert.AreEqual(n1, firstSpecificFailureMechanism.GeneralInput.N, firstSpecificFailureMechanism.GeneralInput.N.GetAccuracy()); Assert.IsNull(firstSpecificFailureMechanism.FailureMechanismSectionSourcePath); SpecificFailureMechanism secondSpecificFailureMechanism = section.SpecificFailureMechanisms[1]; @@ -1058,7 +1050,6 @@ Assert.AreEqual(inAssemblyInputComments2, secondSpecificFailureMechanism.InAssemblyInputComments.Body); Assert.AreEqual(inAssemblyOutputComments2, secondSpecificFailureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(notInAssemblyComments2, secondSpecificFailureMechanism.NotInAssemblyComments.Body); - Assert.AreEqual(n2, secondSpecificFailureMechanism.GeneralInput.N, secondSpecificFailureMechanism.GeneralInput.N.GetAccuracy()); Assert.IsNull(secondSpecificFailureMechanism.FailureMechanismSectionSourcePath); } @@ -1220,15 +1211,14 @@ private static void AssertFailureMechanismEqual(bool expectedInAssembly, FailureMechanismEntity entity, - T failureMechanism, double n) + T failureMechanism) where T : IFailureMechanism, IHasGeneralInput { Assert.AreEqual(expectedInAssembly, failureMechanism.InAssembly); Assert.AreEqual(entity.InAssemblyInputComments, failureMechanism.InAssemblyInputComments.Body); Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath); - Assert.AreEqual(failureMechanism.GeneralInput.N, n, failureMechanism.GeneralInput.N.GetAccuracy()); } } } \ No newline at end of file Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r36881fc8e4d292e0afd803303f54b55c696bce67 -r086f83a97089b51a29a20af7c08b8220e2fb1a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 36881fc8e4d292e0afd803303f54b55c696bce67) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 086f83a97089b51a29a20af7c08b8220e2fb1a24) @@ -277,9 +277,6 @@ Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); - - GrassCoverSlipOffInwardsFailureMechanismMetaEntity metaEntity = entity.GrassCoverSlipOffInwardsFailureMechanismMetaEntities.Single(); - Assert.AreEqual(metaEntity.N, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); } [Test] @@ -404,9 +401,6 @@ Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); - - WaterPressureAsphaltCoverFailureMechanismMetaEntity metaEntity = entity.WaterPressureAsphaltCoverFailureMechanismMetaEntities.Single(); - Assert.AreEqual(metaEntity.N, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); } [Test] @@ -534,9 +528,6 @@ Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); - - GrassCoverSlipOffOutwardsFailureMechanismMetaEntity metaEntity = entity.GrassCoverSlipOffOutwardsFailureMechanismMetaEntities.Single(); - Assert.AreEqual(metaEntity.N, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); } [Test] @@ -661,9 +652,6 @@ Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); - - MicrostabilityFailureMechanismMetaEntity metaEntity = entity.MicrostabilityFailureMechanismMetaEntities.Single(); - Assert.AreEqual(metaEntity.N, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); } [Test] @@ -3824,9 +3812,6 @@ Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); - - PipingStructureFailureMechanismMetaEntity metaEntity = entity.PipingStructureFailureMechanismMetaEntities.Single(); - Assert.AreEqual(metaEntity.N, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); } [Test] Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -r086f83a97089b51a29a20af7c08b8220e2fb1a24 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs (.../SpecificFailureMechanismEntityReadExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs (.../SpecificFailureMechanismEntityReadExtensionsTest.cs) (revision 086f83a97089b51a29a20af7c08b8220e2fb1a24) @@ -26,7 +26,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Data.TestUtil; using Riskeer.Storage.Core.DbContext; using Riskeer.Storage.Core.Read; using Riskeer.Storage.Core.Serializers; @@ -102,9 +101,6 @@ Assert.AreEqual(entity.Code, specificFailureMechanism.Code); Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailureMechanism.Sections.Count()); Assert.AreEqual(filePath, specificFailureMechanism.FailureMechanismSectionSourcePath); - - Assert.AreEqual(entity.N, specificFailureMechanism.GeneralInput.N, specificFailureMechanism.GeneralInput.N.GetAccuracy()); - Assert.AreEqual(Convert.ToBoolean(entity.ApplyLengthEffectInSection), specificFailureMechanism.GeneralInput.ApplyLengthEffectInSection); } [Test] Fisheye: Tag 086f83a97089b51a29a20af7c08b8220e2fb1a24 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StandAloneFailureMechanismMetaEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff?