Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -rebb17b07334ce5554c591fb3f5b903329ba243e7 -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -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.TechnicalInnovation; using Riskeer.Storage.Core.Create.WaterPressureAsphaltCover; using Riskeer.Storage.Core.Create.WaveImpactAsphaltCover; using Riskeer.Storage.Core.DbContext; @@ -89,7 +88,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.TechnicalInnovation.Create(registry)); entity.FailureMechanismEntities.Add(section.WaterPressureAsphaltCover.Create(registry)); entity.FailureMechanismEntities.Add(section.ClosingStructures.Create(registry)); entity.FailureMechanismEntities.Add(section.MacroStabilityInwards.Create(registry)); Fisheye: Tag 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs =================================================================== diff -u -rebb17b07334ce5554c591fb3f5b903329ba243e7 -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -99,11 +99,6 @@ /// /// Grasbekleding afschuiven binnentalud - GABI /// - GrassRevetmentSlidingInwards = 16, - - /// - /// Technische innovaties - INN - /// - TechnicalInnovations = 18 + GrassRevetmentSlidingInwards = 16 } } \ No newline at end of file Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -rebb17b07334ce5554c591fb3f5b903329ba243e7 -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -77,7 +77,6 @@ entity.ReadPipingFailureMechanism(assessmentSection, collector); entity.ReadGrassCoverErosionInwardsFailureMechanism(assessmentSection, collector); entity.ReadHeightStructuresFailureMechanism(assessmentSection, collector); - entity.ReadTechnicalInnovationFailureMechanism(assessmentSection, collector); entity.ReadWaterPressureAsphaltCoverFailureMechanism(assessmentSection, collector); entity.ReadClosingStructuresFailureMechanism(assessmentSection, collector); entity.ReadMacroStabilityInwardsFailureMechanism(assessmentSection, collector); @@ -181,12 +180,6 @@ heightStructuresFailureMechanismEntity?.ReadAsHeightStructuresFailureMechanism(assessmentSection.HeightStructures, collector); } - private static void ReadTechnicalInnovationFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity technicalInnovationFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.TechnicalInnovations); - technicalInnovationFailureMechanismEntity?.ReadAsTechnicalInnovationFailureMechanism(assessmentSection.TechnicalInnovation, collector); - } - private static void ReadWaterPressureAsphaltCoverFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { FailureMechanismEntity waterPressureAsphaltCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.WaterOverpressureAsphaltRevetment); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r181527453d92a774ce760a2bc41c9c265c031d82 -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 181527453d92a774ce760a2bc41c9c265c031d82) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -312,43 +312,6 @@ #endregion - #region Technical Innovation - - /// - /// 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 ReadAsTechnicalInnovationFailureMechanism(this FailureMechanismEntity entity, - TechnicalInnovationFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadTechnicalInnovationMechanismSectionResults(failureMechanism, collector); - entity.ReadTechnicalInnovationGeneralInput(failureMechanism.GeneralInput); - } - - private static void ReadTechnicalInnovationMechanismSectionResults(this FailureMechanismEntity entity, - TechnicalInnovationFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (TechnicalInnovationSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.TechnicalInnovationSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - TechnicalInnovationFailureMechanismSectionResultOld result = failureMechanism.SectionResultsOld.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - private static void ReadTechnicalInnovationGeneralInput(this FailureMechanismEntity entity, GeneralInput generalInput) - { - entity.TechnicalInnovationFailureMechanismMetaEntities.Single().Read(generalInput); - } - - #endregion - #region Water Pressure Asphalt /// Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -rebb17b07334ce5554c591fb3f5b903329ba243e7 -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -117,7 +117,7 @@ Assert.AreEqual(lowerLimitNorm, entity.LowerLimitNorm); Assert.AreEqual(signalingNorm, entity.SignalingNorm); Assert.AreEqual(Convert.ToByte(normativeNorm), entity.NormativeNormType); - Assert.AreEqual(16, entity.FailureMechanismEntities.Count); + Assert.AreEqual(15, 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)); @@ -133,7 +133,6 @@ 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.DuneErosion)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.TechnicalInnovations)); Assert.AreEqual(assessmentSection.SpecificFailurePaths.Count, entity.SpecificFailurePathEntities.Count); Assert.IsNull(entity.ReferenceLinePointXml); Fisheye: Tag 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r81e817d53fa78b1e8603cc906595f693ae1bb28f -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 81e817d53fa78b1e8603cc906595f693ae1bb28f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -268,9 +268,6 @@ expectedAssessmentSection.HeightStructures.SectionResults, actualAssessmentSection.HeightStructures.SectionResults); AssertFailureMechanismSectionResults( - expectedAssessmentSection.TechnicalInnovation.SectionResultsOld, - actualAssessmentSection.TechnicalInnovation.SectionResultsOld); - AssertFailureMechanismSectionResults( expectedAssessmentSection.WaterPressureAsphaltCover.SectionResults, actualAssessmentSection.WaterPressureAsphaltCover.SectionResults); AssertFailureMechanismSectionResults( @@ -313,21 +310,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 -rebb17b07334ce5554c591fb3f5b903329ba243e7 -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision ebb17b07334ce5554c591fb3f5b903329ba243e7) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -968,22 +968,10 @@ } }; - FailureMechanismEntity technicalInnovation = CreateFailureMechanismEntity( - technicalInnovationsInAssembly, - FailureMechanismType.TechnicalInnovations); - technicalInnovation.TechnicalInnovationFailureMechanismMetaEntities = new List - { - new TechnicalInnovationFailureMechanismMetaEntity - { - N = 6.0 - } - }; - entity.FailureMechanismEntities.Add(microstability); entity.FailureMechanismEntities.Add(waterOverpressureAsphaltRevetment); entity.FailureMechanismEntities.Add(grassRevetmentSlidingOutwards); entity.FailureMechanismEntities.Add(grassRevetmentSlidingInwards); - entity.FailureMechanismEntities.Add(technicalInnovation); entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity()); var collector = new ReadConversionCollector(); @@ -1023,14 +1011,6 @@ grassRevetmentSlidingInwards.CalculationsInputComments, section.GrassCoverSlipOffInwards, grassRevetmentSlidingInwards.GrassCoverSlipOffInwardsFailureMechanismMetaEntities.Single().N); - - AssertFailureMechanismEqual(technicalInnovationsInAssembly, - technicalInnovation.InAssemblyInputComments, - technicalInnovation.InAssemblyOutputComments, - technicalInnovation.NotInAssemblyComments, - technicalInnovation.CalculationsInputComments, - section.TechnicalInnovation, - technicalInnovation.TechnicalInnovationFailureMechanismMetaEntities.Single().N); } [Test] Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r181527453d92a774ce760a2bc41c9c265c031d82 -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 181527453d92a774ce760a2bc41c9c265c031d82) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -103,51 +103,6 @@ #endregion - #region TechnicalInnovation - - [Test] - public void ReadAsTechnicalInnovationFailureMechanism_WithPropertiesSet_SetsTechnicalInnovationFailureMechanismProperties() - { - // 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(), - TechnicalInnovationFailureMechanismMetaEntities = new[] - { - new TechnicalInnovationFailureMechanismMetaEntity - { - N = random.NextRoundedDouble(1.0, 20.0) - } - } - }; - var collector = new ReadConversionCollector(); - var failureMechanism = new TechnicalInnovationFailureMechanism(); - - // Call - entity.ReadAsTechnicalInnovationFailureMechanism(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); - - TechnicalInnovationFailureMechanismMetaEntity metaEntity = entity.TechnicalInnovationFailureMechanismMetaEntities.Single(); - Assert.AreEqual(metaEntity.N, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); - } - - #endregion - private static FailureMechanismSectionEntity CreateSimpleFailureMechanismSectionEntity() { var dummyPoints = new[] Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r81e817d53fa78b1e8603cc906595f693ae1bb28f -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 81e817d53fa78b1e8603cc906595f693ae1bb28f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8) @@ -215,11 +215,6 @@ SetSectionResults(assessmentSection.DuneErosion.SectionResultsOld); - TechnicalInnovationFailureMechanism technicalInnovationFailureMechanism = assessmentSection.TechnicalInnovation; - SetGeneralInput(technicalInnovationFailureMechanism, random.Next()); - SetSections(technicalInnovationFailureMechanism); - SetSectionResults(technicalInnovationFailureMechanism.SectionResultsOld); - var i = 0; assessmentSection.GetFailureMechanisms().ForEachElementDo(fm => { @@ -261,18 +256,6 @@ "Comment"); } - private static void SetSectionResults(IEnumerable sectionResults) - { - var random = new Random(39); - foreach (TechnicalInnovationFailureMechanismSectionResultOld 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);