Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r396e95150a2e0ec58015956fc562b9a00e0b56a2 -r1ddf50edb6feb6fcd47b338a141bf178a008a145 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 396e95150a2e0ec58015956fc562b9a00e0b56a2) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) @@ -532,20 +532,9 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -580,10 +569,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); Assert.IsNull(calculator.CombinedDetailedAssemblyInput); Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); @@ -615,8 +601,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly calculatorOutput = calculator.CombinedAssemblyOutput; - Assert.AreSame(calculatorOutput, actualOutput); + Assert.AreSame(calculator.CombinedAssemblyOutput, actualOutput); mocks.VerifyAll(); } } @@ -739,20 +724,9 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -761,10 +735,13 @@ public void GetSectionAssemblyCategoryGroup_WithManualInputAndUseManualTrue_SetsInputOnCalculator() { // Setup + var random = new Random(39); var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssembly = true, - ManualAssemblyProbability = new Random(39).NextDouble() + ManualAssemblyProbability = random.NextDouble(), + TailorMadeAssessmentResult = random.NextEnumValue(), + TailorMadeAssessmentProbability = random.NextDouble() }; var failureMechanism = new ClosingStructuresFailureMechanism(); @@ -845,6 +822,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = ClosingStructuresFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -853,11 +833,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -891,10 +867,7 @@ true); // Assert - FailureMechanismSectionAssembly expectedAssembly = calculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.ManualAssemblyAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -917,6 +890,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = ClosingStructuresFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -925,11 +901,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1059,6 +1031,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1067,11 +1040,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1097,6 +1066,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1105,11 +1075,7 @@ true); // Assert - FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismSectionAssembly expectedAssembly = sectionCalculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.ManualAssemblyAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1135,6 +1101,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1143,11 +1110,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r396e95150a2e0ec58015956fc562b9a00e0b56a2 -r1ddf50edb6feb6fcd47b338a141bf178a008a145 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 396e95150a2e0ec58015956fc562b9a00e0b56a2) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) @@ -205,7 +205,7 @@ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - DetailedAssessmentResult = new Random(39).NextEnumValue() + DetailedAssessmentResult = new Random(21).NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -533,20 +533,9 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -578,10 +567,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); Assert.IsNull(calculator.CombinedDetailedAssemblyInput); Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); @@ -613,8 +599,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly calculatorOutput = calculator.CombinedAssemblyOutput; - Assert.AreSame(calculatorOutput, actualOutput); + Assert.AreSame(calculator.CombinedAssemblyOutput, actualOutput); mocks.VerifyAll(); } } @@ -737,20 +722,9 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -759,10 +733,13 @@ public void GetSectionAssemblyCategoryGroup_WithManualInputAndUseManualTrue_SetsInputOnCalculator() { // Setup + var random = new Random(39); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssembly = true, - ManualAssemblyProbability = new Random(39).NextDouble() + ManualAssemblyProbability = random.NextDouble(), + TailorMadeAssessmentResult = random.NextEnumValue(), + TailorMadeAssessmentProbability = random.NextDouble() }; var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -843,6 +820,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -851,11 +831,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -889,10 +865,7 @@ true); // Assert - FailureMechanismSectionAssembly expectedAssembly = calculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.ManualAssemblyAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -915,6 +888,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -923,11 +899,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1057,6 +1029,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1065,11 +1038,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1095,6 +1064,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1103,11 +1073,7 @@ true); // Assert - FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismSectionAssembly expectedAssembly = sectionCalculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(failureMechanism.GeneralInput.N, failureMechanism, assessmentSection)); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.ManualAssemblyAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1133,6 +1099,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1141,11 +1108,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r396e95150a2e0ec58015956fc562b9a00e0b56a2 -r1ddf50edb6feb6fcd47b338a141bf178a008a145 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 396e95150a2e0ec58015956fc562b9a00e0b56a2) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) @@ -532,20 +532,9 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -580,10 +569,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); Assert.IsNull(calculator.CombinedDetailedAssemblyInput); Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); @@ -615,8 +601,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly calculatorOutput = calculator.CombinedAssemblyOutput; - Assert.AreSame(calculatorOutput, actualOutput); + Assert.AreSame(calculator.CombinedAssemblyOutput, actualOutput); mocks.VerifyAll(); } } @@ -739,20 +724,9 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -761,10 +735,13 @@ public void GetSectionAssemblyCategoryGroup_WithManualInputAndUseManualTrue_SetsInputOnCalculator() { // Setup + var random = new Random(39); var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssembly = true, - ManualAssemblyProbability = new Random(39).NextDouble() + ManualAssemblyProbability = random.NextDouble(), + TailorMadeAssessmentResult = random.NextEnumValue(), + TailorMadeAssessmentProbability = random.NextDouble() }; var failureMechanism = new HeightStructuresFailureMechanism(); @@ -845,6 +822,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = HeightStructuresFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -853,11 +833,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -891,10 +867,7 @@ true); // Assert - FailureMechanismSectionAssembly expectedAssembly = calculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.ManualAssemblyAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -917,6 +890,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = HeightStructuresFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -925,11 +901,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1059,6 +1031,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1067,11 +1040,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1097,6 +1066,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1105,11 +1075,7 @@ true); // Assert - FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismSectionAssembly expectedAssembly = sectionCalculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.ManualAssemblyAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1135,6 +1101,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1143,11 +1110,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r396e95150a2e0ec58015956fc562b9a00e0b56a2 -r1ddf50edb6feb6fcd47b338a141bf178a008a145 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 396e95150a2e0ec58015956fc562b9a00e0b56a2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) @@ -270,7 +270,6 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -308,7 +307,6 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -610,21 +608,9 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -660,10 +646,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); Assert.IsNull(calculator.CombinedDetailedAssemblyInput); Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); @@ -696,8 +679,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly calculatorOutput = calculator.CombinedAssemblyOutput; - Assert.AreSame(calculatorOutput, actualOutput); + Assert.AreSame(calculator.CombinedAssemblyOutput, actualOutput); mocks.VerifyAll(); } } @@ -821,21 +803,9 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -844,10 +814,13 @@ public void GetSectionAssemblyCategoryGroup_WithManualInputAndUseManualTrue_SetsInputOnCalculator() { // Setup + var random = new Random(39); var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssembly = true, - ManualAssemblyProbability = new Random(39).NextDouble() + ManualAssemblyProbability = random.NextDouble(), + TailorMadeAssessmentResult = random.NextEnumValue(), + TailorMadeAssessmentProbability = random.NextDouble() }; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); @@ -928,6 +901,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = MacroStabilityInwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -936,12 +912,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -975,10 +946,7 @@ true); // Assert - FailureMechanismSectionAssembly expectedAssembly = calculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.ManualAssemblyAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1001,6 +969,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = MacroStabilityInwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -1009,12 +980,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1144,6 +1110,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1152,12 +1119,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - Enumerable.Empty(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1183,6 +1145,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1191,11 +1154,7 @@ true); // Assert - FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismSectionAssembly expectedAssembly = sectionCalculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.ManualAssemblyAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1221,6 +1180,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1229,12 +1189,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - Enumerable.Empty(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r396e95150a2e0ec58015956fc562b9a00e0b56a2 -r1ddf50edb6feb6fcd47b338a141bf178a008a145 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 396e95150a2e0ec58015956fc562b9a00e0b56a2) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) @@ -51,7 +51,8 @@ Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, assemblyCategoriesInput.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, assemblyCategoriesInput.LowerLimitNorm); Assert.AreEqual(failureMechanism.Contribution, assemblyCategoriesInput.FailureMechanismContribution); - Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetN(failureMechanism.PipingProbabilityAssessmentInput.SectionLength), + Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetN( + failureMechanism.PipingProbabilityAssessmentInput.SectionLength), assemblyCategoriesInput.N); } @@ -269,7 +270,6 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); - var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -307,7 +307,6 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); - var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -609,21 +608,9 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = PipingFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = PipingFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = PipingFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -659,10 +646,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = PipingFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); Assert.IsNull(calculator.CombinedDetailedAssemblyInput); Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); @@ -695,8 +679,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly calculatorOutput = calculator.CombinedAssemblyOutput; - Assert.AreSame(calculatorOutput, actualOutput); + Assert.AreSame(calculator.CombinedAssemblyOutput, actualOutput); mocks.VerifyAll(); } } @@ -820,21 +803,9 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = PipingFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = PipingFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = PipingFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -843,10 +814,13 @@ public void GetSectionAssemblyCategoryGroup_WithManualInputAndUseManualTrue_SetsInputOnCalculator() { // Setup + var random = new Random(39); var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssembly = true, - ManualAssemblyProbability = new Random(39).NextDouble() + ManualAssemblyProbability = random.NextDouble(), + TailorMadeAssessmentResult = random.NextEnumValue(), + TailorMadeAssessmentProbability = random.NextDouble() }; var failureMechanism = new PipingFailureMechanism(); @@ -927,6 +901,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = PipingFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -935,12 +912,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = PipingFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -974,10 +946,7 @@ true); // Assert - FailureMechanismSectionAssembly expectedAssembly = calculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.ManualAssemblyAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1000,6 +969,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = PipingFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -1008,12 +980,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = PipingFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1143,6 +1110,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1151,12 +1119,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = PipingFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - Enumerable.Empty(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1182,6 +1145,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1190,11 +1154,7 @@ true); // Assert - FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismSectionAssembly expectedAssembly = sectionCalculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.ManualAssemblyAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1220,6 +1180,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1228,12 +1189,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = PipingFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - Enumerable.Empty(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r396e95150a2e0ec58015956fc562b9a00e0b56a2 -r1ddf50edb6feb6fcd47b338a141bf178a008a145 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 396e95150a2e0ec58015956fc562b9a00e0b56a2) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 1ddf50edb6feb6fcd47b338a141bf178a008a145) @@ -205,7 +205,7 @@ var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - DetailedAssessmentResult = new Random(39).NextEnumValue() + DetailedAssessmentResult = new Random(21).NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -533,20 +533,9 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -578,10 +567,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); Assert.IsNull(calculator.CombinedDetailedAssemblyInput); Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); @@ -613,8 +599,7 @@ assessmentSection); // Assert - FailureMechanismSectionAssembly calculatorOutput = calculator.CombinedAssemblyOutput; - Assert.AreSame(calculatorOutput, actualOutput); + Assert.AreSame(calculator.CombinedAssemblyOutput, actualOutput); mocks.VerifyAll(); } } @@ -737,20 +722,9 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedSimpleAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment( - sectionResult); - FailureMechanismSectionAssembly expectedDetailedAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssembly expectedTailorMadeAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment( - sectionResult, - failureMechanism, - assessmentSection); - - AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); - AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.SimpleAssessmentAssemblyOutput, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.DetailedAssessmentAssemblyOutput, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(calculator.TailorMadeAssessmentAssemblyOutput, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -759,10 +733,13 @@ public void GetSectionAssemblyCategoryGroup_WithManualInputAndUseManualTrue_SetsInputOnCalculator() { // Setup + var random = new Random(39); var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssembly = true, - ManualAssemblyProbability = new Random(39).NextDouble() + ManualAssemblyProbability = random.NextDouble(), + TailorMadeAssessmentResult = random.NextEnumValue(), + TailorMadeAssessmentProbability = random.NextDouble() }; var failureMechanism = new StabilityPointStructuresFailureMechanism(); @@ -843,6 +820,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = StabilityPointStructuresFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -851,11 +831,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -889,10 +865,7 @@ true); // Assert - FailureMechanismSectionAssembly expectedAssembly = calculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.ManualAssemblyAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -915,6 +888,9 @@ using (new AssemblyToolCalculatorFactoryConfig()) { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = StabilityPointStructuresFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult, @@ -923,11 +899,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - sectionResult, - failureMechanism, - assessmentSection); - Assert.AreEqual(expectedAssembly.Group, categoryGroup); + Assert.AreEqual(calculator.CombinedAssemblyOutput.Group, categoryGroup); mocks.VerifyAll(); } } @@ -1057,6 +1029,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1065,11 +1038,7 @@ new Random(39).NextBoolean()); // Assert - FailureMechanismSectionAssembly expectedAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1095,6 +1064,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1103,11 +1073,7 @@ true); // Assert - FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismSectionAssembly expectedAssembly = sectionCalculator.AssembleManual( - sectionResult.ManualAssemblyProbability, - AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(0.0, failureMechanism, assessmentSection)); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.ManualAssemblyAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } } @@ -1133,6 +1099,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismSectionAssemblyCalculatorStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism( @@ -1141,11 +1108,7 @@ false); // Assert - FailureMechanismSectionAssembly expectedAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleCombinedAssessment( - failureMechanism.SectionResults.Single(), - failureMechanism, - assessmentSection); - AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); + AssemblyToolTestHelper.AssertAreEqual(sectionCalculator.CombinedAssemblyOutput, calculator.FailureMechanismSectionAssemblies.Single()); mocks.VerifyAll(); } }