Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -re8670a16b088e6608a63a05d50a0f647d45f4700 -rf839333e4a2224a91cf76a79aeea2ab0b449f1b0 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision e8670a16b088e6608a63a05d50a0f647d45f4700) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision f839333e4a2224a91cf76a79aeea2ab0b449f1b0) @@ -1132,24 +1132,22 @@ { // Setup var random = new Random(39); - AssessmentSection assessmentSection = CreateRandomAssessmentSection(random); - FailureMechanism failureMechanism = CreateRandomFailureMechanism(random); var assessmentResult = random.NextEnumValue(); double failureProbability = random.NextDouble(); + CategoriesList categories = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); var kernel = new FailureMechanismSectionAssemblyKernelStub(); // Precondition Assert.IsFalse(kernel.Calculated); // Call - kernel.TranslateAssessmentResultWbi0T7(assessmentSection, failureMechanism, assessmentResult, failureProbability); + kernel.TranslateAssessmentResultWbi0T7(assessmentResult, failureProbability, categories); // Assert - Assert.AreSame(assessmentSection, kernel.AssessmentSectionInput); - Assert.AreSame(failureMechanism, kernel.FailureMechanismInput); Assert.AreEqual(assessmentResult, kernel.AssessmentResultTypeT4Input); Assert.AreEqual(failureProbability, kernel.FailureProbabilityInput); + Assert.AreSame(categories, kernel.FailureMechanismSectionCategories); Assert.IsTrue(kernel.Calculated); } @@ -1158,21 +1156,19 @@ { // Setup var random = new Random(39); - AssessmentSection assessmentSection = CreateRandomAssessmentSection(random); - FailureMechanism failureMechanism = CreateRandomFailureMechanism(random); var assessmentResult = random.NextEnumValue(); double failureProbability = random.NextDouble(); + CategoriesList categories = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); var kernel = new FailureMechanismSectionAssemblyKernelStub { FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()) }; // Call - FmSectionAssemblyDirectResult result = kernel.TranslateAssessmentResultWbi0T7(assessmentSection, - failureMechanism, - assessmentResult, - failureProbability); + FmSectionAssemblyDirectResult result = kernel.TranslateAssessmentResultWbi0T7(assessmentResult, + failureProbability, + categories); // Assert Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); @@ -1183,30 +1179,27 @@ { // Setup var random = new Random(39); - AssessmentSection assessmentSection = CreateRandomAssessmentSection(random); - FailureMechanism failureMechanism = CreateRandomFailureMechanism(random); var assessmentResult = random.NextEnumValue(); double failureProbability = random.NextDouble(); + CategoriesList categories = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); var kernel = new FailureMechanismSectionAssemblyKernelStub { ThrowExceptionOnCalculate = true }; // Call - TestDelegate test = () => kernel.TranslateAssessmentResultWbi0T7(assessmentSection, - failureMechanism, - assessmentResult, - failureProbability); + TestDelegate test = () => kernel.TranslateAssessmentResultWbi0T7(assessmentResult, + failureProbability, + categories); // Assert var exception = Assert.Throws(test); Assert.AreEqual("Message", exception.Message); Assert.IsNotNull(exception.InnerException); - Assert.IsNull(kernel.AssessmentSectionInput); - Assert.IsNull(kernel.FailureMechanismInput); Assert.IsNull(kernel.AssessmentResultTypeT4Input); Assert.IsNaN(kernel.FailureProbabilityInput); + Assert.IsNull(kernel.FailureMechanismSectionCategories); Assert.IsFalse(kernel.Calculated); Assert.IsNull(kernel.FailureMechanismSectionDirectResult); } @@ -1216,31 +1209,28 @@ { // Setup var random = new Random(39); - AssessmentSection assessmentSection = CreateRandomAssessmentSection(random); - FailureMechanism failureMechanism = CreateRandomFailureMechanism(random); var assessmentResult = random.NextEnumValue(); double failureProbability = random.NextDouble(); + CategoriesList categories = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); var kernel = new FailureMechanismSectionAssemblyKernelStub { ThrowAssemblyExceptionOnCalculate = true }; // Call - TestDelegate test = () => kernel.TranslateAssessmentResultWbi0T7(assessmentSection, - failureMechanism, - assessmentResult, - failureProbability); + TestDelegate test = () => kernel.TranslateAssessmentResultWbi0T7(assessmentResult, + failureProbability, + categories); // Assert var exception = Assert.Throws(test); AssemblyErrorMessage errorMessage = exception.Errors.Single(); Assert.AreEqual("entity", errorMessage.EntityId); Assert.AreEqual(EAssemblyErrors.CategoryLowerLimitOutOfRange, errorMessage.ErrorCode); - Assert.IsNull(kernel.AssessmentSectionInput); - Assert.IsNull(kernel.FailureMechanismInput); Assert.IsNull(kernel.AssessmentResultTypeT4Input); Assert.IsNaN(kernel.FailureProbabilityInput); + Assert.IsNull(kernel.FailureMechanismSectionCategories); Assert.IsFalse(kernel.Calculated); Assert.IsNull(kernel.FailureMechanismSectionDirectResult); } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs =================================================================== diff -u -re8670a16b088e6608a63a05d50a0f647d45f4700 -rf839333e4a2224a91cf76a79aeea2ab0b449f1b0 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision e8670a16b088e6608a63a05d50a0f647d45f4700) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision f839333e4a2224a91cf76a79aeea2ab0b449f1b0) @@ -287,9 +287,9 @@ } public FmSectionAssemblyDirectResultWithProbability TranslateAssessmentResultWbi0T5(double fmSectionLengthEffectFactor, - EAssessmentResultTypeT3 assessment, - double failureProbability, - CategoriesList categories) + EAssessmentResultTypeT3 assessment, + double failureProbability, + CategoriesList categories) { ThrowException(); @@ -307,17 +307,15 @@ throw new NotImplementedException(); } - public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0T7(AssessmentSection section, - FailureMechanism failureMechanism, - EAssessmentResultTypeT4 assessment, - double failureProbability) + public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0T7(EAssessmentResultTypeT4 assessment, + double failureProbability, + CategoriesList categories) { ThrowException(); - AssessmentSectionInput = section; - FailureMechanismInput = failureMechanism; AssessmentResultTypeT4Input = assessment; FailureProbabilityInput = failureProbability; + FailureMechanismSectionCategories = categories; Calculated = true; return FailureMechanismSectionDirectResult;