Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs =================================================================== diff -u -r4897c7f3c1eb1d659f0df8bb5b3ca83ea1995863 -r5f782332ee6ed380dc3272c5e17092c9a6cb943a --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 4897c7f3c1eb1d659f0df8bb5b3ca83ea1995863) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 5f782332ee6ed380dc3272c5e17092c9a6cb943a) @@ -57,28 +57,28 @@ categoriesOutput => new AssessmentSectionAssemblyGroupBoundaries( categoriesOutput.LowerLimit, categoriesOutput.UpperLimit, - CreateAssessmentSectionAssemblyCategory(categoriesOutput.Category))).ToArray(); + CreateAssessmentSectionAssemblyGroup(categoriesOutput.Category))).ToArray(); } /// - /// Creates a based on . + /// Creates an based on . /// - /// The to convert. - /// A based on . - /// Thrown when + /// The to convert. + /// A based on . + /// Thrown when /// is an invalid value. - /// Thrown when + /// Thrown when /// is a valid value, but unsupported. - public static AssessmentSectionAssemblyGroup CreateAssessmentSectionAssemblyCategory(EAssessmentGrade category) + public static AssessmentSectionAssemblyGroup CreateAssessmentSectionAssemblyGroup(EAssessmentGrade group) { - if (!Enum.IsDefined(typeof(EAssessmentGrade), category)) + if (!Enum.IsDefined(typeof(EAssessmentGrade), group)) { - throw new InvalidEnumArgumentException(nameof(category), - (int) category, + throw new InvalidEnumArgumentException(nameof(group), + (int) group, typeof(EAssessmentGrade)); } - switch (category) + switch (group) { case EAssessmentGrade.APlus: return AssessmentSectionAssemblyGroup.APlus; Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssessmentSectionAssemblyResultCreator.cs =================================================================== diff -u -r8bd81257e03971742d60a23ef7ddcb0202988e2d -r5f782332ee6ed380dc3272c5e17092c9a6cb943a --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssessmentSectionAssemblyResultCreator.cs (.../AssessmentSectionAssemblyResultCreator.cs) (revision 8bd81257e03971742d60a23ef7ddcb0202988e2d) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssessmentSectionAssemblyResultCreator.cs (.../AssessmentSectionAssemblyResultCreator.cs) (revision 5f782332ee6ed380dc3272c5e17092c9a6cb943a) @@ -50,7 +50,7 @@ } return new AssessmentSectionAssemblyResult(result.FailureProbability, - AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory(result.Category)); + AssemblyCategoryCreator.CreateAssessmentSectionAssemblyGroup(result.Category)); } } } \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r9bb4effb0bbb67ac58342e08f78e3e8398e05bb8 -r5f782332ee6ed380dc3272c5e17092c9a6cb943a --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 9bb4effb0bbb67ac58342e08f78e3e8398e05bb8) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 5f782332ee6ed380dc3272c5e17092c9a6cb943a) @@ -163,7 +163,7 @@ // Assert Assert.AreEqual(assemblyResult.FailureProbability, result.Probability); - Assert.AreEqual(AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory(assemblyResult.Category), + Assert.AreEqual(AssemblyCategoryCreator.CreateAssessmentSectionAssemblyGroup(assemblyResult.Category), result.AssemblyCategoryGroup); } } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs =================================================================== diff -u -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 -r5f782332ee6ed380dc3272c5e17092c9a6cb943a --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision 5f782332ee6ed380dc3272c5e17092c9a6cb943a) @@ -36,7 +36,7 @@ public void CreateAssessmentSectionAssemblyCategoryGroup_WithInvalidAssessmentGrade_ThrowsInvalidEnumArgumentException() { // Call - TestDelegate test = () => AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory((EAssessmentGrade) 99); + TestDelegate test = () => AssemblyCategoryCreator.CreateAssessmentSectionAssemblyGroup((EAssessmentGrade) 99); // Assert const string exceptionMessage = "The value of argument 'category' (99) is invalid for Enum type 'EAssessmentGrade'."; @@ -45,15 +45,15 @@ [Test] [TestCaseSource(typeof(AssessmentGradeConversionTestHelper), nameof(AssessmentGradeConversionTestHelper.AssessmentGradeConversionCases))] - public void CreateAssessmentSectionAssemblyCategory_WithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyCategoryResultType( - EAssessmentGrade categoryGroup, + public void CreateAssessmentSectionAssemblyGroup_WithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyGroupResultType( + EAssessmentGrade group, AssessmentSectionAssemblyGroup expectedCategoryGroup) { // Call - AssessmentSectionAssemblyGroup categoryResult = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory(categoryGroup); + AssessmentSectionAssemblyGroup result = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyGroup(group); // Assert - Assert.AreEqual(expectedCategoryGroup, categoryResult); + Assert.AreEqual(expectedCategoryGroup, result); } } } \ No newline at end of file