Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -62,7 +62,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -64,7 +64,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -64,7 +64,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactory.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactory.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -73,7 +73,8 @@ } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, - assessmentSection); + assessmentSection, + false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs (.../ExportableMicrostabilityFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs (.../ExportableMicrostabilityFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -64,7 +64,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs (.../ExportablePipingStructureFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs (.../ExportablePipingStructureFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -64,7 +64,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -64,7 +64,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableTechnicalInnovationFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableTechnicalInnovationFailureMechanismFactory.cs (.../ExportableTechnicalInnovationFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableTechnicalInnovationFailureMechanismFactory.cs (.../ExportableTechnicalInnovationFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -64,7 +64,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs =================================================================== diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -64,7 +64,7 @@ failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } - FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); + FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -114,6 +114,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + GrassCoverErosionOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableGrassCoverErosionOutwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.Iv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -28,7 +28,10 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; +using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -114,6 +117,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + GrassCoverSlipOffInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -28,7 +28,9 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -114,6 +116,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + GrassCoverSlipOffOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -30,7 +30,9 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -140,6 +142,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + MacroStabilityOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableMacroStabilityOutwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs (.../ExportableMicrostabilityFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs (.../ExportableMicrostabilityFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -28,7 +28,9 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -114,6 +116,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new MicrostabilityFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + MicrostabilityFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableMicrostabilityFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs (.../ExportablePipingStructureFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs (.../ExportablePipingStructureFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -28,7 +28,9 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -114,6 +116,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new PipingStructureFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + PipingStructureFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportablePipingStructureFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -28,7 +28,9 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -113,6 +115,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedCombinedAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableTechnicalInnovationFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableTechnicalInnovationFailureMechanismFactoryTest.cs (.../ExportableTechnicalInnovationFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableTechnicalInnovationFailureMechanismFactoryTest.cs (.../ExportableTechnicalInnovationFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -28,7 +28,9 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -113,6 +115,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new TechnicalInnovationFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + TechnicalInnovationFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableTechnicalInnovationFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedCombinedAssembly, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs) (revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8) @@ -28,7 +28,9 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; using Ringtoets.Integration.IO.TestUtil; @@ -113,6 +115,29 @@ } } + [Test] + public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored() + { + // Given + var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); + FailureMechanismTestHelper.AddSections(failureMechanism, 1); + WaterPressureAsphaltCoverFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); + sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv; + + using (new AssemblyToolCalculatorFactoryConfig()) + { + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + + // When + ExportableWaterPressureAsphaltCoverFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism); + + // Then + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); + } + } + private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly, FailureMechanismSectionAssemblyCategoryGroup expectedCombinedAssembly,