Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -rfb2f6102210d255b376982b7ef961873ce8bb399 -r3d4e5f465e7effc3d1691bb5920ff06806d26d32 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision fb2f6102210d255b376982b7ef961873ce8bb399) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 3d4e5f465e7effc3d1691bb5920ff06806d26d32) @@ -61,7 +61,7 @@ { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0E1( - FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultE1(input)); + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE1(input)); return FailureMechanismSectionAssemblyCreator.Create(output); } @@ -201,9 +201,10 @@ } } - public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult, - double probability, - AssemblyCategoriesInput assemblyCategoriesInput) + public FailureMechanismSectionAssembly AssembleTailorMadeAssessment( + TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult, + double probability, + AssemblyCategoriesInput assemblyCategoriesInput) { try { @@ -272,13 +273,15 @@ } } - public FailureMechanismSectionAssemblyCategoryGroup AssembleTailorMadeAssessment(FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssessmentResult) + public FailureMechanismSectionAssemblyCategoryGroup AssembleTailorMadeAssessment( + FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssessmentResult) { try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); Tuple input = - FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup(tailorMadeAssessmentResult); + FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup( + tailorMadeAssessmentResult); FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0T4(input.Item1, input.Item2); @@ -300,7 +303,8 @@ { try { - FmSectionAssemblyDirectResult simpleAssemblyResult = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(simpleAssembly); + FmSectionAssemblyDirectResult simpleAssemblyResult = + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(simpleAssembly); if (simpleAssemblyResult.Result == EFmSectionCategory.NotApplicable) { return FailureMechanismSectionAssemblyCreator.Create(simpleAssemblyResult); @@ -326,7 +330,8 @@ { try { - FmSectionAssemblyDirectResult simpleAssemblyResult = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(simpleAssembly); + FmSectionAssemblyDirectResult simpleAssemblyResult = + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(simpleAssembly); if (simpleAssemblyResult.Result == EFmSectionCategory.NotApplicable) { return FailureMechanismSectionAssemblyCreator.ConvertFailureMechanismSectionCategory(simpleAssemblyResult.Result); Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs =================================================================== diff -u -rc64583d0bc73943162633d5517fa94e5e1557c8f -r3d4e5f465e7effc3d1691bb5920ff06806d26d32 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision c64583d0bc73943162633d5517fa94e5e1557c8f) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision 3d4e5f465e7effc3d1691bb5920ff06806d26d32) @@ -45,7 +45,7 @@ /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - public static EAssessmentResultTypeE1 CreateAssessmentResultE1(SimpleAssessmentResultType input) + public static EAssessmentResultTypeE1 CreateAssessmentResultTypeE1(SimpleAssessmentResultType input) { if (!Enum.IsDefined(typeof(SimpleAssessmentResultType), input)) { @@ -136,7 +136,8 @@ /// a valid but unsupported . /// Thrown when any input parameter has an /// invalid value. - public static FmSectionAssemblyDirectResult CreateFailureMechanismSectionAssemblyDirectResult(FailureMechanismSectionAssemblyCategoryGroup categoryGroup) + public static FmSectionAssemblyDirectResult CreateFailureMechanismSectionAssemblyDirectResult( + FailureMechanismSectionAssemblyCategoryGroup categoryGroup) { return new FmSectionAssemblyDirectResult(ConvertFailureMechanismSectionAssemblyCategoryGroup(categoryGroup)); } @@ -306,15 +307,17 @@ } /// - /// Creates a based on the given . + /// Creates a based on the + /// given . /// /// The tailor made assessment result to create the result for. /// The created tailor made calculation result. /// Thrown when /// is an invalid . /// Thrown when /// is a valid but unsupported . - public static EAssessmentResultTypeT4 CreateAssessmentResultTypeT4(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult) + public static EAssessmentResultTypeT4 CreateAssessmentResultTypeT4( + TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult) { if (!Enum.IsDefined(typeof(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType), tailorMadeAssessmentResult)) { @@ -387,10 +390,10 @@ } /// - /// Converts a into a . + /// Converts a into a . /// /// The to convert. - /// A based on . + /// A based on . /// Thrown when /// is an invalid value. /// Thrown when Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -rfb2f6102210d255b376982b7ef961873ce8bb399 -r3d4e5f465e7effc3d1691bb5920ff06806d26d32 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision fb2f6102210d255b376982b7ef961873ce8bb399) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 3d4e5f465e7effc3d1691bb5920ff06806d26d32) @@ -160,7 +160,8 @@ calculator.AssembleSimpleAssessment(assessmentResult); // Assert - Assert.AreEqual(GetAssessmentResultTypeE1(assessmentResult), kernel.AssessmentResultTypeE1Input); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE1(assessmentResult), + kernel.AssessmentResultTypeE1Input); } } @@ -274,7 +275,8 @@ calculator.AssembleSimpleAssessment(assessmentResult); // Assert - Assert.AreEqual(GetAssessmentResultTypeE2(assessmentResult), kernel.AssessmentResultTypeE2Input); + Assert.AreEqual(kernel.AssessmentResultTypeE2Input, + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE2(assessmentResult)); } } @@ -348,38 +350,6 @@ } } - private static EAssessmentResultTypeE1 GetAssessmentResultTypeE1(SimpleAssessmentResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case SimpleAssessmentResultType.None: - return EAssessmentResultTypeE1.Gr; - case SimpleAssessmentResultType.NotApplicable: - return EAssessmentResultTypeE1.Nvt; - case SimpleAssessmentResultType.ProbabilityNegligible: - return EAssessmentResultTypeE1.Fv; - case SimpleAssessmentResultType.AssessFurther: - return EAssessmentResultTypeE1.Vb; - default: - throw new NotSupportedException(); - } - } - - private static EAssessmentResultTypeE2 GetAssessmentResultTypeE2(SimpleAssessmentValidityOnlyResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case SimpleAssessmentValidityOnlyResultType.None: - return EAssessmentResultTypeE2.Gr; - case SimpleAssessmentValidityOnlyResultType.NotApplicable: - return EAssessmentResultTypeE2.Nvt; - case SimpleAssessmentValidityOnlyResultType.Applicable: - return EAssessmentResultTypeE2.Wvt; - default: - throw new NotSupportedException(); - } - } - #endregion #region Detailed Assessment @@ -423,7 +393,8 @@ calculator.AssembleDetailedAssessment(detailedAssessmentResult); // Assert - Assert.AreEqual(kernel.AssessmentResultTypeG1Input, GetAssessmentResultTypeG1(detailedAssessmentResult)); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG1(detailedAssessmentResult), + kernel.AssessmentResultTypeG1Input); } } @@ -552,7 +523,8 @@ // Assert Assert.AreEqual(probability, kernel.FailureProbabilityInput); - Assert.AreEqual(GetAssessmentResultTypeG2(detailedAssessment), kernel.AssessmentResultTypeG2Input); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessment), + kernel.AssessmentResultTypeG2Input); AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel); } @@ -722,7 +694,8 @@ // Assert Assert.AreEqual(probability, kernel.FailureProbabilityInput); Assert.AreEqual(n, kernel.LengthEffectFactorInput); - Assert.AreEqual(GetAssessmentResultTypeG2(detailedAssessment), kernel.AssessmentResultTypeG2Input); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessment), + kernel.AssessmentResultTypeG2Input); AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel); } } @@ -995,36 +968,6 @@ } } - private static EAssessmentResultTypeG1 GetAssessmentResultTypeG1(DetailedAssessmentResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case DetailedAssessmentResultType.None: - return EAssessmentResultTypeG1.Gr; - case DetailedAssessmentResultType.Sufficient: - return EAssessmentResultTypeG1.V; - case DetailedAssessmentResultType.Insufficient: - return EAssessmentResultTypeG1.Vn; - case DetailedAssessmentResultType.NotAssessed: - return EAssessmentResultTypeG1.Ngo; - default: - throw new NotSupportedException(); - } - } - - private static EAssessmentResultTypeG2 GetAssessmentResultTypeG2(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case DetailedAssessmentProbabilityOnlyResultType.Probability: - return EAssessmentResultTypeG2.ResultSpecified; - case DetailedAssessmentProbabilityOnlyResultType.NotAssessed: - return EAssessmentResultTypeG2.Ngo; - default: - throw new NotSupportedException(); - } - } - private static ECategoryCompliancy GetCategoryCompliance(DetailedAssessmentResultType detailedAssessmentResult) { switch (detailedAssessmentResult) @@ -1086,7 +1029,8 @@ calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult); // Assert - Assert.AreEqual(kernel.AssessmentResultTypeT1Input, GetAssessmentResultTypeT1(tailorMadeAssessmentResult)); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT1(tailorMadeAssessmentResult), + kernel.AssessmentResultTypeT1Input); } } @@ -1211,7 +1155,8 @@ calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assemblyCategoriesInput); // Assert - Assert.AreEqual(GetAssessmentResultTypeT4(tailorMadeAssessmentResult), kernel.AssessmentResultTypeT4Input); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT4(tailorMadeAssessmentResult), + kernel.AssessmentResultTypeT4Input); Assert.AreEqual(probability, kernel.FailureProbabilityInput); AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel); } @@ -1371,7 +1316,8 @@ calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, assemblyCategoriesInput); // Assert - Assert.AreEqual(GetAssessmentResultTypeT3(tailorMadeAssessmentResult), kernel.AssessmentResultTypeT3Input); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(tailorMadeAssessmentResult), + kernel.AssessmentResultTypeT3Input); Assert.AreEqual(probability, kernel.FailureProbabilityInput); AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel); } @@ -1533,7 +1479,8 @@ calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, n, assemblyCategoriesInput); // Assert - Assert.AreEqual(GetAssessmentResultTypeT3(tailorMadeAssessmentResult), kernel.AssessmentResultTypeT3Input); + Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(tailorMadeAssessmentResult), + kernel.AssessmentResultTypeT3Input); Assert.AreEqual(probability, kernel.FailureProbabilityInput); Assert.AreEqual(n, kernel.LengthEffectFactorInput); AssertAssemblyCategoriesInput(assemblyCategoriesInput, kernel); @@ -1774,63 +1721,6 @@ } } - private static EAssessmentResultTypeT1 GetAssessmentResultTypeT1(TailorMadeAssessmentResultType tailorMadeAssessmentResult) - { - switch (tailorMadeAssessmentResult) - { - case TailorMadeAssessmentResultType.None: - return EAssessmentResultTypeT1.Gr; - case TailorMadeAssessmentResultType.ProbabilityNegligible: - return EAssessmentResultTypeT1.Fv; - case TailorMadeAssessmentResultType.Sufficient: - return EAssessmentResultTypeT1.V; - case TailorMadeAssessmentResultType.Insufficient: - return EAssessmentResultTypeT1.Vn; - case TailorMadeAssessmentResultType.NotAssessed: - return EAssessmentResultTypeT1.Ngo; - default: - throw new NotSupportedException(); - } - } - - private static EAssessmentResultTypeT3 GetAssessmentResultTypeT3(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult) - { - switch (tailorMadeAssessmentResult) - { - case TailorMadeAssessmentProbabilityCalculationResultType.None: - return EAssessmentResultTypeT3.Gr; - case TailorMadeAssessmentProbabilityCalculationResultType.ProbabilityNegligible: - return EAssessmentResultTypeT3.Fv; - case TailorMadeAssessmentProbabilityCalculationResultType.Probability: - return EAssessmentResultTypeT3.ResultSpecified; - case TailorMadeAssessmentProbabilityCalculationResultType.NotAssessed: - return EAssessmentResultTypeT3.Ngo; - default: - throw new NotSupportedException(); - } - } - - private static EAssessmentResultTypeT4 GetAssessmentResultTypeT4(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult) - { - switch (tailorMadeAssessmentResult) - { - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None: - return EAssessmentResultTypeT4.Gr; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.ProbabilityNegligible: - return EAssessmentResultTypeT4.Fv; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability: - return EAssessmentResultTypeT4.ResultSpecified; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Sufficient: - return EAssessmentResultTypeT4.V; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Insufficient: - return EAssessmentResultTypeT4.Vn; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.NotAssessed: - return EAssessmentResultTypeT4.Ngo; - default: - throw new NotSupportedException(); - } - } - #endregion #region Combined Assembly @@ -1847,9 +1737,10 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleCombined(new FailureMechanismSectionAssembly(random.NextDouble(), (FailureMechanismSectionAssemblyCategoryGroup) 99), - new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue()), - new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue())); + TestDelegate test = () => calculator.AssembleCombined( + new FailureMechanismSectionAssembly(random.NextDouble(), (FailureMechanismSectionAssemblyCategoryGroup) 99), + new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue()), + new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue())); // Assert var exception = Assert.Throws(test); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs =================================================================== diff -u -r527932bf6a98d57c829448c0ba1a588848e6b224 -r3d4e5f465e7effc3d1691bb5920ff06806d26d32 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision 527932bf6a98d57c829448c0ba1a588848e6b224) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision 3d4e5f465e7effc3d1691bb5920ff06806d26d32) @@ -39,10 +39,10 @@ #region Simple Assessment [Test] - public void CreateAssessmentResultE1_WithInvalidEnumInput_ThrowInvalidEnumArgumentException() + public void CreateAssessmentResultTypeE1_WithInvalidEnumInput_ThrowInvalidEnumArgumentException() { // Call - TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultE1((SimpleAssessmentResultType) 99); + TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE1((SimpleAssessmentResultType) 99); // Assert const string expectedMessage = "The value of argument 'input' (99) is invalid for Enum type 'SimpleAssessmentResultType'."; @@ -54,11 +54,11 @@ [TestCase(SimpleAssessmentResultType.NotApplicable, EAssessmentResultTypeE1.Nvt)] [TestCase(SimpleAssessmentResultType.ProbabilityNegligible, EAssessmentResultTypeE1.Fv)] [TestCase(SimpleAssessmentResultType.AssessFurther, EAssessmentResultTypeE1.Vb)] - public void CreateAssessmentResultE1_ValidData_ReturnSimpleCalculationResult(SimpleAssessmentResultType originalResult, - EAssessmentResultTypeE1 expectedResult) + public void CreateAssessmentResultTypeE1_ValidData_ReturnsAssessmentResultTypeE1(SimpleAssessmentResultType originalResult, + EAssessmentResultTypeE1 expectedResult) { // Call - EAssessmentResultTypeE1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultE1(originalResult); + EAssessmentResultTypeE1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE1(originalResult); // Assert Assert.AreEqual(expectedResult, result); @@ -79,7 +79,7 @@ [TestCase(SimpleAssessmentValidityOnlyResultType.None, EAssessmentResultTypeE2.Gr)] [TestCase(SimpleAssessmentValidityOnlyResultType.NotApplicable, EAssessmentResultTypeE2.Nvt)] [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable, EAssessmentResultTypeE2.Wvt)] - public void CreateAssessmentResultTypeE2_ValidData_ReturnSimpleCalculationResultValidityOnly( + public void CreateAssessmentResultTypeE2_ValidData_ReturnsAssessmentResultTypeE2( SimpleAssessmentValidityOnlyResultType originalResult, EAssessmentResultTypeE2 expectedResult) { @@ -156,17 +156,18 @@ } [Test] - [TestCase(DetailedAssessmentResultType.None)] + [TestCase(DetailedAssessmentResultType.None, EAssessmentResultTypeG1.Gr)] [TestCase(DetailedAssessmentResultType.Insufficient)] [TestCase(DetailedAssessmentResultType.Sufficient)] [TestCase(DetailedAssessmentResultType.NotAssessed)] - public void CreateAssessmentResultTypeG1_ValidInput_ReturnsDetailedCalculationResult(DetailedAssessmentResultType detailedAssessmentResult) + public void CreateAssessmentResultTypeG1_ValidInput_ReturnsAssessmentResultTypeG1(DetailedAssessmentResultType originalResult, + EAssessmentResultTypeG1 expectedResult) { // Call - EAssessmentResultTypeG1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG1(detailedAssessmentResult); + EAssessmentResultTypeG1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG1(originalResult); // Assert - Assert.AreEqual(result, GetAssessmentResultTypeG1(detailedAssessmentResult)); + Assert.AreEqual(expectedResult, result); } [Test] @@ -183,15 +184,17 @@ } [Test] - [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability)] - [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed)] - public void CreateAssessmentResultTypeG2_ValidInput_ReturnsDetailedCalculationResult(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult) + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, EAssessmentResultTypeG2.ResultSpecified)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, EAssessmentResultTypeG2.Ngo)] + public void CreateAssessmentResultTypeG2_ValidInput_ReturnsAssessmentResultTypeG2( + DetailedAssessmentProbabilityOnlyResultType originalResult, + EAssessmentResultTypeG2 expectedResult) { // Call - EAssessmentResultTypeG2 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessmentResult); + EAssessmentResultTypeG2 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(originalResult); // Assert - Assert.AreEqual(result, GetAssessmentResultTypeG2(detailedAssessmentResult)); + Assert.AreEqual(expectedResult, result); } private static IEnumerable InvalidDetailedAssessmentCategoryResults @@ -227,36 +230,6 @@ } } - private static EAssessmentResultTypeG1 GetAssessmentResultTypeG1(DetailedAssessmentResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case DetailedAssessmentResultType.None: - return EAssessmentResultTypeG1.Gr; - case DetailedAssessmentResultType.Sufficient: - return EAssessmentResultTypeG1.V; - case DetailedAssessmentResultType.Insufficient: - return EAssessmentResultTypeG1.Vn; - case DetailedAssessmentResultType.NotAssessed: - return EAssessmentResultTypeG1.Ngo; - default: - throw new NotSupportedException(); - } - } - - private static EAssessmentResultTypeG2 GetAssessmentResultTypeG2(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case DetailedAssessmentProbabilityOnlyResultType.Probability: - return EAssessmentResultTypeG2.ResultSpecified; - case DetailedAssessmentProbabilityOnlyResultType.NotAssessed: - return EAssessmentResultTypeG2.Ngo; - default: - throw new NotSupportedException(); - } - } - private static ECategoryCompliancy GetCategoryCompliance(DetailedAssessmentResultType detailedAssessmentResult) { switch (detailedAssessmentResult) @@ -299,7 +272,7 @@ [TestCase(FailureMechanismSectionAssemblyCategoryGroup.Vv, EFmSectionCategory.Vv)] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIv, EFmSectionCategory.VIv)] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIIv, EFmSectionCategory.VIIv)] - public void CreateFailureMechanismSectionAssemblyDirectResult_WithAssembly_ReturnFailureMechanismSectionAssemblyCategoryResult( + public void CreateFailureMechanismSectionAssemblyDirectResult_WithAssembly_ReturnFailureMechanismSectionDirectAssemblyResult( FailureMechanismSectionAssemblyCategoryGroup originalGroup, EFmSectionCategory expectedGroup) { @@ -338,7 +311,7 @@ [TestCase(FailureMechanismSectionAssemblyCategoryGroup.Vv, EFmSectionCategory.Vv)] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIv, EFmSectionCategory.VIv)] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIIv, EFmSectionCategory.VIIv)] - public void CreateFailureMechanismSectionAssemblyDirectResult_WithValidGroup_ReturnEFmSectionCategory( + public void CreateFailureMechanismSectionAssemblyDirectResult_WithValidGroup_ReturnFmSectionCategory( FailureMechanismSectionAssemblyCategoryGroup originalGroup, EFmSectionCategory expectedGroup) { @@ -415,39 +388,22 @@ } [Test] - [TestCase(TailorMadeAssessmentResultType.None)] - [TestCase(TailorMadeAssessmentResultType.ProbabilityNegligible)] - [TestCase(TailorMadeAssessmentResultType.Insufficient)] - [TestCase(TailorMadeAssessmentResultType.Sufficient)] - [TestCase(TailorMadeAssessmentResultType.NotAssessed)] - public void CreateAssessmentResultTypeT1_ValidInput_ReturnsTailorMadeCalculationResult(TailorMadeAssessmentResultType detailedAssessmentResult) + [TestCase(TailorMadeAssessmentResultType.None, EAssessmentResultTypeT1.Gr)] + [TestCase(TailorMadeAssessmentResultType.ProbabilityNegligible, EAssessmentResultTypeT1.Fv)] + [TestCase(TailorMadeAssessmentResultType.Insufficient, EAssessmentResultTypeT1.Vn)] + [TestCase(TailorMadeAssessmentResultType.Sufficient, EAssessmentResultTypeT1.V)] + [TestCase(TailorMadeAssessmentResultType.NotAssessed, EAssessmentResultTypeT1.Ngo)] + public void CreateAssessmentResultTypeT1_ValidInput_ReturnsAssessmentResultTypeT1( + TailorMadeAssessmentResultType originalResult, + EAssessmentResultTypeT1 expectedResult) { // Call - EAssessmentResultTypeT1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT1(detailedAssessmentResult); + EAssessmentResultTypeT1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT1(originalResult); // Assert - Assert.AreEqual(result, GetAssessmentResultTypeT1(detailedAssessmentResult)); + Assert.AreEqual(expectedResult, result); } - private static EAssessmentResultTypeT1 GetAssessmentResultTypeT1(TailorMadeAssessmentResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case TailorMadeAssessmentResultType.None: - return EAssessmentResultTypeT1.Gr; - case TailorMadeAssessmentResultType.ProbabilityNegligible: - return EAssessmentResultTypeT1.Fv; - case TailorMadeAssessmentResultType.Sufficient: - return EAssessmentResultTypeT1.V; - case TailorMadeAssessmentResultType.Insufficient: - return EAssessmentResultTypeT1.Vn; - case TailorMadeAssessmentResultType.NotAssessed: - return EAssessmentResultTypeT1.Ngo; - default: - throw new NotSupportedException(); - } - } - [Test] public void CreateAssessmentResultTypeT3_InvalidEnumInput_ThrowInvalidEnumArgumentException() { @@ -460,36 +416,21 @@ } [Test] - [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.None)] - [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.ProbabilityNegligible)] - [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.Probability)] - [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.NotAssessed)] - public void CreateAssessmentResultTypeT3_ValidInput_ReturnsTailorMadeCalculationResult(TailorMadeAssessmentProbabilityCalculationResultType detailedAssessmentResult) + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.None, EAssessmentResultTypeT3.Gr)] + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.ProbabilityNegligible, EAssessmentResultTypeT3.Fv)] + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.Probability, EAssessmentResultTypeT3.ResultSpecified)] + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.NotAssessed, EAssessmentResultTypeT3.Ngo)] + public void CreateAssessmentResultTypeT3_ValidInput_ReturnsAssessmentResultTypeT3( + TailorMadeAssessmentProbabilityCalculationResultType originalResult, + EAssessmentResultTypeT3 expectedResult) { // Call - EAssessmentResultTypeT3 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(detailedAssessmentResult); + EAssessmentResultTypeT3 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(originalResult); // Assert - Assert.AreEqual(result, GetAssessmentResultTypeT3(detailedAssessmentResult)); + Assert.AreEqual(expectedResult, result); } - private static EAssessmentResultTypeT3 GetAssessmentResultTypeT3(TailorMadeAssessmentProbabilityCalculationResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case TailorMadeAssessmentProbabilityCalculationResultType.None: - return EAssessmentResultTypeT3.Gr; - case TailorMadeAssessmentProbabilityCalculationResultType.ProbabilityNegligible: - return EAssessmentResultTypeT3.Fv; - case TailorMadeAssessmentProbabilityCalculationResultType.Probability: - return EAssessmentResultTypeT3.ResultSpecified; - case TailorMadeAssessmentProbabilityCalculationResultType.NotAssessed: - return EAssessmentResultTypeT3.Ngo; - default: - throw new NotSupportedException(); - } - } - [Test] public void CreateAssessmentResultTypeT4_InvalidEnumInput_ThrowInvalidEnumArgumentException() { @@ -502,43 +443,23 @@ } [Test] - [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None)] - [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.ProbabilityNegligible)] - [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability)] - [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Sufficient)] - [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Insufficient)] - [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.NotAssessed)] - public void CreateAssessmentResultTypeT4_ValidInput_ReturnsTailorMadeCalculationResult( - TailorMadeAssessmentProbabilityAndDetailedCalculationResultType detailedAssessmentResult) + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, EAssessmentResultTypeT4.Gr)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.ProbabilityNegligible, EAssessmentResultTypeT4.Fv)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability, EAssessmentResultTypeT4.ResultSpecified)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Sufficient, EAssessmentResultTypeT4.V)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Insufficient, EAssessmentResultTypeT4.Vn)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.NotAssessed, EAssessmentResultTypeT4.Ngo)] + public void CreateAssessmentResultTypeT4_ValidInput_ReturnsAssessmentResultTypeT4( + TailorMadeAssessmentProbabilityAndDetailedCalculationResultType originalResult, + EAssessmentResultTypeT4 expectedResult) { // Call - EAssessmentResultTypeT4 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT4(detailedAssessmentResult); + EAssessmentResultTypeT4 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT4(originalResult); // Assert - Assert.AreEqual(result, GetAssessmentResultTypeT4(detailedAssessmentResult)); + Assert.AreEqual(expectedResult, result); } - private static EAssessmentResultTypeT4 GetAssessmentResultTypeT4(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType detailedAssessmentResult) - { - switch (detailedAssessmentResult) - { - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None: - return EAssessmentResultTypeT4.Gr; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.ProbabilityNegligible: - return EAssessmentResultTypeT4.Fv; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability: - return EAssessmentResultTypeT4.ResultSpecified; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Sufficient: - return EAssessmentResultTypeT4.V; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Insufficient: - return EAssessmentResultTypeT4.Vn; - case TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.NotAssessed: - return EAssessmentResultTypeT4.Ngo; - default: - throw new NotSupportedException(); - } - } - #endregion } } \ No newline at end of file