Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql =================================================================== diff -u -r24c1df1b88ca1cab3e87583e628d83c3b7510540 -re7c67131832e35dd30601221be735dca9a625ea3 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql (.../DatabaseStructure21.2.sql) (revision 24c1df1b88ca1cab3e87583e628d83c3b7510540) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql (.../DatabaseStructure21.2.sql) (revision e7c67131832e35dd30601221be735dca9a625ea3) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 15.2 */ -/* Created On : 24-jan-2022 08:09:58 */ +/* Created On : 24-jan-2022 15:11:57 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1054,15 +1054,13 @@ ( 'GrassCoverErosionOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismSectionEntityId' INTEGER NOT NULL, - 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther - 'DetailedAssessmentResultForFactorizedSignalingNorm' TINYINT (1) NOT NULL, -- Detailed result Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed - 'DetailedAssessmentResultForSignalingNorm' TINYINT (1) NOT NULL, -- Detailed result Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed - 'DetailedAssessmentResultForMechanismSpecificLowerLimitNorm' TINYINT (1) NOT NULL, -- Detailed result Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed - 'DetailedAssessmentResultForLowerLimitNorm' TINYINT (1) NOT NULL, -- Detailed result Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed - 'DetailedAssessmentResultForFactorizedLowerLimitNorm' TINYINT (1) NOT NULL, -- Detailed result Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed - 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = Iv, 3 = IIv, 4 = IIIv, 5 = IVv, 6 = Vv, 7 = VIv, 8 = VIIv - 'UseManualAssembly' TINYINT (1) NOT NULL, -- true or false - 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable 3 = Iv, 4 = IIv, 5 = IIIv, 6 = IVv, 7 = Vv, 8 = VIv, 9 = VIIv + 'IsRelevant' TINYINT (1) NOT NULL, -- true or false + 'InitialFailureMechanismResultType' TINYINT (1) NOT NULL, -- Enum: Manual = 1 NoFailureProbability = 2 + 'ManualInitialFailureMechanismResultSectionProbability' REAL NULL, + 'ManualInitialFailureMechanismResultProfileProbability' REAL NULL, + 'FurtherAnalysisNeeded' TINYINT (1) NOT NULL, -- true or false + 'RefinedSectionProbability' REAL NULL, + 'RefinedProfileProbability' REAL NULL, CONSTRAINT 'FK_GrassCoverErosionOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -r24c1df1b88ca1cab3e87583e628d83c3b7510540 -re7c67131832e35dd30601221be735dca9a625ea3 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 24c1df1b88ca1cab3e87583e628d83c3b7510540) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision e7c67131832e35dd30601221be735dca9a625ea3) @@ -201,7 +201,28 @@ [ForeshoreProfileCollectionSourcePath], 0 FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity; -INSERT INTO GrassCoverErosionOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsSectionResultEntity; +INSERT INTO GrassCoverErosionOutwardsSectionResultEntity ( +[GrassCoverErosionOutwardsSectionResultEntityId], + [FailureMechanismSectionEntityId], + [IsRelevant], + [InitialFailureMechanismResultType], + [ManualInitialFailureMechanismResultSectionProbability], + [ManualInitialFailureMechanismResultProfileProbability], + [FurtherAnalysisNeeded], + [RefinedSectionProbability], + [RefinedProfileProbability] +) +SELECT + [GrassCoverErosionOutwardsSectionResultEntityId], + [FailureMechanismSectionEntityId], + 1, + 1, + NULL, + NULL, + 0, + NULL, + NULL +FROM [SOURCEPROJECT].GrassCoverErosionOutwardsSectionResultEntity; INSERT INTO GrassCoverErosionOutwardsWaveConditionsCalculationEntity ( [GrassCoverErosionOutwardsWaveConditionsCalculationEntityId], [CalculationGroupEntityId], Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -rd514fb65f72d8055b6a856a0ade7c8cbcdeae632 -re7c67131832e35dd30601221be735dca9a625ea3 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision d514fb65f72d8055b6a856a0ade7c8cbcdeae632) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision e7c67131832e35dd30601221be735dca9a625ea3) @@ -78,6 +78,7 @@ AssertGrassCoverErosionOutwardsFailureMechanismMetaEntity(reader, sourceFilePath); AssertGrassCoverErosionOutwardsCalculations(reader, sourceFilePath); + AssertGrassCoverErosionOutwardsSectionResults(reader, sourceFilePath); AssertMacroStabilityOutwardsFailureMechanismMetaEntity(reader, sourceFilePath); @@ -1030,6 +1031,11 @@ reader.AssertReturnedDataIsValid(validateOtherCalculations); } + private void AssertGrassCoverErosionOutwardsSectionResults(MigratedDatabaseReader reader, string sourceFilePath) + { + AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResults(reader, "GrassCoverErosionOutwardsSectionResultEntity", sourceFilePath); + } + #endregion #region DuneErosion Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r24c1df1b88ca1cab3e87583e628d83c3b7510540 -re7c67131832e35dd30601221be735dca9a625ea3 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 24c1df1b88ca1cab3e87583e628d83c3b7510540) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision e7c67131832e35dd30601221be735dca9a625ea3) @@ -290,8 +290,8 @@ expectedAssessmentSection.WaveImpactAsphaltCover.SectionResults, actualAssessmentSection.WaveImpactAsphaltCover.SectionResults); AssertFailureMechanismSectionResults( - expectedAssessmentSection.GrassCoverErosionOutwards.SectionResultsOld, - actualAssessmentSection.GrassCoverErosionOutwards.SectionResultsOld); + expectedAssessmentSection.GrassCoverErosionOutwards.SectionResults, + actualAssessmentSection.GrassCoverErosionOutwards.SectionResults); AssertFailureMechanismSectionResults( expectedAssessmentSection.GrassCoverSlipOffInwards.SectionResultsOld, actualAssessmentSection.GrassCoverSlipOffInwards.SectionResultsOld); @@ -1838,25 +1838,6 @@ AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); } - private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, - IEnumerable actualSectionResults) - { - AssertCollectionAndItems(expectedSectionResults, - actualSectionResults, - (expectedItem, actualItem) => - { - Assert.AreEqual(expectedItem.SimpleAssessmentResult, actualItem.SimpleAssessmentResult); - Assert.AreEqual(expectedItem.DetailedAssessmentResultForFactorizedSignalingNorm, actualItem.DetailedAssessmentResultForFactorizedSignalingNorm); - Assert.AreEqual(expectedItem.DetailedAssessmentResultForSignalingNorm, actualItem.DetailedAssessmentResultForSignalingNorm); - Assert.AreEqual(expectedItem.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, actualItem.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm); - Assert.AreEqual(expectedItem.DetailedAssessmentResultForLowerLimitNorm, actualItem.DetailedAssessmentResultForLowerLimitNorm); - Assert.AreEqual(expectedItem.DetailedAssessmentResultForFactorizedLowerLimitNorm, actualItem.DetailedAssessmentResultForFactorizedLowerLimitNorm); - Assert.AreEqual(expectedItem.TailorMadeAssessmentResult, actualItem.TailorMadeAssessmentResult); - Assert.AreEqual(expectedItem.UseManualAssembly, actualItem.UseManualAssembly); - Assert.AreEqual(expectedItem.ManualAssemblyCategoryGroup, actualItem.ManualAssemblyCategoryGroup); - }); - } - private static void AssertGrassCoverErosionOutwardsWaveConditionsCalculation(GrassCoverErosionOutwardsWaveConditionsCalculation expectedCalculation, GrassCoverErosionOutwardsWaveConditionsCalculation actualCalculation) { Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r24c1df1b88ca1cab3e87583e628d83c3b7510540 -re7c67131832e35dd30601221be735dca9a625ea3 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 24c1df1b88ca1cab3e87583e628d83c3b7510540) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision e7c67131832e35dd30601221be735dca9a625ea3) @@ -150,7 +150,7 @@ AddForeshoreProfiles(grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles); ConfigureGrassCoverErosionOutwardsFailureMechanism(grassCoverErosionOutwardsFailureMechanism, assessmentSection); SetSections(grassCoverErosionOutwardsFailureMechanism); - SetSectionResults(grassCoverErosionOutwardsFailureMechanism.SectionResultsOld); + SetSectionResults(grassCoverErosionOutwardsFailureMechanism.SectionResults); StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; AddForeshoreProfiles(stabilityStoneCoverFailureMechanism.ForeshoreProfiles); @@ -2092,23 +2092,6 @@ }); } - private static void SetSectionResults(IEnumerable sectionResults) - { - var random = new Random(37); - foreach (GrassCoverErosionOutwardsFailureMechanismSectionResultOld sectionResult in sectionResults) - { - sectionResult.SimpleAssessmentResult = random.NextEnumValue(); - sectionResult.DetailedAssessmentResultForFactorizedSignalingNorm = random.NextEnumValue(); - sectionResult.DetailedAssessmentResultForSignalingNorm = random.NextEnumValue(); - sectionResult.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); - sectionResult.DetailedAssessmentResultForLowerLimitNorm = random.NextEnumValue(); - sectionResult.DetailedAssessmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); - sectionResult.TailorMadeAssessmentResult = random.NextEnumValue(); - sectionResult.UseManualAssembly = random.NextBoolean(); - sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue(); - } - } - #endregion #region StabilityStoneCover FailureMechanism