Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -r0b490a42d367d058be7bacc6eafd328d6d0dc74b -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 0b490a42d367d058be7bacc6eafd328d6d0dc74b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -56,6 +56,7 @@ Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForLowerLimitNormInput); Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForFactorizedLowerLimitNormInput); Assert.IsNull(calculator.DetailedAssessmentAssemblyGroupOutput); + Assert.IsNull(calculator.DetailedAssessmentAssemblyCategoriesInput); Assert.AreEqual(0.0, calculator.TailorMadeAssessmentProbabilityInput); @@ -64,6 +65,7 @@ Assert.AreEqual((TailorMadeAssessmentProbabilityCalculationResultType) 0, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); Assert.IsNull(calculator.TailorMadeAssessmentAssemblyOutput); + Assert.IsNull(calculator.TailorMadeAssessmentAssemblyCategoriesInput); Assert.AreEqual(0.0, calculator.TailorMadeAssessmentFailureMechanismContributionInput); Assert.AreEqual(0.0, calculator.TailorMadeAssessmentFailureMechanismNInput); @@ -83,8 +85,6 @@ Assert.AreEqual(0.0, calculator.ManualAssemblyProbabilityInput); Assert.IsNull(calculator.ManualAssemblyAssemblyOutput); Assert.IsNull(calculator.ManualAssemblyCategoriesInput); - - Assert.IsNull(calculator.AssemblyCategoriesInput); } private static AssemblyCategoriesInput CreateAssemblyCategoriesInput() @@ -355,7 +355,7 @@ // Assert Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(probability, calculator.DetailedAssessmentProbabilityInput); - Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput); + Assert.AreSame(assemblyCategoriesInput, calculator.DetailedAssessmentAssemblyCategoriesInput); } [Test] @@ -537,7 +537,7 @@ Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(probability, calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(n, calculator.DetailedAssessmentFailureMechanismSectionNInput); - Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput); + Assert.AreSame(assemblyCategoriesInput, calculator.DetailedAssessmentAssemblyCategoriesInput); } [Test] @@ -867,15 +867,15 @@ var tailorMadeAssessmentResult = random.NextEnumValue(); AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput(); - var calculator = new FailureMechanismSectionAssemblyCalculatorStub(); + var calculator = new FailureMechanismSectionAssemblyCalculatorStub(); // Call calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assemblyCategoriesInput); // Assert Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput); - Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput); + Assert.AreSame(assemblyCategoriesInput, calculator.TailorMadeAssessmentAssemblyCategoriesInput); } [Test] @@ -961,7 +961,7 @@ Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(n, calculator.TailorMadeAssessmentFailureMechanismSectionNInput); - Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput); + Assert.AreSame(assemblyCategoriesInput, calculator.TailorMadeAssessmentAssemblyCategoriesInput); } [Test] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs =================================================================== diff -u -r0b490a42d367d058be7bacc6eafd328d6d0dc74b -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision 0b490a42d367d058be7bacc6eafd328d6d0dc74b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -117,6 +117,11 @@ public DetailedAssessmentResultType DetailedAssessmentResultForFactorizedLowerLimitNormInput { get; private set; } /// + /// Gets the assembly categories input used in the detailed assessment calculation. + /// + public AssemblyCategoriesInput DetailedAssessmentAssemblyCategoriesInput { get; private set; } + + /// /// Gets or sets the output of the tailor made assessment calculation. /// public FailureMechanismSectionAssembly TailorMadeAssessmentAssemblyOutput { get; set; } @@ -172,6 +177,11 @@ public FailureMechanismSectionAssemblyCategoryGroup? TailorMadeAssemblyCategoryOutput { get; set; } /// + /// Gets the assembly categories input used in the tailor made assessment calculation. + /// + public AssemblyCategoriesInput TailorMadeAssessmentAssemblyCategoriesInput { get; private set; } + + /// /// Gets or sets the output of the combined assembly calculation. /// public FailureMechanismSectionAssembly CombinedAssemblyOutput { get; set; } @@ -232,11 +242,6 @@ public AssemblyCategoriesInput ManualAssemblyCategoriesInput { get; private set; } /// - /// Gets the assembly categories input used in the assembly calculation methods. - /// - public AssemblyCategoriesInput AssemblyCategoriesInput { get; private set; } - - /// /// Sets an indicator whether an exception must be thrown while performing a calculation. /// public bool ThrowExceptionOnCalculate { private get; set; } @@ -300,7 +305,7 @@ DetailedAssessmentProbabilityOnlyResultInput = detailedAssessmentResult; DetailedAssessmentProbabilityInput = probability; - AssemblyCategoriesInput = assemblyCategoriesInput; + DetailedAssessmentAssemblyCategoriesInput = assemblyCategoriesInput; return DetailedAssessmentAssemblyOutput ?? (DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv)); @@ -318,7 +323,7 @@ DetailedAssessmentProbabilityOnlyResultInput = detailedAssessmentResult; DetailedAssessmentProbabilityInput = probability; - AssemblyCategoriesInput = assemblyCategoriesInput; + DetailedAssessmentAssemblyCategoriesInput = assemblyCategoriesInput; DetailedAssessmentFailureMechanismSectionNInput = failureMechanismSectionN; return DetailedAssessmentAssemblyOutput ?? @@ -421,7 +426,7 @@ TailorMadeAssessmentProbabilityCalculationResultInput = tailorMadeAssessmentResult; TailorMadeAssessmentProbabilityInput = probability; - AssemblyCategoriesInput = assemblyCategoriesInput; + TailorMadeAssessmentAssemblyCategoriesInput = assemblyCategoriesInput; return TailorMadeAssessmentAssemblyOutput ?? (TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv)); @@ -439,7 +444,7 @@ TailorMadeAssessmentProbabilityCalculationResultInput = tailorMadeAssessmentResult; TailorMadeAssessmentProbabilityInput = probability; - AssemblyCategoriesInput = assemblyCategoriesInput; + TailorMadeAssessmentAssemblyCategoriesInput = assemblyCategoriesInput; TailorMadeAssessmentFailureMechanismSectionNInput = failureMechanismSectionN; return TailorMadeAssessmentAssemblyOutput ?? Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r1ddf50edb6feb6fcd47b338a141bf178a008a145 -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -223,7 +223,7 @@ Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.DetailedAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } @@ -376,7 +376,7 @@ // Assert Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.TailorMadeAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r1ddf50edb6feb6fcd47b338a141bf178a008a145 -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -223,7 +223,7 @@ Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.DetailedAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } @@ -376,7 +376,7 @@ // Assert Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.TailorMadeAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r1ddf50edb6feb6fcd47b338a141bf178a008a145 -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -223,7 +223,7 @@ Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.DetailedAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } @@ -376,7 +376,7 @@ // Assert Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.TailorMadeAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -r02aa5c4ae3ee7698a4cd0cd077037ff239350739 -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 02aa5c4ae3ee7698a4cd0cd077037ff239350739) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -24,6 +24,7 @@ using System.Linq; using Core.Common.Base.Geometry; using Core.Common.TestUtil; +using Core.Common.Util.Extensions; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.AssemblyTool.KernelWrapper.Calculators; @@ -75,19 +76,12 @@ const string name = "assessmentSectionName"; const string id = "assessmentSectionId"; - var referenceLine = new ReferenceLine(); - referenceLine.SetGeometry(new[] - { - new Point2D(1, 1), - new Point2D(2, 2) - }); - var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()) { Name = name, Id = id, - ReferenceLine = referenceLine + ReferenceLine = ReferenceLineTestFactory.CreateReferenceLineWithGeometry() }; FailureMechanismTestHelper.AddSections(assessmentSection.Piping, random.Next(1, 10)); @@ -115,7 +109,6 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call @@ -124,7 +117,7 @@ // Assert Assert.AreEqual(name, exportableAssessmentSection.Name); Assert.AreEqual(id, exportableAssessmentSection.Id); - CollectionAssert.AreEqual(referenceLine.Points, exportableAssessmentSection.Geometry); + CollectionAssert.AreEqual(assessmentSection.ReferenceLine.Points, exportableAssessmentSection.Geometry); ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyWithProbability = exportableAssessmentSection.FailureMechanismAssemblyWithProbability; Assert.AreEqual(ExportableAssemblyMethod.WBI2B1, failureMechanismAssemblyWithProbability.AssemblyMethod); @@ -153,24 +146,18 @@ } [Test] - public void GivenAssessmentSectionWithConfiguredFailureMechanism_WhenCreatingExportableAssessmentSection_ThenManualAssemblyIgnored() + public void CreateExportableAssessmentSection_AssessmentSectionWithManualSectionAssemblyWithProbability_ManualAssemblyNotExecuted() { // Given - var referenceLine = new ReferenceLine(); - referenceLine.SetGeometry(new[] - { - new Point2D(1, 1), - new Point2D(2, 2) - }); - var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()) { - ReferenceLine = referenceLine, + ReferenceLine = ReferenceLineTestFactory.CreateReferenceLineWithGeometry(), Id = "1" }; PipingFailureMechanism failureMechanism = assessmentSection.Piping; + failureMechanism.IsRelevant = true; FailureMechanismTestHelper.AddSections(failureMechanism, 1); PipingFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); sectionResult.UseManualAssembly = true; @@ -184,7 +171,9 @@ // Then var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - Assert.IsNull(failureMechanismSectionAssemblyCalculator.ManualAssemblyAssemblyOutput); + Assert.IsNull(failureMechanismSectionAssemblyCalculator.ManualAssemblyCategoriesInput); + Assert.Zero(failureMechanismSectionAssemblyCalculator.ManualAssemblyNInput); + Assert.Zero(failureMechanismSectionAssemblyCalculator.ManualAssemblyProbabilityInput); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r1ddf50edb6feb6fcd47b338a141bf178a008a145 -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -261,7 +261,7 @@ calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(sectionResult.Section.Length), calculator.DetailedAssessmentFailureMechanismSectionNInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.DetailedAssessmentAssemblyCategoriesInput); } } @@ -427,7 +427,7 @@ Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(sectionResult.Section.Length), calculator.TailorMadeAssessmentFailureMechanismSectionNInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.TailorMadeAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r1ddf50edb6feb6fcd47b338a141bf178a008a145 -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -261,7 +261,7 @@ calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetN(sectionResult.Section.Length), calculator.DetailedAssessmentFailureMechanismSectionNInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.DetailedAssessmentAssemblyCategoriesInput); } } @@ -427,7 +427,7 @@ Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetN(sectionResult.Section.Length), calculator.TailorMadeAssessmentFailureMechanismSectionNInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.TailorMadeAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r1ddf50edb6feb6fcd47b338a141bf178a008a145 -re8cf1562e0e938605a732ebf32f640fe00816dce --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision e8cf1562e0e938605a732ebf32f640fe00816dce) @@ -223,7 +223,7 @@ Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.DetailedAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } } @@ -376,7 +376,7 @@ // Assert Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.TailorMadeAssessmentAssemblyCategoriesInput); mocks.VerifyAll(); } }