Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r03d2eaef1672f479b2f4c42863c8469575b12cbe -r02a8684a876044288dc9564bc6083198f5a67c74 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 03d2eaef1672f479b2f4c42863c8469575b12cbe) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 02a8684a876044288dc9564bc6083198f5a67c74) @@ -40,6 +40,7 @@ using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.IllustrationPoints; using Riskeer.Common.Data.Structures; @@ -423,8 +424,17 @@ AssertComments(expectedFailureMechanism.CalculationsInputComments, actualFailureMechanism.CalculationsInputComments); AssertFailureMechanismSections(expectedFailureMechanism.Sections, actualFailureMechanism.Sections); Assert.AreEqual(expectedFailureMechanism.FailureMechanismSectionSourcePath, actualFailureMechanism.FailureMechanismSectionSourcePath); + + AssertFailurePathAssemblyResult(expectedFailureMechanism.AssemblyResult, actualFailureMechanism.AssemblyResult); } + private static void AssertFailurePathAssemblyResult(FailurePathAssemblyResult expectedResult, + FailurePathAssemblyResult actualResult) + { + Assert.AreEqual(expectedResult.ProbabilityResultType, actualResult.ProbabilityResultType); + Assert.AreEqual(expectedResult.ManualFailurePathAssemblyProbability, actualResult.ManualFailurePathAssemblyProbability); + } + private static void AssertFailureMechanismSections(IEnumerable expectedSections, IEnumerable actualSections) { @@ -729,6 +739,8 @@ AssertFailureMechanismSections(expected.Sections, actual.Sections); Assert.AreEqual(expected.Input.N, actual.Input.N); + + AssertFailurePathAssemblyResult(expected.AssemblyResult, actual.AssemblyResult); } #endregion Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r82abb790755e0197ffb10c679c91bbdd5e940efa -r02a8684a876044288dc9564bc6083198f5a67c74 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 82abb790755e0197ffb10c679c91bbdd5e940efa) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 02a8684a876044288dc9564bc6083198f5a67c74) @@ -230,7 +230,12 @@ SetSections(technicalInnovationFailureMechanism); SetSectionResults(technicalInnovationFailureMechanism.SectionResultsOld); - assessmentSection.GetFailureMechanisms().ForEachElementDo(SetComments); + var i = 0; + assessmentSection.GetFailureMechanisms().ForEachElementDo(fm => + { + SetComments(fm); + SetFailurePathAssemblyResults(fm, i++); + }); IEnumerable failurePaths = Enumerable.Repeat(new SpecificFailurePath(), random.Next(1, 10)) .ToArray(); @@ -576,6 +581,14 @@ failureMechanism.CalculationsInputComments.Body = $"Calculations input comment: {failureMechanism.Name}"; } + private static void SetFailurePathAssemblyResults(IFailurePath failurePath, int seed) + { + var random = new Random(seed); + FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult; + assemblyResult.ProbabilityResultType = random.NextEnumValue(); + assemblyResult.ManualFailurePathAssemblyProbability = random.NextDouble(); + } + #region MacroStabilityOutwards FailureMechanism private static void ConfigureMacroStabilityOutwardsFailureMechanism(MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism) @@ -611,6 +624,7 @@ failurePath.NotInAssemblyComments.Body = $"NotInAssembly comment path: {i}"; SetSections(failurePath); + SetFailurePathAssemblyResults(failurePath, i); i++; } }