Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -40,7 +40,6 @@ using Riskeer.Storage.Core.Create.PipingStructure; using Riskeer.Storage.Core.Create.StabilityPointStructures; using Riskeer.Storage.Core.Create.StabilityStoneCover; -using Riskeer.Storage.Core.Create.StrengthStabilityLengthwise; using Riskeer.Storage.Core.Create.TechnicalInnovation; using Riskeer.Storage.Core.Create.WaterPressureAsphaltCover; using Riskeer.Storage.Core.Create.WaveImpactAsphaltCover; @@ -90,7 +89,6 @@ entity.FailureMechanismEntities.Add(section.Piping.Create(registry)); entity.FailureMechanismEntities.Add(section.GrassCoverErosionInwards.Create(registry)); entity.FailureMechanismEntities.Add(section.HeightStructures.Create(registry)); - entity.FailureMechanismEntities.Add(section.StrengthStabilityLengthwiseConstruction.Create(registry)); entity.FailureMechanismEntities.Add(section.TechnicalInnovation.Create(registry)); entity.FailureMechanismEntities.Add(section.WaterPressureAsphaltCover.Create(registry)); entity.FailureMechanismEntities.Add(section.ClosingStructures.Create(registry)); Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -102,11 +102,6 @@ GrassRevetmentSlidingInwards = 16, /// - /// Sterkte en stabiliteit langsconstructies - STKWl - /// - StrengthAndStabilityParallelConstruction = 17, - - /// /// Technische innovaties - INN /// TechnicalInnovations = 18 Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -77,7 +77,6 @@ entity.ReadPipingFailureMechanism(assessmentSection, collector); entity.ReadGrassCoverErosionInwardsFailureMechanism(assessmentSection, collector); entity.ReadHeightStructuresFailureMechanism(assessmentSection, collector); - entity.ReadStrengthStabilityLengthwiseConstructionFailureMechanism(assessmentSection, collector); entity.ReadTechnicalInnovationFailureMechanism(assessmentSection, collector); entity.ReadWaterPressureAsphaltCoverFailureMechanism(assessmentSection, collector); entity.ReadClosingStructuresFailureMechanism(assessmentSection, collector); @@ -182,12 +181,6 @@ heightStructuresFailureMechanismEntity?.ReadAsHeightStructuresFailureMechanism(assessmentSection.HeightStructures, collector); } - private static void ReadStrengthStabilityLengthwiseConstructionFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity strengthStabilityLengthwiseConstructionFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StrengthAndStabilityParallelConstruction); - strengthStabilityLengthwiseConstructionFailureMechanismEntity?.ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(assessmentSection.StrengthStabilityLengthwiseConstruction, collector); - } - private static void ReadTechnicalInnovationFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { FailureMechanismEntity technicalInnovationFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.TechnicalInnovations); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -312,43 +312,6 @@ #endregion - #region Strength Stability Lengthwise Construction - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - internal static void ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(this FailureMechanismEntity entity, - StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadStrengthStabilityLengthwiseConstructionMechanismSectionResults(failureMechanism, collector); - entity.ReadStrengthStabilityLengthwiseConstructionGeneralInput(failureMechanism.GeneralInput); - } - - private static void ReadStrengthStabilityLengthwiseConstructionMechanismSectionResults(this FailureMechanismEntity entity, - StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (StrengthStabilityLengthwiseConstructionSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StrengthStabilityLengthwiseConstructionSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultOld result = failureMechanism.SectionResultsOld.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - private static void ReadStrengthStabilityLengthwiseConstructionGeneralInput(this FailureMechanismEntity entity, GeneralInput generalInput) - { - entity.StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntities.Single().Read(generalInput); - } - - #endregion - #region Technical Innovation /// Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/StrengthStabilityLengthwiseConstructionFailureMechanismEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -117,7 +117,7 @@ Assert.AreEqual(lowerLimitNorm, entity.LowerLimitNorm); Assert.AreEqual(signalingNorm, entity.SignalingNorm); Assert.AreEqual(Convert.ToByte(normativeNorm), entity.NormativeNormType); - Assert.AreEqual(17, entity.FailureMechanismEntities.Count); + Assert.AreEqual(16, entity.FailureMechanismEntities.Count); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.Piping)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.GrassRevetmentTopErosionAndInwards)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.MacroStabilityInwards)); @@ -132,7 +132,6 @@ Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.ReliabilityClosingOfStructure)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.PipingAtStructure)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.StabilityPointStructures)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.StrengthAndStabilityParallelConstruction)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.DuneErosion)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.TechnicalInnovations)); Assert.AreEqual(assessmentSection.SpecificFailurePaths.Count, entity.SpecificFailurePathEntities.Count); Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -268,9 +268,6 @@ expectedAssessmentSection.HeightStructures.SectionResults, actualAssessmentSection.HeightStructures.SectionResults); AssertFailureMechanismSectionResults( - expectedAssessmentSection.StrengthStabilityLengthwiseConstruction.SectionResultsOld, - actualAssessmentSection.StrengthStabilityLengthwiseConstruction.SectionResultsOld); - AssertFailureMechanismSectionResults( expectedAssessmentSection.TechnicalInnovation.SectionResultsOld, actualAssessmentSection.TechnicalInnovation.SectionResultsOld); AssertFailureMechanismSectionResults( @@ -316,21 +313,6 @@ } private static void AssertFailureMechanismSectionResults( - IEnumerable expectedSectionResults, - IEnumerable actualSectionResults) - { - AssertCollectionAndItems(expectedSectionResults, - actualSectionResults, - (expectedItem, actualItem) => - { - Assert.AreEqual(expectedItem.SimpleAssessmentResult, actualItem.SimpleAssessmentResult); - Assert.AreEqual(expectedItem.TailorMadeAssessmentResult, actualItem.TailorMadeAssessmentResult); - Assert.AreEqual(expectedItem.UseManualAssembly, actualItem.UseManualAssembly); - Assert.AreEqual(expectedItem.ManualAssemblyCategoryGroup, actualItem.ManualAssemblyCategoryGroup); - }); - } - - private static void AssertFailureMechanismSectionResults( IEnumerable expectedSectionResults, IEnumerable actualSectionResults) { Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -935,17 +935,6 @@ } }; - FailureMechanismEntity strengthAndStabilityParallelConstruction = CreateFailureMechanismEntity( - strengthAndStabilityParallelConstructionInAssembly, - FailureMechanismType.StrengthAndStabilityParallelConstruction); - strengthAndStabilityParallelConstruction.StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntities = new List - { - new StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity - { - N = 2.0 - } - }; - FailureMechanismEntity waterOverpressureAsphaltRevetment = CreateFailureMechanismEntity( waterOverpressureAsphaltRevetmentInAssembly, FailureMechanismType.WaterOverpressureAsphaltRevetment); @@ -991,7 +980,6 @@ }; entity.FailureMechanismEntities.Add(microstability); - entity.FailureMechanismEntities.Add(strengthAndStabilityParallelConstruction); entity.FailureMechanismEntities.Add(waterOverpressureAsphaltRevetment); entity.FailureMechanismEntities.Add(grassRevetmentSlidingOutwards); entity.FailureMechanismEntities.Add(grassRevetmentSlidingInwards); @@ -1012,14 +1000,6 @@ section.Microstability, microstability.MicrostabilityFailureMechanismMetaEntities.Single().N); - AssertFailureMechanismEqual(strengthAndStabilityParallelConstructionInAssembly, - strengthAndStabilityParallelConstruction.InAssemblyInputComments, - strengthAndStabilityParallelConstruction.InAssemblyOutputComments, - strengthAndStabilityParallelConstruction.NotInAssemblyComments, - strengthAndStabilityParallelConstruction.CalculationsInputComments, - section.StrengthStabilityLengthwiseConstruction, - strengthAndStabilityParallelConstruction.StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntities.Single().N); - AssertFailureMechanismEqual(waterOverpressureAsphaltRevetmentInAssembly, waterOverpressureAsphaltRevetment.InAssemblyInputComments, waterOverpressureAsphaltRevetment.InAssemblyOutputComments, Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r1958e6df32818dfb601d1a70af00932634df5472 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 1958e6df32818dfb601d1a70af00932634df5472) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -193,51 +193,6 @@ #endregion - #region StrengthAndStabilityParallelConstruction - - [Test] - public void ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism_WithPropertiesSet_SetsStrengthAndStabilityParallelConstructionFailureMechanismProperties() - { - // Setup - var random = new Random(31); - bool inAssembly = random.NextBoolean(); - var entity = new FailureMechanismEntity - { - InAssembly = Convert.ToByte(inAssembly), - InAssemblyInputComments = "Some input text", - InAssemblyOutputComments = "Some output text", - NotInAssemblyComments = "Really not in assembly", - CalculationsInputComments = "Some calculation text", - CalculationGroupEntity = new CalculationGroupEntity(), - StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntities = new[] - { - new StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity - { - N = random.NextRoundedDouble(1.0, 20.0) - } - } - }; - var collector = new ReadConversionCollector(); - var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism(); - - // Call - entity.ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(failureMechanism, collector); - - // Assert - Assert.IsNotNull(failureMechanism); - Assert.AreEqual(inAssembly, failureMechanism.InAssembly); - Assert.AreEqual(entity.InAssemblyInputComments, failureMechanism.InAssemblyInputComments.Body); - Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); - Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); - Assert.AreEqual(entity.CalculationsInputComments, failureMechanism.CalculationsInputComments.Body); - CollectionAssert.IsEmpty(failureMechanism.Sections); - - StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity metaEntity = entity.StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntities.Single(); - Assert.AreEqual(metaEntity.N, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); - } - - #endregion - #region TechnicalInnovation [Test] Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ebb17b07334ce5554c591fb3f5b903329ba243e7 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r77b4c0a26d6b848c813427db5fff74d51e467150 -rebb17b07334ce5554c591fb3f5b903329ba243e7 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 77b4c0a26d6b848c813427db5fff74d51e467150) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) @@ -213,11 +213,6 @@ SetSections(grassCoverSlipOffOutwardsFailureMechanism); SetSectionResults(grassCoverSlipOffOutwardsFailureMechanism.SectionResultsOld); - StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction; - SetGeneralInput(strengthStabilityLengthwiseConstructionFailureMechanism, random.Next()); - SetSections(strengthStabilityLengthwiseConstructionFailureMechanism); - SetSectionResults(strengthStabilityLengthwiseConstructionFailureMechanism.SectionResultsOld); - SetSectionResults(assessmentSection.DuneErosion.SectionResultsOld); TechnicalInnovationFailureMechanism technicalInnovationFailureMechanism = assessmentSection.TechnicalInnovation; @@ -266,18 +261,6 @@ "Comment"); } - private static void SetSectionResults(IEnumerable sectionResults) - { - var random = new Random(39); - foreach (StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultOld sectionResult in sectionResults) - { - sectionResult.SimpleAssessmentResult = random.NextEnumValue(); - sectionResult.TailorMadeAssessmentResult = random.NextEnumValue(); - sectionResult.UseManualAssembly = random.NextBoolean(); - sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue(); - } - } - private static void SetSectionResults(IEnumerable sectionResults) { var random = new Random(39);