Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r80d36751940e21e14d24b16e6c6e62bcd6615fcd -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 80d36751940e21e14d24b16e6c6e62bcd6615fcd) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -216,8 +216,6 @@ /// /// Assembles the failure mechanism assembly. /// - /// The failure mechanism section results to - /// get the assembly for. /// The failure mechanism to assemble for. /// The the failure mechanism belongs to. /// Indicator whether the manual assembly should be used in the assembly. @@ -226,16 +224,10 @@ /// Thrown when the /// could not be created. public static FailureMechanismAssembly AssembleFailureMechanism( - IEnumerable failureMechanismSectionResults, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection, bool considerManualAssembly = true) { - if (failureMechanismSectionResults == null) - { - throw new ArgumentNullException(nameof(failureMechanismSectionResults)); - } - if (failureMechanism == null) { throw new ArgumentNullException(nameof(failureMechanism)); @@ -255,7 +247,7 @@ try { - foreach (ClosingStructuresFailureMechanismSectionResult sectionResult in failureMechanismSectionResults) + foreach (ClosingStructuresFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) { if (sectionResult.UseManualAssemblyProbability && considerManualAssembly) { Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r80d36751940e21e14d24b16e6c6e62bcd6615fcd -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 80d36751940e21e14d24b16e6c6e62bcd6615fcd) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -613,26 +613,6 @@ #region Failure Mechanism Assembly [Test] - public void AssembleFailureMechanism_FailureMechanismSectionResultsNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - null, - new ClosingStructuresFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismSectionResults", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void AssembleFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -642,7 +622,6 @@ // Call TestDelegate call = () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), null, assessmentSection); @@ -657,7 +636,6 @@ { // Call TestDelegate call = () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), new ClosingStructuresFailureMechanism(), null); @@ -671,30 +649,25 @@ { // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -707,34 +680,28 @@ { // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + ClosingStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -747,35 +714,29 @@ { // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + ClosingStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection, false); // Assert FailureMechanismSectionAssembly expectedAssembly = ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -801,7 +762,6 @@ // Call FailureMechanismAssembly actualOutput = ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -829,7 +789,6 @@ // Call TestDelegate call = () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -847,7 +806,7 @@ { // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); - + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); @@ -860,10 +819,6 @@ // Call TestDelegate call = () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - new[] - { - new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }, failureMechanism, assessmentSection); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r927355de8ab97113d06466fa9ea27bc7faf14112 -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 927355de8ab97113d06466fa9ea27bc7faf14112) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -218,8 +218,6 @@ /// /// Assembles the failure mechanism assembly. /// - /// The failure mechanism section results to - /// get the assembly for. /// The failure mechanism to assemble for. /// The the failure mechanism belongs to. /// Indicator whether the manual assembly should be used in the assembly. @@ -228,16 +226,10 @@ /// Thrown when the /// could not be created. public static FailureMechanismAssembly AssembleFailureMechanism( - IEnumerable failureMechanismSectionResults, GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection, bool considerManualAssembly = true) { - if (failureMechanismSectionResults == null) - { - throw new ArgumentNullException(nameof(failureMechanismSectionResults)); - } - if (failureMechanism == null) { throw new ArgumentNullException(nameof(failureMechanism)); @@ -257,7 +249,7 @@ try { - foreach (GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult in failureMechanismSectionResults) + foreach (GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) { if (sectionResult.UseManualAssemblyProbability && considerManualAssembly) { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r927355de8ab97113d06466fa9ea27bc7faf14112 -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 927355de8ab97113d06466fa9ea27bc7faf14112) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -613,26 +613,6 @@ #region Failure Mechanism Assembly [Test] - public void AssembleFailureMechanism_FailureMechanismSectionResultsNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - null, - new GrassCoverErosionInwardsFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismSectionResults", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void AssembleFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -642,7 +622,6 @@ // Call TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), null, assessmentSection); @@ -657,7 +636,6 @@ { // Call TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), new GrassCoverErosionInwardsFailureMechanism(), null); @@ -671,30 +649,25 @@ { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -707,34 +680,28 @@ { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -747,35 +714,29 @@ { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection, false); // Assert FailureMechanismSectionAssembly expectedAssembly = GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -801,7 +762,6 @@ // Call FailureMechanismAssembly actualOutput = GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -829,7 +789,6 @@ // Call TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -847,6 +806,7 @@ { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -860,10 +820,6 @@ // Call TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - new[] - { - new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }, failureMechanism, assessmentSection); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r1e8ba146cf6eb18470458926f8ff74fa6717501d -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 1e8ba146cf6eb18470458926f8ff74fa6717501d) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -218,8 +218,6 @@ /// /// Assembles the failure mechanism assembly. /// - /// The failure mechanism section results to - /// get the assembly for. /// The failure mechanism to assemble for. /// The the failure mechanism belongs to. /// Indicator whether the manual assembly should be used in the assembly. @@ -228,16 +226,10 @@ /// Thrown when the /// could not be created. public static FailureMechanismAssembly AssembleFailureMechanism( - IEnumerable failureMechanismSectionResults, HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection, bool considerManualAssembly = true) { - if (failureMechanismSectionResults == null) - { - throw new ArgumentNullException(nameof(failureMechanismSectionResults)); - } - if (failureMechanism == null) { throw new ArgumentNullException(nameof(failureMechanism)); @@ -257,7 +249,7 @@ try { - foreach (HeightStructuresFailureMechanismSectionResult sectionResult in failureMechanismSectionResults) + foreach (HeightStructuresFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) { if (sectionResult.UseManualAssemblyProbability && considerManualAssembly) { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r1e8ba146cf6eb18470458926f8ff74fa6717501d -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 1e8ba146cf6eb18470458926f8ff74fa6717501d) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -613,26 +613,6 @@ #region Failure Mechanism Assembly [Test] - public void AssembleFailureMechanism_FailureMechanismSectionResultsNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - null, - new HeightStructuresFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismSectionResults", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void AssembleFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -642,7 +622,6 @@ // Call TestDelegate call = () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), null, assessmentSection); @@ -657,7 +636,6 @@ { // Call TestDelegate call = () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), new HeightStructuresFailureMechanism(), null); @@ -671,30 +649,25 @@ { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -707,34 +680,28 @@ { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -747,35 +714,29 @@ { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection, false); // Assert FailureMechanismSectionAssembly expectedAssembly = HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -801,7 +762,6 @@ // Call FailureMechanismAssembly actualOutput = HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -829,7 +789,6 @@ // Call TestDelegate call = () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -847,6 +806,7 @@ { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -860,10 +820,6 @@ // Call TestDelegate call = () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - new[] - { - new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }, failureMechanism, assessmentSection); Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -219,8 +219,6 @@ /// /// Assembles the failure mechanism assembly. /// - /// The failure mechanism section results to - /// get the assembly for. /// The failure mechanism to assemble for. /// The the failure mechanism belongs to. /// Indicator whether the manual assembly should be used in the assembly. @@ -229,16 +227,10 @@ /// Thrown when the /// could not be created. public static FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism( - IEnumerable failureMechanismSectionResults, MacroStabilityOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection, bool considerManualAssembly = true) { - if (failureMechanismSectionResults == null) - { - throw new ArgumentNullException(nameof(failureMechanismSectionResults)); - } - if (failureMechanism == null) { throw new ArgumentNullException(nameof(failureMechanism)); @@ -250,7 +242,7 @@ } var sectionAssemblies = new List(); - foreach (MacroStabilityOutwardsFailureMechanismSectionResult sectionResult in failureMechanismSectionResults) + foreach (MacroStabilityOutwardsFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) { if (sectionResult.UseManualAssemblyCategoryGroup && considerManualAssembly) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -613,26 +613,6 @@ #region Failure Mechanism Assembly [Test] - public void AssembleFailureMechanism_FailureMechanismSectionResultsNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - null, - new MacroStabilityOutwardsFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismSectionResults", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void AssembleFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -642,7 +622,6 @@ // Call TestDelegate call = () => MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), null, assessmentSection); @@ -657,7 +636,6 @@ { // Call TestDelegate call = () => MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), new MacroStabilityOutwardsFailureMechanism(), null); @@ -671,30 +649,26 @@ { // Setup var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssemblyCategoryGroup assemblyCategory = - MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment(sectionResults.Single(), + MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); Assert.AreEqual(assemblyCategory, calculator.FailureMechanismSectionCategories.Single()); @@ -707,33 +681,28 @@ { // Setup var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + MacroStabilityOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = new Random(39).NextEnumValue() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert - Assert.AreEqual(sectionResults.Single().ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single()); + Assert.AreEqual(failureMechanism.SectionResults.Single().ManualAssemblyCategoryGroup, + calculator.FailureMechanismSectionCategories.Single()); mocks.VerifyAll(); } } @@ -743,37 +712,32 @@ { // Setup var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + MacroStabilityOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = new Random(39).NextEnumValue() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection, false); // Assert FailureMechanismSectionAssemblyCategoryGroup assemblyCategory = - MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment(sectionResults.Single(), - failureMechanism, - assessmentSection); + MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( + failureMechanism.SectionResults.Single(), + failureMechanism, + assessmentSection); Assert.AreEqual(assemblyCategory, calculator.FailureMechanismSectionCategories.Single()); mocks.VerifyAll(); } @@ -797,7 +761,6 @@ // Call FailureMechanismAssemblyCategoryGroup actualOutput = MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -825,7 +788,6 @@ // Call TestDelegate call = () => MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r80d36751940e21e14d24b16e6c6e62bcd6615fcd -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 80d36751940e21e14d24b16e6c6e62bcd6615fcd) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using System.Linq; using Ringtoets.AssemblyTool.Data; using Ringtoets.AssemblyTool.KernelWrapper.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly; @@ -235,9 +236,6 @@ /// /// Assembles the failure mechanism assembly. /// - /// The failure mechanism section results to - /// get the assembly for. - /// The calculation scenarios belonging to this failure mechanism. /// The failure mechanism to assemble for. /// The the failure mechanism belongs to. /// Indicator whether the manual assembly should be used in the assembly. @@ -246,22 +244,10 @@ /// Thrown when the /// could not be created. public static FailureMechanismAssembly AssembleFailureMechanism( - IEnumerable failureMechanismSectionResults, - IEnumerable calculationScenarios, MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection, bool considerManualAssembly = true) { - if (failureMechanismSectionResults == null) - { - throw new ArgumentNullException(nameof(failureMechanismSectionResults)); - } - - if (calculationScenarios == null) - { - throw new ArgumentNullException(nameof(calculationScenarios)); - } - if (failureMechanism == null) { throw new ArgumentNullException(nameof(failureMechanism)); @@ -281,7 +267,7 @@ try { - foreach (MacroStabilityInwardsFailureMechanismSectionResult sectionResult in failureMechanismSectionResults) + foreach (MacroStabilityInwardsFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) { if (sectionResult.UseManualAssemblyProbability && considerManualAssembly) { @@ -294,7 +280,7 @@ else { sectionAssemblies.Add(AssembleCombinedAssessment(sectionResult, - calculationScenarios, + failureMechanism.Calculations.Cast(), failureMechanism, assessmentSection)); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r6488da4fef46e82f140d0af313e0d615d1985d1c -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 6488da4fef46e82f140d0af313e0d615d1985d1c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -692,48 +692,6 @@ #region Failure Mechanism Assembly [Test] - public void AssembleFailureMechanism_FailureMechanismSectionResultsNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - null, - Enumerable.Empty(), - new MacroStabilityInwardsFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismSectionResults", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - public void AssembleFailureMechanism_CalculationScenariosNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - null, - new MacroStabilityInwardsFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("calculationScenarios", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void AssembleFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -743,8 +701,6 @@ // Call TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), null, assessmentSection); @@ -759,8 +715,6 @@ { // Call TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), new MacroStabilityInwardsFailureMechanism(), null); @@ -774,31 +728,25 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, - Enumerable.Empty(), failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), Enumerable.Empty(), failureMechanism, assessmentSection); @@ -812,35 +760,28 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + MacroStabilityInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, - Enumerable.Empty(), failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), Enumerable.Empty(), failureMechanism, assessmentSection); @@ -854,36 +795,29 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + MacroStabilityInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, - Enumerable.Empty(), failureMechanism, assessmentSection, false); // Assert FailureMechanismSectionAssembly expectedAssembly = MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), Enumerable.Empty(), failureMechanism, assessmentSection); @@ -910,8 +844,6 @@ // Call FailureMechanismAssembly actualOutput = MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -939,8 +871,6 @@ // Call TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -958,6 +888,7 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -971,11 +902,6 @@ // Call TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - new[] - { - new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }, - Enumerable.Empty(), failureMechanism, assessmentSection); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r80d36751940e21e14d24b16e6c6e62bcd6615fcd -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs (.../PipingFailureMechanismSectionResultAssemblyFactory.cs) (revision 80d36751940e21e14d24b16e6c6e62bcd6615fcd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs (.../PipingFailureMechanismSectionResultAssemblyFactory.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using System.Linq; using Ringtoets.AssemblyTool.Data; using Ringtoets.AssemblyTool.KernelWrapper.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly; @@ -235,9 +236,6 @@ /// /// Assembles the failure mechanism assembly. /// - /// The failure mechanism section results to - /// get the assembly for. - /// The calculation scenarios belonging to this failure mechanism. /// The failure mechanism to assemble for. /// The the failure mechanism belongs to. /// Indicator whether the manual assembly should be used in the assembly. @@ -246,22 +244,10 @@ /// Thrown when the /// could not be created. public static FailureMechanismAssembly AssembleFailureMechanism( - IEnumerable failureMechanismSectionResults, - IEnumerable calculationScenarios, PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection, bool considerManualAssembly = true) { - if (failureMechanismSectionResults == null) - { - throw new ArgumentNullException(nameof(failureMechanismSectionResults)); - } - - if (calculationScenarios == null) - { - throw new ArgumentNullException(nameof(calculationScenarios)); - } - if (failureMechanism == null) { throw new ArgumentNullException(nameof(failureMechanism)); @@ -281,7 +267,7 @@ try { - foreach (PipingFailureMechanismSectionResult sectionResult in failureMechanismSectionResults) + foreach (PipingFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) { if (sectionResult.UseManualAssemblyProbability && considerManualAssembly) { @@ -294,7 +280,7 @@ else { sectionAssemblies.Add(AssembleCombinedAssessment(sectionResult, - calculationScenarios, + failureMechanism.Calculations.Cast(), failureMechanism, assessmentSection)); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r4e9e1bc4a1133138ee51c3a62a885010832f6d7f -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 4e9e1bc4a1133138ee51c3a62a885010832f6d7f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -233,7 +233,7 @@ }, true); var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); - var calculationScenarios = new[] + PipingCalculationScenario[] calculationScenarios = { PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) }; @@ -693,48 +693,6 @@ #region Failure Mechanism Assembly [Test] - public void AssembleFailureMechanism_FailureMechanismSectionResultsNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - null, - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismSectionResults", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - public void AssembleFailureMechanism_CalculationScenariosNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - null, - new PipingFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("calculationScenarios", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void AssembleFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -744,8 +702,6 @@ // Call TestDelegate call = () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), null, assessmentSection); @@ -760,8 +716,6 @@ { // Call TestDelegate call = () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), new PipingFailureMechanism(), null); @@ -775,31 +729,25 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, - Enumerable.Empty(), failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = PipingFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), Enumerable.Empty(), failureMechanism, assessmentSection); @@ -813,35 +761,28 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + PipingFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, - Enumerable.Empty(), failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = PipingFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), Enumerable.Empty(), failureMechanism, assessmentSection); @@ -855,36 +796,29 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + PipingFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, - Enumerable.Empty(), failureMechanism, assessmentSection, false); // Assert FailureMechanismSectionAssembly expectedAssembly = PipingFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), Enumerable.Empty(), failureMechanism, assessmentSection); @@ -911,8 +845,6 @@ // Call FailureMechanismAssembly actualOutput = PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -940,8 +872,6 @@ // Call TestDelegate call = () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -959,6 +889,7 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -972,11 +903,6 @@ // Call TestDelegate call = () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - new[] - { - new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }, - Enumerable.Empty(), failureMechanism, assessmentSection); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r7003456bfaf9a95b3a222c764aba69ed4f75c67b -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 7003456bfaf9a95b3a222c764aba69ed4f75c67b) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -216,8 +216,6 @@ /// /// Assembles the failure mechanism assembly. /// - /// The failure mechanism section results to - /// get the assembly for. /// The failure mechanism to assemble for. /// The the failure mechanism belongs to. /// Indicator whether the manual assembly should be used in the assembly. @@ -226,16 +224,10 @@ /// Thrown when the /// could not be created. public static FailureMechanismAssembly AssembleFailureMechanism( - IEnumerable failureMechanismSectionResults, StabilityPointStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection, bool considerManualAssembly = true) { - if (failureMechanismSectionResults == null) - { - throw new ArgumentNullException(nameof(failureMechanismSectionResults)); - } - if (failureMechanism == null) { throw new ArgumentNullException(nameof(failureMechanism)); @@ -255,7 +247,7 @@ try { - foreach (StabilityPointStructuresFailureMechanismSectionResult sectionResult in failureMechanismSectionResults) + foreach (StabilityPointStructuresFailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) { if (sectionResult.UseManualAssemblyProbability && considerManualAssembly) { Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r7003456bfaf9a95b3a222c764aba69ed4f75c67b -r150a1c072e1b1e91c35b606cd78da5eac3396671 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 7003456bfaf9a95b3a222c764aba69ed4f75c67b) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 150a1c072e1b1e91c35b606cd78da5eac3396671) @@ -613,26 +613,6 @@ #region Failure Mechanism Assembly [Test] - public void AssembleFailureMechanism_FailureMechanismSectionResultsNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - null, - new StabilityPointStructuresFailureMechanism(), - assessmentSection); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismSectionResults", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void AssembleFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -642,7 +622,6 @@ // Call TestDelegate call = () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), null, assessmentSection); @@ -657,7 +636,6 @@ { // Call TestDelegate call = () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), new StabilityPointStructuresFailureMechanism(), null); @@ -671,30 +649,25 @@ { // Setup var failureMechanism = new StabilityPointStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -707,34 +680,28 @@ { // Setup var failureMechanism = new StabilityPointStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + StabilityPointStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection); // Assert FailureMechanismSectionAssembly expectedAssembly = StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -747,35 +714,29 @@ { // Setup var failureMechanism = new StabilityPointStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + StabilityPointStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyProbability = true; + sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResults = new[] - { - new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - { - UseManualAssemblyProbability = true, - ManualAssemblyProbability = new Random(39).NextDouble() - } - }; - using (new AssemblyToolCalculatorFactoryConfig()) { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - sectionResults, failureMechanism, assessmentSection, false); // Assert FailureMechanismSectionAssembly expectedAssembly = StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleCombinedAssessment( - sectionResults.Single(), + failureMechanism.SectionResults.Single(), failureMechanism, assessmentSection); AssemblyToolTestHelper.AssertAreEqual(expectedAssembly, calculator.FailureMechanismSectionAssemblies.Single()); @@ -801,7 +762,6 @@ // Call FailureMechanismAssembly actualOutput = StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -829,7 +789,6 @@ // Call TestDelegate call = () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - Enumerable.Empty(), failureMechanism, assessmentSection); @@ -847,6 +806,7 @@ { // Setup var failureMechanism = new StabilityPointStructuresFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -860,10 +820,6 @@ // Call TestDelegate call = () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleFailureMechanism( - new[] - { - new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }, failureMechanism, assessmentSection);