Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r2b79eaf2cbbdff4211eade27fde9febe76029d29 -rdcf5ea07273fabb6650f3836bffadbfeb5b4948a --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision dcf5ea07273fabb6650f3836bffadbfeb5b4948a) @@ -2318,18 +2318,18 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call calculator.AssembleCombined(simpleAssembly); // Assert - AssertAssembly(simpleAssembly, kernel.SimpleAssessmentResultInput); - Assert.IsNull(kernel.DetailedAssessmentResultInput); - Assert.IsNull(kernel.TailorMadeAssessmentResultInput); + AssertAssembly(simpleAssembly, kernel.SimpleAssessmentResultInputWithProbability); + Assert.IsNull(kernel.DetailedAssessmentResultInputWithProbability); + Assert.IsNull(kernel.TailorMadeAssessmentResultInputWithProbability); } } @@ -2343,8 +2343,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2353,7 +2353,7 @@ new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue())); // Assert - AssertCalculatorOutput((FmSectionAssemblyDirectResultWithProbability) kernel.FailureMechanismAssessmentResult, assembly); + AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); } } @@ -2367,8 +2367,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2473,18 +2473,18 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call calculator.AssembleCombined(simpleAssembly, detailedAssembly, tailorMadeAssembly); // Assert - AssertAssembly(simpleAssembly, kernel.SimpleAssessmentResultInput); - AssertAssembly(detailedAssembly, kernel.DetailedAssessmentResultInput); - AssertAssembly(tailorMadeAssembly, kernel.TailorMadeAssessmentResultInput); + AssertAssembly(simpleAssembly, kernel.SimpleAssessmentResultInputWithProbability); + AssertAssembly(detailedAssembly, kernel.DetailedAssessmentResultInputWithProbability); + AssertAssembly(tailorMadeAssembly, kernel.TailorMadeAssessmentResultInputWithProbability); } } @@ -2498,8 +2498,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2510,7 +2510,7 @@ new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue())); // Assert - AssertCalculatorOutput((FmSectionAssemblyDirectResultWithProbability) kernel.FailureMechanismAssessmentResult, assembly); + AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); } } @@ -2524,8 +2524,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2629,7 +2629,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2653,8 +2653,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2664,7 +2663,7 @@ // Assert FailureMechanismSectionAssemblyCategoryGroup expectedResult = AssemblyCategoryAssert.GetFailureMechanismSectionCategoryGroup( - ((FmSectionAssemblyDirectResultWithProbability) kernel.FailureMechanismAssessmentResult).Result); + kernel.FailureMechanismSectionDirectResult.Result); Assert.AreEqual(expectedResult, group); } } @@ -2679,7 +2678,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2780,8 +2779,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2805,7 +2803,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2816,7 +2814,7 @@ // Assert FailureMechanismSectionAssemblyCategoryGroup expectedResult = AssemblyCategoryAssert.GetFailureMechanismSectionCategoryGroup( - ((FmSectionAssemblyDirectResult) kernel.FailureMechanismAssessmentResult).Result); + kernel.FailureMechanismSectionDirectResult.Result); Assert.AreEqual(expectedResult, group); } } @@ -2831,7 +2829,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2938,7 +2936,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2962,7 +2960,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2974,7 +2972,7 @@ // Assert FailureMechanismSectionAssemblyCategoryGroup expectedResult = AssemblyCategoryAssert.GetFailureMechanismSectionCategoryGroup( - ((FmSectionAssemblyDirectResult) kernel.FailureMechanismAssessmentResult).Result); + kernel.FailureMechanismSectionDirectResult.Result); Assert.AreEqual(expectedResult, group); } } @@ -2989,7 +2987,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -r2b79eaf2cbbdff4211eade27fde9febe76029d29 -rdcf5ea07273fabb6650f3836bffadbfeb5b4948a --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision dcf5ea07273fabb6650f3836bffadbfeb5b4948a) @@ -62,7 +62,6 @@ Assert.IsNull(kernel.FailureMechanismSectionDirectResult); Assert.IsNull(kernel.FailureMechanismAssemblyDirectResultWithProbability); Assert.IsNull(kernel.FailureMechanismSectionCategories); - Assert.IsNull(kernel.FailureMechanismAssessmentResult); } #region Simple Assessment @@ -1261,7 +1260,7 @@ var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult( + FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult( random.NextEnumValue()) }; @@ -1270,7 +1269,7 @@ simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); // Assert - Assert.AreSame(kernel.FailureMechanismAssessmentResult, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); } [Test] @@ -1297,9 +1296,99 @@ Assert.IsNull(kernel.DetailedAssessmentResultInput); Assert.IsNull(kernel.TailorMadeAssessmentResultInput); Assert.IsFalse(kernel.Calculated); - Assert.IsNull(kernel.FailureMechanismAssessmentResult); + Assert.IsNull(kernel.FailureMechanismSectionDirectResult); } + [Test] + public void TranslateAssessmentResultWbi0A1WithProbability_WithDirectResultAndThrowExceptionsFalse_InputCorrectlySetToKernelAndCalculatedTrue() + { + // Setup + var random = new Random(11); + var simpleAssemblyResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); + var detailedAssemblyResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); + var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); + + var kernel = new FailureMechanismSectionAssemblyKernelStub(); + + // Call + kernel.TranslateAssessmentResultWbi0A1(simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); + + // Assert + Assert.AreSame(simpleAssemblyResult, kernel.SimpleAssessmentResultInputWithProbability); + Assert.AreSame(detailedAssemblyResult, kernel.DetailedAssessmentResultInputWithProbability); + Assert.AreSame(tailorMadeAssemblyResult, kernel.TailorMadeAssessmentResultInputWithProbability); + Assert.IsTrue(kernel.Calculated); + } + + [Test] + public void TranslateAssessmentResultWbi0A1WithProbability_WithDirectResultAndThrowExceptionsFalse_ReturnFailureMechanismSectionAssemblyResult() + { + // Setup + var random = new Random(11); + var simpleAssemblyResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); + var detailedAssemblyResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); + var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); + + var kernel = new FailureMechanismSectionAssemblyKernelStub + { + FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()) + }; + + // Call + FmSectionAssemblyDirectResultWithProbability result = kernel.TranslateAssessmentResultWbi0A1( + simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); + + // Assert + Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + } + + [Test] + public void TranslateAssessmentResultWbi0A1WithProbability_WithDirectResultAndThrowExceptionOnCalculateTrue_ThrowsException() + { + // Setup + var random = new Random(11); + var kernel = new FailureMechanismSectionAssemblyKernelStub + { + ThrowExceptionOnCalculate = true + }; + + // Call + TestDelegate test = () => kernel.TranslateAssessmentResultWbi0A1( + new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()), + new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()), + new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble())); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("Message", exception.Message); + Assert.IsNotNull(exception.InnerException); + Assert.IsNull(kernel.SimpleAssessmentResultInputWithProbability); + Assert.IsNull(kernel.DetailedAssessmentResultInputWithProbability); + Assert.IsNull(kernel.TailorMadeAssessmentResultInputWithProbability); + Assert.IsFalse(kernel.Calculated); + Assert.IsNull(kernel.FailureMechanismAssemblyDirectResultWithProbability); + } + + [Test] + public void TranslateAssessmentResultWbi0A1WithIndirectResult_Always_ThrowsNotImplementedException() + { + // Setup + var kernel = new FailureMechanismSectionAssemblyKernelStub(); + + // Call + TestDelegate call = () => kernel.TranslateAssessmentResultWbi0A1((FmSectionAssemblyIndirectResult) null, null, null); + + // Assert + Assert.Throws(call); + } + #endregion } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs =================================================================== diff -u -r782024fce80b8d92ae6fad70a1d27620540f1f3e -rdcf5ea07273fabb6650f3836bffadbfeb5b4948a --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision 782024fce80b8d92ae6fad70a1d27620540f1f3e) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision dcf5ea07273fabb6650f3836bffadbfeb5b4948a) @@ -99,6 +99,21 @@ public FmSectionAssemblyDirectResult TailorMadeAssessmentResultInput { get; private set; } /// + /// Gets the simple assessment result with probability used as input parameter for the combined assembly methods. + /// + public FmSectionAssemblyDirectResultWithProbability SimpleAssessmentResultInputWithProbability { get; private set; } + + /// + /// Gets the detailed assessment result with probability used as input parameter for the combined assembly methods. + /// + public FmSectionAssemblyDirectResultWithProbability DetailedAssessmentResultInputWithProbability { get; private set; } + + /// + /// Gets the tailor made assessment result with probability used as input parameter for the combined assembly methods. + /// + public FmSectionAssemblyDirectResultWithProbability TailorMadeAssessmentResultInputWithProbability { get; private set; } + + /// /// Gets the used as input parameter for assembly methods. /// public AssessmentSection AssessmentSectionInput { get; private set; } @@ -141,11 +156,6 @@ public FmSectionAssemblyDirectResultWithProbability FailureMechanismAssemblyDirectResultWithProbability { get; set; } /// - /// Gets or sets the failure mechanism section assembly result. - /// - public IFmSectionAssemblyResult FailureMechanismAssessmentResult { get; set; } - - /// /// Gets a value indicating whether a calculation was called or not. /// public bool Calculated { get; private set; } @@ -325,21 +335,41 @@ return FailureMechanismSectionDirectResult; } - public TResult TranslateAssessmentResultWbi0A1(TResult simpleAssessmentResult, - TResult detailedAssessmentResult, - TResult customAssessmentResult) - where TResult : IFmSectionAssemblyResult + public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0A1(FmSectionAssemblyDirectResult simpleAssessmentResult, + FmSectionAssemblyDirectResult detailedAssessmentResult, + FmSectionAssemblyDirectResult customAssessmentResult) { ThrowException(); - SimpleAssessmentResultInput = simpleAssessmentResult as FmSectionAssemblyDirectResult; - DetailedAssessmentResultInput = detailedAssessmentResult as FmSectionAssemblyDirectResult; - TailorMadeAssessmentResultInput = customAssessmentResult as FmSectionAssemblyDirectResult; + SimpleAssessmentResultInput = simpleAssessmentResult; + DetailedAssessmentResultInput = detailedAssessmentResult; + TailorMadeAssessmentResultInput = customAssessmentResult; Calculated = true; - return (TResult) FailureMechanismAssessmentResult; + return FailureMechanismSectionDirectResult; } + public FmSectionAssemblyDirectResultWithProbability TranslateAssessmentResultWbi0A1(FmSectionAssemblyDirectResultWithProbability simpleAssessmentResult, + FmSectionAssemblyDirectResultWithProbability detailedAssessmentResult, + FmSectionAssemblyDirectResultWithProbability customAssessmentResult) + { + ThrowException(); + + SimpleAssessmentResultInputWithProbability = simpleAssessmentResult; + DetailedAssessmentResultInputWithProbability = detailedAssessmentResult; + TailorMadeAssessmentResultInputWithProbability = customAssessmentResult; + + Calculated = true; + return FailureMechanismAssemblyDirectResultWithProbability; + } + + public FmSectionAssemblyIndirectResult TranslateAssessmentResultWbi0A1(FmSectionAssemblyIndirectResult simpleAssessmentResult, + FmSectionAssemblyIndirectResult detailedAssessmentResult, + FmSectionAssemblyIndirectResult customAssessmentResult) + { + throw new NotImplementedException(); + } + private void ThrowException() { if (ThrowExceptionOnCalculate)