Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -rf22d5a26a3468052a16f55401f1d06e3ceab9ac2 -r66b015b8c147f6ddfcb51edaa40870fad38e43d9 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision f22d5a26a3468052a16f55401f1d06e3ceab9ac2) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 66b015b8c147f6ddfcb51edaa40870fad38e43d9) @@ -189,8 +189,8 @@ try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); - FmSectionAssemblyDirectResult output = kernel.TailorMadeAssessmentDirectFailureMechanisms( - FailureMechanismSectionAssemblyCalculatorInputCreator.CreateTailorMadeCalculationResult(tailorMadeAssessmentResult)); + FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0T1( + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT1(tailorMadeAssessmentResult)); return FailureMechanismSectionAssemblyCreator.ConvertFailureMechanismSectionCategory(output.Result); } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -rf22d5a26a3468052a16f55401f1d06e3ceab9ac2 -r66b015b8c147f6ddfcb51edaa40870fad38e43d9 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision f22d5a26a3468052a16f55401f1d06e3ceab9ac2) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 66b015b8c147f6ddfcb51edaa40870fad38e43d9) @@ -953,33 +953,31 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionAssemblyCategoryGroup = new CalculationOutput( - random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult); // Assert - Assert.AreEqual(kernel.TailorMadeCalculationResultInput, GetTailorMadeCalculationResult(tailorMadeAssessmentResult)); + Assert.AreEqual(kernel.AssessmentResultTypeT1Input, GetTailorMadeCalculationResult(tailorMadeAssessmentResult)); } } - private static TailorMadeCalculationResult GetTailorMadeCalculationResult(TailorMadeAssessmentResultType tailorMadeAssessmentResult) + private static EAssessmentResultTypeT1 GetTailorMadeCalculationResult(TailorMadeAssessmentResultType tailorMadeAssessmentResult) { switch (tailorMadeAssessmentResult) { case TailorMadeAssessmentResultType.None: - return TailorMadeCalculationResult.None; + return EAssessmentResultTypeT1.Gr; case TailorMadeAssessmentResultType.ProbabilityNegligible: - return TailorMadeCalculationResult.FV; + return EAssessmentResultTypeT1.Fv; case TailorMadeAssessmentResultType.Sufficient: - return TailorMadeCalculationResult.V; + return EAssessmentResultTypeT1.V; case TailorMadeAssessmentResultType.Insufficient: - return TailorMadeCalculationResult.VN; + return EAssessmentResultTypeT1.Vn; case TailorMadeAssessmentResultType.NotAssessed: - return TailorMadeCalculationResult.NGO; + return EAssessmentResultTypeT1.Ngo; default: throw new NotSupportedException(); } @@ -996,8 +994,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionAssemblyCategoryGroup = new CalculationOutput( - (FailureMechanismSectionCategoryGroup) 99); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1022,8 +1019,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionAssemblyCategoryGroup = new CalculationOutput( - random.NextEnumValue()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1032,7 +1028,7 @@ random.NextEnumValue()); // Assert - Assert.AreEqual(GetGroup(kernel.FailureMechanismSectionAssemblyCategoryGroup.Result), assembly); + Assert.AreEqual(GetGroup(kernel.FailureMechanismSectionDirectResult.Result), assembly); } }