Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r03a42f53227ba94fae59ac8a103861e201138398 -r9f6dc49b475643e2a3c8c07a888f63de5a80fa80 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs) (revision 03a42f53227ba94fae59ac8a103861e201138398) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs) (revision 9f6dc49b475643e2a3c8c07a888f63de5a80fa80) @@ -110,10 +110,15 @@ try { + double n = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( + failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength); + return calculator.AssembleDetailedAssessment( failureMechanismSectionResult.DetailedAssessmentResult, failureMechanismSectionResult.DetailedAssessmentProbability, - CreateAssemblyCategoriesInput(failureMechanism, assessmentSection)).Group; + assessmentSection.FailureMechanismContribution.Norm, + n, + failureMechanism.Contribution / 100).Group; } catch (FailureMechanismSectionAssemblyCalculatorException e) { @@ -317,14 +322,5 @@ throw new AssemblyException(RingtoetsCommonDataResources.FailureMechanismAssemblyFactory_Error_while_assembling_failureMechanism, e); } } - - private static AssemblyCategoriesInput CreateAssemblyCategoriesInput(MacroStabilityOutwardsFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) - { - return AssemblyCategoriesInputFactory.CreateAssemblyCategoriesInput(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( - failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength), - failureMechanism, - assessmentSection); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r9e950b45403740c6bf9146b5f0cdc2ba726462be -r9f6dc49b475643e2a3c8c07a888f63de5a80fa80 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 9e950b45403740c6bf9146b5f0cdc2ba726462be) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 9f6dc49b475643e2a3c8c07a888f63de5a80fa80) @@ -45,17 +45,6 @@ [TestFixture] public class MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest { - private static void AssertAssemblyCategoriesInput(IAssessmentSection assessmentSection, - MacroStabilityOutwardsFailureMechanism failureMechanism, - AssemblyCategoriesInput assemblyCategoriesInput) - { - Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, assemblyCategoriesInput.SignalingNorm); - Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, assemblyCategoriesInput.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution / 100, assemblyCategoriesInput.FailureMechanismContribution); - Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( - failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength), assemblyCategoriesInput.N); - } - #region Simple Assembly [Test] @@ -227,7 +216,12 @@ // Assert Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(sectionResult.DetailedAssessmentProbability, calculator.DetailedAssessmentProbabilityInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + + Assert.AreEqual(assessmentSection.FailureMechanismContribution.Norm, calculator.DetailedAssessmentNormativeNormInput); + double expectedN = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( + failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength); + Assert.AreEqual(expectedN, calculator.DetailedAssessmentFailureMechanismSectionNInput); + Assert.AreEqual(failureMechanism.Contribution / 100, calculator.DetailedAssessmentFailureMechanismContribution); mocks.VerifyAll(); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs =================================================================== diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r9f6dc49b475643e2a3c8c07a888f63de5a80fa80 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision 9f6dc49b475643e2a3c8c07a888f63de5a80fa80) @@ -195,7 +195,7 @@ Assert.AreEqual(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual("Iv", cells[simpleAssemblyCategoryGroupIndex].Value); - Assert.AreEqual("VIv", cells[detailedAssemblyCategoryGroupIndex].Value); + Assert.AreEqual("IVv", cells[detailedAssemblyCategoryGroupIndex].Value); Assert.AreEqual("VIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value); Assert.AreEqual("VIv", cells[combinedAssemblyCategoryGroupIndex].Value); Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value);