Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -r3d70779c4b1aff2482254bad30078cc94ff73de8 -r06248ce95984b8cc6d10bb6fe975419e1740e93b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs (.../AssessmentSectionAssemblyCalculatorStubTest.cs) (revision 3d70779c4b1aff2482254bad30078cc94ff73de8) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs (.../AssessmentSectionAssemblyCalculatorStubTest.cs) (revision 06248ce95984b8cc6d10bb6fe975419e1740e93b) @@ -73,16 +73,16 @@ var random = new Random(21); var calculator = new AssessmentSectionAssemblyCalculatorStub { - AssessmentSectionAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), - random.NextEnumValue()) + AssembleFailureMechanismsAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), + random.NextEnumValue()) }; // Call AssessmentSectionAssembly output = calculator.AssembleFailureMechanisms(Enumerable.Empty(), random.NextDouble(), random.NextDouble()); // Assert - Assert.AreSame(calculator.AssessmentSectionAssemblyOutput, output); + Assert.AreSame(calculator.AssembleFailureMechanismsAssemblyOutput, output); } [Test] @@ -147,14 +147,14 @@ var random = new Random(21); var calculator = new AssessmentSectionAssemblyCalculatorStub { - AssembleFailureMechanismsAssemblyOutput = random.NextEnumValue() + AssembleFailureMechanismsAssemblyCategoryGroupOutput = random.NextEnumValue() }; // Call AssessmentSectionAssemblyCategoryGroup output = calculator.AssembleFailureMechanisms(Enumerable.Empty()); // Assert - Assert.AreEqual(calculator.AssembleFailureMechanismsAssemblyOutput, output); + Assert.AreEqual(calculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput, output); } [Test] @@ -213,7 +213,7 @@ var random = new Random(21); var calculator = new AssessmentSectionAssemblyCalculatorStub { - AssembleAssessmentSectionOutput = random.NextEnumValue() + AssembleAssessmentSectionCategoryGroupOutput = random.NextEnumValue() }; // Call @@ -223,7 +223,7 @@ random.NextEnumValue())); // Assert - Assert.AreEqual(calculator.AssembleAssessmentSectionOutput, output); + Assert.AreEqual(calculator.AssembleAssessmentSectionCategoryGroupOutput, output); } [Test] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs =================================================================== diff -u -r3d70779c4b1aff2482254bad30078cc94ff73de8 -r06248ce95984b8cc6d10bb6fe975419e1740e93b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs (.../AssessmentSectionAssemblyCalculatorStub.cs) (revision 3d70779c4b1aff2482254bad30078cc94ff73de8) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs (.../AssessmentSectionAssemblyCalculatorStub.cs) (revision 06248ce95984b8cc6d10bb6fe975419e1740e93b) @@ -69,19 +69,19 @@ /// Gets or sets the output of the assessment section assembly for failure /// mechanisms with probability. /// - public AssessmentSectionAssembly AssessmentSectionAssemblyOutput { get; set; } + public AssessmentSectionAssembly AssembleFailureMechanismsAssemblyOutput { get; set; } /// /// Gets or sets the output of the assessment section assembly category group when assembling failure /// mechanisms without probability. /// - public AssessmentSectionAssemblyCategoryGroup? AssembleFailureMechanismsAssemblyOutput { get; set; } + public AssessmentSectionAssemblyCategoryGroup? AssembleFailureMechanismsAssemblyCategoryGroupOutput { get; set; } /// /// Gets or sets the output of the assessment section assembly category group /// when assembling an assessment section. /// - public AssessmentSectionAssemblyCategoryGroup? AssembleAssessmentSectionOutput { get; set; } + public AssessmentSectionAssemblyCategoryGroup? AssembleAssessmentSectionCategoryGroupOutput { get; set; } /// /// Sets an indicator whether an exception must be thrown when performing a calculation. @@ -101,7 +101,7 @@ LowerLimitNormInput = lowerLimitNorm; SignalingNormInput = signalingNorm; - return AssessmentSectionAssemblyOutput ?? + return AssembleFailureMechanismsAssemblyOutput ?? new AssessmentSectionAssembly(0.75, AssessmentSectionAssemblyCategoryGroup.D); } @@ -114,7 +114,7 @@ FailureMechanismAssemblyCategoryGroupInput = input; - return AssembleFailureMechanismsAssemblyOutput ?? AssessmentSectionAssemblyCategoryGroup.D; + return AssembleFailureMechanismsAssemblyCategoryGroupOutput ?? AssessmentSectionAssemblyCategoryGroup.D; } public AssessmentSectionAssemblyCategoryGroup AssembleAssessmentSection(AssessmentSectionAssemblyCategoryGroup failureMechanismsWithoutProbability, @@ -128,7 +128,7 @@ FailureMechanismsWithoutProbabilityInput = failureMechanismsWithoutProbability; FailureMechanismsWithProbabilityInput = failureMechanismsWithProbability; - return AssembleAssessmentSectionOutput ?? AssessmentSectionAssemblyCategoryGroup.C; + return AssembleAssessmentSectionCategoryGroupOutput ?? AssessmentSectionAssemblyCategoryGroup.C; } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -rc44576ce3d864c23b2ded4438d760a1dbdf09404 -r06248ce95984b8cc6d10bb6fe975419e1740e93b --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision c44576ce3d864c23b2ded4438d760a1dbdf09404) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 06248ce95984b8cc6d10bb6fe975419e1740e93b) @@ -74,7 +74,7 @@ Assert.AreEqual(failureMechanismContribution.LowerLimitNorm, assessmentSectionAssemblyCalculator.LowerLimitNormInput); Assert.AreEqual(failureMechanismContribution.SignalingNorm, assessmentSectionAssemblyCalculator.SignalingNormInput); - AssertGroup1And2FailureMechanismInputs(assessmentSection.GetFailureMechanisms(), + AssertGroup1And2FailureMechanismInputs(assessmentSection, failureMechanismAssemblyCalculator.FailureMechanismAssemblyOutput, assessmentSectionAssemblyCalculator); } @@ -91,14 +91,14 @@ { var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedAssessmentSectionAssemblyCalculator; - calculator.AssessmentSectionAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), - random.NextEnumValue()); + calculator.AssembleFailureMechanismsAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), + random.NextEnumValue()); // Call AssessmentSectionAssembly output = AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithProbability(assessmentSection); // Assert - Assert.AreSame(calculator.AssessmentSectionAssemblyOutput, output); + Assert.AreSame(calculator.AssembleFailureMechanismsAssemblyOutput, output); } } @@ -153,7 +153,7 @@ AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithoutProbability(assessmentSection); // Assert - AssertGroup3And4FailureMechanismInputs(assessmentSection.GetFailureMechanisms(), + AssertGroup3And4FailureMechanismInputs(assessmentSection, failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput.Value, assessmentSectionAssemblyCalculator); } @@ -170,13 +170,13 @@ { var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedAssessmentSectionAssemblyCalculator; - calculator.AssembleFailureMechanismsAssemblyOutput = random.NextEnumValue(); + calculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput = random.NextEnumValue(); // Call AssessmentSectionAssemblyCategoryGroup output = AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithoutProbability(assessmentSection); // Assert - Assert.AreEqual(calculator.AssembleFailureMechanismsAssemblyOutput, output); + Assert.AreEqual(calculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput, output); } } @@ -225,25 +225,25 @@ FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorfactory.LastCreatedAssessmentSectionAssemblyCalculator; - assessmentSectionAssemblyCalculator.AssessmentSectionAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), - random.NextEnumValue()); - assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyOutput = random.NextEnumValue(); + assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), + random.NextEnumValue()); + assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput = random.NextEnumValue(); // Call AssessmentSectionAssemblyFactory.AssembleAssessmentSection(assessmentSection); // Assert - AssertGroup1And2FailureMechanismInputs(assessmentSection.GetFailureMechanisms(), + AssertGroup1And2FailureMechanismInputs(assessmentSection, failureMechanismAssemblyCalculator.FailureMechanismAssemblyOutput, assessmentSectionAssemblyCalculator); - AssertGroup3And4FailureMechanismInputs(assessmentSection.GetFailureMechanisms(), + AssertGroup3And4FailureMechanismInputs(assessmentSection, failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput.Value, assessmentSectionAssemblyCalculator); - Assert.AreSame(assessmentSectionAssemblyCalculator.AssessmentSectionAssemblyOutput, + Assert.AreSame(assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyOutput, assessmentSectionAssemblyCalculator.FailureMechanismsWithProbabilityInput); - Assert.AreEqual(assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyOutput, + Assert.AreEqual(assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput, assessmentSectionAssemblyCalculator.FailureMechanismsWithoutProbabilityInput); } } @@ -259,15 +259,15 @@ { var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedAssessmentSectionAssemblyCalculator; - calculator.AssessmentSectionAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), - random.NextEnumValue()); - calculator.AssembleAssessmentSectionOutput = random.NextEnumValue(); + calculator.AssembleFailureMechanismsAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(), + random.NextEnumValue()); + calculator.AssembleAssessmentSectionCategoryGroupOutput = random.NextEnumValue(); // Call AssessmentSectionAssemblyCategoryGroup output = AssessmentSectionAssemblyFactory.AssembleAssessmentSection(assessmentSection); // Assert - Assert.AreEqual(calculator.AssembleAssessmentSectionOutput, output); + Assert.AreEqual(calculator.AssembleAssessmentSectionCategoryGroupOutput, output); } } @@ -292,11 +292,11 @@ } } - private static void AssertGroup1And2FailureMechanismInputs(IEnumerable failureMechanisms, + private static void AssertGroup1And2FailureMechanismInputs(AssessmentSection assessmentSection, FailureMechanismAssembly expectedFailureMechanismAssembly, AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator) { - IEnumerable expectedFailureMechanisms = failureMechanisms.Where(fm => fm.Group == 1 || fm.Group == 2); + IEnumerable expectedFailureMechanisms = GetExpectedGroup1And2FailureMechanisms(assessmentSection); IEnumerable failureMechanismAssemblyInput = assessmentSectionAssemblyCalculator.FailureMechanismAssemblyInput; Assert.AreEqual(expectedFailureMechanisms.Count(), failureMechanismAssemblyInput.Count()); foreach (FailureMechanismAssembly failureMechanismAssembly in failureMechanismAssemblyInput) @@ -306,11 +306,11 @@ } } - private static void AssertGroup3And4FailureMechanismInputs(IEnumerable failureMechanisms, + private static void AssertGroup3And4FailureMechanismInputs(AssessmentSection assessmentSection, FailureMechanismAssemblyCategoryGroup expectedAssemblyCategoryGroup, AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator) { - IEnumerable expectedFailureMechanisms = failureMechanisms.Where(fm => fm.Group == 3 || fm.Group == 4); + IEnumerable expectedFailureMechanisms = GetExpectedGroup3And4FailureMechanisms(assessmentSection); IEnumerable failureMechanismAssemblyInput = assessmentSectionAssemblyCalculator.FailureMechanismAssemblyCategoryGroupInput; Assert.AreEqual(expectedFailureMechanisms.Count(), failureMechanismAssemblyInput.Count()); @@ -322,5 +322,37 @@ var random = new Random(21); return new AssessmentSection(random.NextEnumValue()); } + + private static IEnumerable GetExpectedGroup1And2FailureMechanisms(AssessmentSection assessmentSection) + { + return new IFailureMechanism[] + { + assessmentSection.GrassCoverErosionInwards, + assessmentSection.HeightStructures, + assessmentSection.ClosingStructures, + assessmentSection.StabilityPointStructures, + assessmentSection.Piping, + assessmentSection.MacroStabilityInwards + }; + } + + private static IEnumerable GetExpectedGroup3And4FailureMechanisms(AssessmentSection assessmentSection) + { + return new IFailureMechanism[] + { + assessmentSection.StabilityStoneCover, + assessmentSection.WaveImpactAsphaltCover, + assessmentSection.GrassCoverErosionOutwards, + assessmentSection.DuneErosion, + assessmentSection.MacroStabilityOutwards, + assessmentSection.Microstability, + assessmentSection.WaterPressureAsphaltCover, + assessmentSection.GrassCoverSlipOffOutwards, + assessmentSection.GrassCoverSlipOffInwards, + assessmentSection.PipingStructure, + assessmentSection.StrengthStabilityLengthwiseConstruction, + assessmentSection.TechnicalInnovation + }; + } } } \ No newline at end of file