Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs =================================================================== diff -u -r8504a727494410ae43855ce2fbae498fc6e06d99 -r846d55260318cd847e6fca9ce9d9b3c057b96f2c --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 8504a727494410ae43855ce2fbae498fc6e06d99) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 846d55260318cd847e6fca9ce9d9b3c057b96f2c) @@ -36,55 +36,59 @@ internal static class AssemblyCategoryCreator { /// - /// Creates an - /// based on the information given in the . + /// Creates a collection of + /// based on the information given in the . /// - /// The output to create the result for. - /// An - /// with information taken from the . - /// Thrown when is null. - /// Thrown when - /// is an invalid value. - /// Thrown when - /// is a valid value, but unsupported. + /// The collection of to + /// create the result for. + /// A collection of + /// with information taken from the . + /// Thrown when is null. + /// Thrown when + /// contains an invalid value. + /// Thrown when + /// contains a valid value, but unsupported. public static IEnumerable CreateAssessmentSectionAssemblyCategories( - IEnumerable output) + IEnumerable categoryLimits) { - if (output == null) + if (categoryLimits == null) { - throw new ArgumentNullException(nameof(output)); + throw new ArgumentNullException(nameof(categoryLimits)); } - return output.Select( - categoriesOutput => new AssessmentSectionAssemblyCategory(categoriesOutput.LowerLimit, - categoriesOutput.UpperLimit, - ConvertAssessmentSectionCategoryGroup(categoriesOutput.Category))).ToArray(); + return categoryLimits.Select( + categoriesOutput => new AssessmentSectionAssemblyCategory( + categoriesOutput.LowerLimit, + categoriesOutput.UpperLimit, + ConvertAssessmentSectionCategoryGroup(categoriesOutput.Category))).ToArray(); } /// - /// Creates an - /// based on the information given in the . + /// Creates a collection of + /// based on the information given in the . /// - /// The output to create the result for. - /// An - /// with information taken from the . - /// Thrown when is null. - /// Thrown when - /// is an invalid value. - /// Thrown when - /// is a valid value, but unsupported. + /// The collection of to + /// create the result for. + /// A collection of + /// with information taken from the . + /// Thrown when is null. + /// Thrown when + /// contains an invalid value. + /// Thrown when + /// contains a valid value, but unsupported. public static IEnumerable CreateFailureMechanismSectionAssemblyCategories( - IEnumerable output) + IEnumerable categoryLimits) { - if (output == null) + if (categoryLimits == null) { - throw new ArgumentNullException(nameof(output)); + throw new ArgumentNullException(nameof(categoryLimits)); } - return output.Select( - categoriesOutput => new FailureMechanismSectionAssemblyCategory(categoriesOutput.LowerLimit, - categoriesOutput.UpperLimit, - ConvertFailureMechanismSectionCategoryGroup(categoriesOutput.Category))).ToArray(); + return categoryLimits.Select( + categoriesOutput => new FailureMechanismSectionAssemblyCategory( + categoriesOutput.LowerLimit, + categoriesOutput.UpperLimit, + ConvertFailureMechanismSectionCategoryGroup(categoriesOutput.Category))).ToArray(); } /// Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs =================================================================== diff -u -r411d224cee3480a2765f08689797a2a121d236fa -r846d55260318cd847e6fca9ce9d9b3c057b96f2c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision 411d224cee3480a2765f08689797a2a121d236fa) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision 846d55260318cd847e6fca9ce9d9b3c057b96f2c) @@ -49,12 +49,12 @@ } [Test] - public void CreateAssessmentSectionAssemblyCategories_WithOutput_ReturnAssessmentSectionAssemblyCategoryResult() + public void CreateAssessmentSectionAssemblyCategories_WithAssessmentSectionCategoryLimits_ReturnAssessmentSectionAssemblyCategories() { // Setup var random = new Random(11); - var output = new[] + var categoryLimits = new[] { new AssessmentSectionCategoryLimits(EAssessmentGrade.APlus, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)), new AssessmentSectionCategoryLimits(EAssessmentGrade.A, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)), @@ -67,23 +67,23 @@ }; // Call - IEnumerable result = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output); + IEnumerable result = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(categoryLimits); // Assert - AssemblyCategoryAssert.AssertAssessmentSectionAssemblyCategories(output, result); + AssemblyCategoryAssert.AssertAssessmentSectionAssemblyCategories(categoryLimits, result); } [Test] public void CreateAssessmentSectionAssemblyCategories_CategoryWithInvalidAssessmentGrade_ThrowsInvalidEnumArgumentException() { // Setup - var output = new[] + var categoryLimits = new[] { new AssessmentSectionCategoryLimits((EAssessmentGrade) 99, 0, 0) }; // Call - TestDelegate test = () => AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output); + TestDelegate test = () => AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(categoryLimits); // Assert const string exceptionMessage = "The value of argument 'category' (99) is invalid for Enum type 'EAssessmentGrade'."; @@ -101,13 +101,13 @@ AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup) { // Setup - var output = new[] + var categoryLimits = new[] { new AssessmentSectionCategoryLimits(categoryGroup, 0, 0) }; // Call - IEnumerable result = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output); + IEnumerable result = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(categoryLimits); // Assert AssessmentSectionAssemblyCategory categoryResult = result.Single(); @@ -132,7 +132,7 @@ // Setup var random = new Random(11); - var output = new[] + var categoryLimits = new[] { new FmSectionCategoryLimits(EFmSectionCategory.Gr, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)), new FmSectionCategoryLimits(EFmSectionCategory.Iv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)), @@ -146,23 +146,23 @@ }; // Call - IEnumerable result = AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(output); + IEnumerable result = AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(categoryLimits); // Assert - AssemblyCategoryAssert.AssertFailureMechanismSectionAssemblyCategories(output, result); + AssemblyCategoryAssert.AssertFailureMechanismSectionAssemblyCategories(categoryLimits, result); } [Test] public void CreateFailureMechanismSectionAssemblyCategories_CategoryWithInvalidFailureMechanismSectionCategory_ThrowsInvalidEnumArgumentException() { // Setup - var output = new[] + var categoryLimit = new[] { new FmSectionCategoryLimits((EFmSectionCategory) 99, 0, 0) }; // Call - TestDelegate test = () => AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(output); + TestDelegate test = () => AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(categoryLimit); // Assert const string exceptionMessage = "The value of argument 'category' (99) is invalid for Enum type 'EFmSectionCategory'."; @@ -184,13 +184,13 @@ FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup) { // Setup - var output = new[] + var categoryLimits = new[] { new FmSectionCategoryLimits(categoryGroup, 0, 0) }; // Call - IEnumerable result = AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(output); + IEnumerable result = AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(categoryLimits); // Assert FailureMechanismSectionAssemblyCategory categoryResult = result.Single();