Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -re7c67131832e35dd30601221be735dca9a625ea3 -rad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision e7c67131832e35dd30601221be735dca9a625ea3) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision ad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0) @@ -202,7 +202,7 @@ 0 FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity; INSERT INTO GrassCoverErosionOutwardsSectionResultEntity ( -[GrassCoverErosionOutwardsSectionResultEntityId], + [GrassCoverErosionOutwardsSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], [InitialFailureMechanismResultType], @@ -412,7 +412,28 @@ 0 FROM [SOURCEPROJECT].FailureMechanismEntity WHERE FailureMechanismType = 14; -INSERT INTO MicrostabilitySectionResultEntity SELECT * FROM [SOURCEPROJECT].MicrostabilitySectionResultEntity; +INSERT INTO MicrostabilitySectionResultEntity ( + [MicrostabilitySectionResultEntityId], + [FailureMechanismSectionEntityId], + [IsRelevant], + [InitialFailureMechanismResultType], + [ManualInitialFailureMechanismResultSectionProbability], + [ManualInitialFailureMechanismResultProfileProbability], + [FurtherAnalysisNeeded], + [RefinedSectionProbability], + [RefinedProfileProbability] +) +SELECT + [MicrostabilitySectionResultEntityId], + [FailureMechanismSectionEntityId], + 1, + 1, + NULL, + NULL, + 0, + NULL, + NULL +FROM [SOURCEPROJECT].MicrostabilitySectionResultEntity; INSERT INTO PipingCharacteristicPointEntity SELECT * FROM [SOURCEPROJECT].PipingCharacteristicPointEntity; INSERT INTO PipingFailureMechanismMetaEntity ( Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -re7c67131832e35dd30601221be735dca9a625ea3 -rad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision e7c67131832e35dd30601221be735dca9a625ea3) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision ad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0) @@ -106,6 +106,7 @@ AssertPipingStructureFailureMechanismSectionResults(reader, sourceFilePath); AssertDuneErosionFailureMechanismSectionResults(reader, sourceFilePath); AssertStabilityStoneCoverSectionResults(reader, sourceFilePath); + AssertMicrostabilitySectionResults(reader, sourceFilePath); } AssertLogDatabase(logFilePath); @@ -649,6 +650,11 @@ { AssertNonAdoptableFailureMechanismSectionResults(reader, "PipingStructureSectionResultEntity", sourceFilePath); } + + private static void AssertMicrostabilitySectionResults(MigratedDatabaseReader reader, string sourceFilePath) + { + AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResults(reader, "MicrostabilitySectionResultEntity", sourceFilePath); + } #endregion Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialMicrostabilitySectionResultEntity.cs =================================================================== diff -u --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialMicrostabilitySectionResultEntity.cs (revision 0) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialMicrostabilitySectionResultEntity.cs (revision ad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0) @@ -0,0 +1,29 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Riskeer.Storage.Core.DbContext +{ + /// + /// Partial implementation of that implements + /// . + /// + public partial class MicrostabilitySectionResultEntity : INonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity {} +} \ No newline at end of file Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -re7c67131832e35dd30601221be735dca9a625ea3 -rad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision e7c67131832e35dd30601221be735dca9a625ea3) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision ad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0) @@ -299,8 +299,8 @@ expectedAssessmentSection.GrassCoverSlipOffOutwards.SectionResultsOld, actualAssessmentSection.GrassCoverSlipOffOutwards.SectionResultsOld); AssertFailureMechanismSectionResults( - expectedAssessmentSection.Microstability.SectionResultsOld, - actualAssessmentSection.Microstability.SectionResultsOld); + expectedAssessmentSection.Microstability.SectionResults, + actualAssessmentSection.Microstability.SectionResults); AssertFailureMechanismSectionResults( expectedAssessmentSection.PipingStructure.SectionResults, actualAssessmentSection.PipingStructure.SectionResults); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -re7c67131832e35dd30601221be735dca9a625ea3 -rad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision e7c67131832e35dd30601221be735dca9a625ea3) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision ad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0) @@ -201,7 +201,7 @@ MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability; SetGeneralInput(microstabilityFailureMechanism, random.Next()); SetSections(microstabilityFailureMechanism); - SetSectionResults(microstabilityFailureMechanism.SectionResultsOld); + SetSectionResults(microstabilityFailureMechanism.SectionResults); WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCoverFailureMechanism = assessmentSection.WaterPressureAsphaltCover; SetGeneralInput(waterPressureAsphaltCoverFailureMechanism, random.Next()); @@ -348,19 +348,6 @@ } } - private static void SetSectionResults(IEnumerable sectionResults) - { - var random = new Random(39); - foreach (MicrostabilityFailureMechanismSectionResultOld sectionResult in sectionResults) - { - sectionResult.SimpleAssessmentResult = random.NextEnumValue(); - sectionResult.DetailedAssessmentResult = random.NextEnumValue(); - sectionResult.TailorMadeAssessmentResult = random.NextEnumValue(); - sectionResult.UseManualAssembly = random.NextBoolean(); - sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue(); - } - } - private static void SetSections(IFailurePath failurePath) { failurePath.SetSections(new[]