Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -rbc0e5142bb9adf63fbb523db20127f5bbcca1041 -r8049c8f73c99e5b2bcbb6648e4a508cfa95f92db --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision bc0e5142bb9adf63fbb523db20127f5bbcca1041) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 8049c8f73c99e5b2bcbb6648e4a508cfa95f92db) @@ -854,34 +854,34 @@ #region Combined Assessment [Test] - public void CombinedAssessmentFromFailureMechanismSectionResults_ThrowExceptionOnCalculateFalse_InputCorrectlySetToKernelAndCalculatedTrue() + public void TranslateAssessmentResultWbi0A1_WithDirectResultAndThrowExceptionOnCalculateFalse_InputCorrectlySetToKernelAndCalculatedTrue() { // Setup var random = new Random(11); - var simpleAssemblyResult = random.NextEnumValue(); - var detailedAssemblyResult = random.NextEnumValue(); - var tailorMadeAssemblyResult = random.NextEnumValue(); + var simpleAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()); + var detailedAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()); + var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()); var kernel = new FailureMechanismSectionAssemblyKernelStub(); // Call - kernel.CombinedAssessmentFromFailureMechanismSectionResults(simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); + kernel.TranslateAssessmentResultWbi0A1(simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); // Assert - Assert.AreEqual(simpleAssemblyResult, kernel.CombinedSimpleAssessmentGroupInput); - Assert.AreEqual(detailedAssemblyResult, kernel.CombinedDetailedAssessmentGroupInput); - Assert.AreEqual(tailorMadeAssemblyResult, kernel.CombinedTailorMadeAssessmentGroupInput); + Assert.AreSame(simpleAssemblyResult, kernel.SimpleAssessmentResultInput); + Assert.AreSame(detailedAssemblyResult, kernel.DetailedAssessmentResultInput); + Assert.AreSame(tailorMadeAssemblyResult, kernel.TailorMadeAssessmentResultInput); Assert.IsTrue(kernel.Calculated); } [Test] - public void CombinedAssessmentFromFailureMechanismSectionResults_ThrowExceptionOnCalculateFalse_ReturnFailureMechanismSectionAssemblyResult() + public void TranslateAssessmentResultWbi0A1_WithDirectResultAndThrowExceptionOnCalculateFalse_ReturnFailureMechanismSectionAssemblyResult() { // Setup var random = new Random(11); - var simpleAssemblyResult = random.NextEnumValue(); - var detailedAssemblyResult = random.NextEnumValue(); - var tailorMadeAssemblyResult = random.NextEnumValue(); + var simpleAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()); + var detailedAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()); + var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()); var kernel = new FailureMechanismSectionAssemblyKernelStub { @@ -890,134 +890,55 @@ }; // Call - FmSectionAssemblyDirectResult result = kernel.CombinedAssessmentFromFailureMechanismSectionResults( + var result = (FmSectionAssemblyDirectResult) kernel.TranslateAssessmentResultWbi0A1( simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); // Assert - Assert.AreSame(kernel.FailureMechanismSectionAssemblyCategoryGroup, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); } [Test] - public void CombinedAssessmentFromFailureMechanismSectionResults_ThrowExceptionOnCalculateTrue_ThrowsException() + public void TranslateAssessmentResultWbi0A1_WithDirectResultAndThrowExceptionOnCalculateTrue_ThrowsException() { // Setup var random = new Random(11); - var simpleAssemblyResult = random.NextEnumValue(); - var detailedAssemblyResult = random.NextEnumValue(); - var tailorMadeAssemblyResult = random.NextEnumValue(); - var kernel = new FailureMechanismSectionAssemblyKernelStub { ThrowExceptionOnCalculate = true }; // Call - TestDelegate test = () => kernel.CombinedAssessmentFromFailureMechanismSectionResults(simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); + TestDelegate test = () => kernel.TranslateAssessmentResultWbi0A1(new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()), + new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble()), + new FmSectionAssemblyDirectResult(random.NextEnumValue(), random.NextDouble())); // Assert var exception = Assert.Throws(test); Assert.AreEqual("Message", exception.Message); Assert.IsNotNull(exception.InnerException); - Assert.IsNull(kernel.CombinedSimpleAssessmentGroupInput); - Assert.IsNull(kernel.CombinedDetailedAssessmentGroupInput); - Assert.IsNull(kernel.CombinedTailorMadeAssessmentGroupInput); + Assert.IsNull(kernel.SimpleAssessmentResultInput); + Assert.IsNull(kernel.DetailedAssessmentResultInput); + Assert.IsNull(kernel.TailorMadeAssessmentResultInput); Assert.IsFalse(kernel.Calculated); - Assert.IsNull(kernel.FailureMechanismSectionAssemblyCategoryGroup); + Assert.IsNull(kernel.FailureMechanismSectionDirectResult); } [Test] - public void CombinedAssessmentFromFailureMechanismSectionResultsWithProbabilities_ThrowExceptionOnCalculateFalse_InputCorrectlySetToKernelAndCalculatedTrue() + public void TranslateAssessmentResultWbi0A1_WithIndirectResult_ThrowNotImplementedException() { // Setup var random = new Random(11); - var simpleAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - var detailedAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - var tailorMadeAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - var kernel = new FailureMechanismSectionAssemblyKernelStub(); - // Precondition - Assert.IsFalse(kernel.Calculated); - // Call - kernel.CombinedAssessmentFromFailureMechanismSectionResults(simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); + TestDelegate test = () => kernel.TranslateAssessmentResultWbi0A1(new FmSectionAssemblyIndirectResult(random.NextEnumValue()), + new FmSectionAssemblyIndirectResult(random.NextEnumValue()), + new FmSectionAssemblyIndirectResult(random.NextEnumValue())); // Assert - Assert.AreSame(simpleAssemblyResult, kernel.CombinedSimpleAssessmentInput); - Assert.AreSame(detailedAssemblyResult, kernel.CombinedDetailedAssessmentInput); - Assert.AreSame(tailorMadeAssemblyResult, kernel.CombinedTailorMadeAssessmentInput); - Assert.IsTrue(kernel.Calculated); + Assert.Throws(test); } - [Test] - public void CombinedAssessmentFromFailureMechanismSectionResultsWithProbabilities_ThrowExceptionOnCalculateFalse_ReturnFailureMechanismSectionAssemblyResult() - { - // Setup - var random = new Random(11); - var simpleAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - var detailedAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - var tailorMadeAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - - var kernel = new FailureMechanismSectionAssemblyKernelStub - { - FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult( - new FailureMechanismSectionAssemblyResult(random.NextEnumValue(), double.NaN)) - }; - - // Call - FmSectionAssemblyDirectResult result = kernel.CombinedAssessmentFromFailureMechanismSectionResults( - simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); - - // Assert - Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); - } - - [Test] - public void CombinedAssessmentFromFailureMechanismSectionResultsWithProbabilities_ThrowExceptionOnCalculateTrue_ThrowsException() - { - // Setup - var random = new Random(11); - var simpleAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - var detailedAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - var tailorMadeAssemblyResult = new FailureMechanismSectionAssemblyResult( - random.NextEnumValue(), - double.NaN); - - var kernel = new FailureMechanismSectionAssemblyKernelStub - { - ThrowExceptionOnCalculate = true - }; - - // Call - TestDelegate test = () => kernel.CombinedAssessmentFromFailureMechanismSectionResults(simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); - - // Assert - var exception = Assert.Throws(test); - Assert.AreEqual("Message", exception.Message); - Assert.IsNotNull(exception.InnerException); - Assert.IsNull(kernel.CombinedSimpleAssessmentInput); - Assert.IsNull(kernel.CombinedDetailedAssessmentInput); - Assert.IsNull(kernel.CombinedTailorMadeAssessmentInput); - Assert.IsFalse(kernel.Calculated); - Assert.IsNull(kernel.FailureMechanismSectionDirectResult); - } - #endregion } } \ No newline at end of file