Fisheye: Tag 921a4a5b07e757058cfdf6a9be5d256cd08c8c12 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyCategoryGroup.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs =================================================================== diff -u --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs (revision 0) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -0,0 +1,80 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Util.Attributes; +using Riskeer.AssemblyTool.Data.Properties; + +namespace Riskeer.AssemblyTool.Data +{ + /// + /// Enum defining the assembly groups for an assessment section. + /// + public enum AssessmentSectionAssemblyGroup + { + /// + /// Represents the category group GR (No result) for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_None_DisplayName))] + None = 1, + + /// + /// Represents the category group NVT (Not applicable) for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_Empty_DisplayName))] + NotApplicable = 2, + + /// + /// Represents the category group NGO (Not assessed) for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName))] + NotAssessed = 3, + + /// + /// Represents the category group A+ for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_APlus_DisplayName))] + APlus = 4, + + /// + /// Represents the category group A+ for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_A_DisplayName))] + A = 5, + + /// + /// Represents the category group B for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_B_DisplayName))] + B = 6, + + /// + /// Represents the category group C for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_C_DisplayName))] + C = 7, + + /// + /// Represents the category group D for an assessment section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_D_DisplayName))] + D = 8 + } +} \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroupBoundaries.cs =================================================================== diff -u -rd65d6fca2386a9562909c97fda603ee090626190 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroupBoundaries.cs (.../AssessmentSectionAssemblyGroupBoundaries.cs) (revision d65d6fca2386a9562909c97fda603ee090626190) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroupBoundaries.cs (.../AssessmentSectionAssemblyGroupBoundaries.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -32,7 +32,7 @@ /// The lower boundary of the group. /// The upper boundary of the group. /// The actual assessment section group. - public AssessmentSectionAssemblyGroupBoundaries(double lowerBoundary, double upperBoundary, AssessmentSectionAssemblyCategoryGroup group) + public AssessmentSectionAssemblyGroupBoundaries(double lowerBoundary, double upperBoundary, AssessmentSectionAssemblyGroup group) : base(lowerBoundary, upperBoundary) { Group = group; @@ -41,6 +41,6 @@ /// /// Gets the actual assessment section group. /// - public AssessmentSectionAssemblyCategoryGroup Group { get; } + public AssessmentSectionAssemblyGroup Group { get; } } } \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyResult.cs =================================================================== diff -u -r0cb310d64f74690341eb675068b979273b028e33 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyResult.cs (.../AssessmentSectionAssemblyResult.cs) (revision 0cb310d64f74690341eb675068b979273b028e33) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyResult.cs (.../AssessmentSectionAssemblyResult.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -30,9 +30,9 @@ /// Creates a new instance of . /// /// The failure probability of the assessment section. - /// The . + /// The . public AssessmentSectionAssemblyResult(double probability, - AssessmentSectionAssemblyCategoryGroup assemblyCategoryGroup) + AssessmentSectionAssemblyGroup assemblyCategoryGroup) { Probability = probability; AssemblyCategoryGroup = assemblyCategoryGroup; @@ -44,8 +44,8 @@ public double Probability { get; } /// - /// Gets the . + /// Gets the . /// - public AssessmentSectionAssemblyCategoryGroup AssemblyCategoryGroup { get; } + public AssessmentSectionAssemblyGroup AssemblyCategoryGroup { get; } } } \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs =================================================================== diff -u -r8e00cdca05f9cccf95410f8e592643a5a1c3525b -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 8e00cdca05f9cccf95410f8e592643a5a1c3525b) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -32,15 +32,15 @@ public static class AssemblyCategoryCreator { /// - /// Creates a based on . + /// Creates a based on . /// /// The to convert. - /// A based on . + /// A based on . /// Thrown when /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - public static AssessmentSectionAssemblyCategoryGroup CreateAssessmentSectionAssemblyCategory(EAssessmentGrade category) + public static AssessmentSectionAssemblyGroup CreateAssessmentSectionAssemblyCategory(EAssessmentGrade category) { if (!Enum.IsDefined(typeof(EAssessmentGrade), category)) { @@ -52,21 +52,21 @@ switch (category) { case EAssessmentGrade.APlus: - return AssessmentSectionAssemblyCategoryGroup.APlus; + return AssessmentSectionAssemblyGroup.APlus; case EAssessmentGrade.A: - return AssessmentSectionAssemblyCategoryGroup.A; + return AssessmentSectionAssemblyGroup.A; case EAssessmentGrade.B: - return AssessmentSectionAssemblyCategoryGroup.B; + return AssessmentSectionAssemblyGroup.B; case EAssessmentGrade.C: - return AssessmentSectionAssemblyCategoryGroup.C; + return AssessmentSectionAssemblyGroup.C; case EAssessmentGrade.D: - return AssessmentSectionAssemblyCategoryGroup.D; + return AssessmentSectionAssemblyGroup.D; case EAssessmentGrade.Gr: - return AssessmentSectionAssemblyCategoryGroup.None; + return AssessmentSectionAssemblyGroup.None; case EAssessmentGrade.Ngo: - return AssessmentSectionAssemblyCategoryGroup.NotAssessed; + return AssessmentSectionAssemblyGroup.NotAssessed; case EAssessmentGrade.Nvt: - return AssessmentSectionAssemblyCategoryGroup.NotApplicable; + return AssessmentSectionAssemblyGroup.NotApplicable; default: throw new NotSupportedException(); } Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreatorOld.cs =================================================================== diff -u -rd65d6fca2386a9562909c97fda603ee090626190 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreatorOld.cs (.../AssemblyCategoryCreatorOld.cs) (revision d65d6fca2386a9562909c97fda603ee090626190) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreatorOld.cs (.../AssemblyCategoryCreatorOld.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -63,15 +63,15 @@ } /// - /// Creates a based on . + /// Creates a based on . /// /// The to convert. - /// A based on . + /// A based on . /// Thrown when /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - public static AssessmentSectionAssemblyCategoryGroup CreateAssessmentSectionAssemblyCategory(EAssessmentGrade category) + public static AssessmentSectionAssemblyGroup CreateAssessmentSectionAssemblyCategory(EAssessmentGrade category) { if (!Enum.IsDefined(typeof(EAssessmentGrade), category)) { @@ -83,21 +83,21 @@ switch (category) { case EAssessmentGrade.APlus: - return AssessmentSectionAssemblyCategoryGroup.APlus; + return AssessmentSectionAssemblyGroup.APlus; case EAssessmentGrade.A: - return AssessmentSectionAssemblyCategoryGroup.A; + return AssessmentSectionAssemblyGroup.A; case EAssessmentGrade.B: - return AssessmentSectionAssemblyCategoryGroup.B; + return AssessmentSectionAssemblyGroup.B; case EAssessmentGrade.C: - return AssessmentSectionAssemblyCategoryGroup.C; + return AssessmentSectionAssemblyGroup.C; case EAssessmentGrade.D: - return AssessmentSectionAssemblyCategoryGroup.D; + return AssessmentSectionAssemblyGroup.D; case EAssessmentGrade.Gr: - return AssessmentSectionAssemblyCategoryGroup.None; + return AssessmentSectionAssemblyGroup.None; case EAssessmentGrade.Ngo: - return AssessmentSectionAssemblyCategoryGroup.NotAssessed; + return AssessmentSectionAssemblyGroup.NotAssessed; case EAssessmentGrade.Nvt: - return AssessmentSectionAssemblyCategoryGroup.NotApplicable; + return AssessmentSectionAssemblyGroup.NotApplicable; default: throw new NotSupportedException(); } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs (.../AssessmentSectionAssemblyCategoryGroupTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs (.../AssessmentSectionAssemblyCategoryGroupTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -26,71 +26,71 @@ namespace Riskeer.AssemblyTool.Data.Test { [TestFixture] - public class AssessmentSectionAssemblyCategoryGroupTest : EnumWithResourcesDisplayNameTestFixture + public class AssessmentSectionAssemblyCategoryGroupTest : EnumWithResourcesDisplayNameTestFixture { - protected override IDictionary ExpectedValueForEnumValues + protected override IDictionary ExpectedValueForEnumValues { get { - return new Dictionary + return new Dictionary { { - AssessmentSectionAssemblyCategoryGroup.None, 1 + AssessmentSectionAssemblyGroup.None, 1 }, { - AssessmentSectionAssemblyCategoryGroup.NotApplicable, 2 + AssessmentSectionAssemblyGroup.NotApplicable, 2 }, { - AssessmentSectionAssemblyCategoryGroup.NotAssessed, 3 + AssessmentSectionAssemblyGroup.NotAssessed, 3 }, { - AssessmentSectionAssemblyCategoryGroup.APlus, 4 + AssessmentSectionAssemblyGroup.APlus, 4 }, { - AssessmentSectionAssemblyCategoryGroup.A, 5 + AssessmentSectionAssemblyGroup.A, 5 }, { - AssessmentSectionAssemblyCategoryGroup.B, 6 + AssessmentSectionAssemblyGroup.B, 6 }, { - AssessmentSectionAssemblyCategoryGroup.C, 7 + AssessmentSectionAssemblyGroup.C, 7 }, { - AssessmentSectionAssemblyCategoryGroup.D, 8 + AssessmentSectionAssemblyGroup.D, 8 } }; } } - protected override IDictionary ExpectedDisplayNameForEnumValues + protected override IDictionary ExpectedDisplayNameForEnumValues { get { - return new Dictionary + return new Dictionary { { - AssessmentSectionAssemblyCategoryGroup.None, "" + AssessmentSectionAssemblyGroup.None, "" }, { - AssessmentSectionAssemblyCategoryGroup.APlus, "A+" + AssessmentSectionAssemblyGroup.APlus, "A+" }, { - AssessmentSectionAssemblyCategoryGroup.A, "A" + AssessmentSectionAssemblyGroup.A, "A" }, { - AssessmentSectionAssemblyCategoryGroup.B, "B" + AssessmentSectionAssemblyGroup.B, "B" }, { - AssessmentSectionAssemblyCategoryGroup.C, "C" + AssessmentSectionAssemblyGroup.C, "C" }, { - AssessmentSectionAssemblyCategoryGroup.D, "D" + AssessmentSectionAssemblyGroup.D, "D" }, { - AssessmentSectionAssemblyCategoryGroup.NotApplicable, "-" + AssessmentSectionAssemblyGroup.NotApplicable, "-" }, { - AssessmentSectionAssemblyCategoryGroup.NotAssessed, "NGO" + AssessmentSectionAssemblyGroup.NotAssessed, "NGO" } }; } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyGroupBoundariesTest.cs =================================================================== diff -u -rd65d6fca2386a9562909c97fda603ee090626190 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyGroupBoundariesTest.cs (.../AssessmentSectionAssemblyGroupBoundariesTest.cs) (revision d65d6fca2386a9562909c97fda603ee090626190) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyGroupBoundariesTest.cs (.../AssessmentSectionAssemblyGroupBoundariesTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -33,7 +33,7 @@ { // Setup var random = new Random(39); - var assessmentSectionGroup = random.NextEnumValue(); + var assessmentSectionGroup = random.NextEnumValue(); double lowerBoundary = random.NextDouble(); double upperBoundary = random.NextDouble(); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyResultTest.cs =================================================================== diff -u -r0cb310d64f74690341eb675068b979273b028e33 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyResultTest.cs (.../AssessmentSectionAssemblyResultTest.cs) (revision 0cb310d64f74690341eb675068b979273b028e33) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyResultTest.cs (.../AssessmentSectionAssemblyResultTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -34,7 +34,7 @@ // Setup var random = new Random(21); double probability = random.NextDouble(); - var category = random.NextEnumValue(); + var category = random.NextEnumValue(); // Call var result = new AssessmentSectionAssemblyResult(probability, category); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorOldTest.cs =================================================================== diff -u -rd65d6fca2386a9562909c97fda603ee090626190 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorOldTest.cs (.../AssemblyCategoryCreatorOldTest.cs) (revision d65d6fca2386a9562909c97fda603ee090626190) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorOldTest.cs (.../AssemblyCategoryCreatorOldTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -89,7 +89,7 @@ [TestCaseSource(typeof(AssessmentGradeConversionTestHelperOld), nameof(AssessmentGradeConversionTestHelperOld.AssessmentGradeConversionCases))] public void CreateAssessmentSectionAssemblyCategories_CategoryWithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyCategoryResultType( EAssessmentGrade categoryGroup, - AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup) + AssessmentSectionAssemblyGroup expectedCategoryGroup) { // Setup var categories = new CategoriesList(new[] @@ -119,10 +119,10 @@ [TestCaseSource(typeof(AssessmentGradeConversionTestHelperOld), nameof(AssessmentGradeConversionTestHelperOld.AssessmentGradeConversionCases))] public void CreateAssessmentSectionAssemblyCategory_WithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyCategoryResultType( EAssessmentGrade categoryGroup, - AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup) + AssessmentSectionAssemblyGroup expectedCategoryGroup) { // Call - AssessmentSectionAssemblyCategoryGroup categoryResult = AssemblyCategoryCreatorOld.CreateAssessmentSectionAssemblyCategory(categoryGroup); + AssessmentSectionAssemblyGroup categoryResult = AssemblyCategoryCreatorOld.CreateAssessmentSectionAssemblyCategory(categoryGroup); // Assert Assert.AreEqual(expectedCategoryGroup, categoryResult); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs =================================================================== diff -u -r8e00cdca05f9cccf95410f8e592643a5a1c3525b -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision 8e00cdca05f9cccf95410f8e592643a5a1c3525b) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -47,10 +47,10 @@ [TestCaseSource(typeof(AssessmentGradeConversionTestHelper), nameof(AssessmentGradeConversionTestHelper.AssessmentGradeConversionCases))] public void CreateAssessmentSectionAssemblyCategory_WithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyCategoryResultType( EAssessmentGrade categoryGroup, - AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup) + AssessmentSectionAssemblyGroup expectedCategoryGroup) { // Call - AssessmentSectionAssemblyCategoryGroup categoryResult = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory(categoryGroup); + AssessmentSectionAssemblyGroup categoryResult = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory(categoryGroup); // Assert Assert.AreEqual(expectedCategoryGroup, categoryResult); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyResultCreatorTest.cs =================================================================== diff -u -r8e00cdca05f9cccf95410f8e592643a5a1c3525b -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyResultCreatorTest.cs (.../AssessmentSectionAssemblyResultCreatorTest.cs) (revision 8e00cdca05f9cccf95410f8e592643a5a1c3525b) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyResultCreatorTest.cs (.../AssessmentSectionAssemblyResultCreatorTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -48,7 +48,7 @@ [TestCaseSource(typeof(AssessmentGradeConversionTestHelper), nameof(AssessmentGradeConversionTestHelper.AssessmentGradeConversionCases))] public void CreateAssessmentSectionAssemblyResult_WithResult_ReturnsExpectedResult( EAssessmentGrade categoryGroup, - AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup) + AssessmentSectionAssemblyGroup expectedCategoryGroup) { // Setup var random = new Random(21); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs =================================================================== diff -u -rd65d6fca2386a9562909c97fda603ee090626190 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs (.../AssemblyCategoryAssert.cs) (revision d65d6fca2386a9562909c97fda603ee090626190) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs (.../AssemblyCategoryAssert.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -52,26 +52,26 @@ CollectionAssert.AreEqual(original.Categories.Select(o => o.UpperLimit), actual.Select(r => r.UpperBoundary)); } - private static AssessmentSectionAssemblyCategoryGroup GetAssessmentSectionCategoryGroup(EAssessmentGrade category) + private static AssessmentSectionAssemblyGroup GetAssessmentSectionCategoryGroup(EAssessmentGrade category) { switch (category) { case EAssessmentGrade.APlus: - return AssessmentSectionAssemblyCategoryGroup.APlus; + return AssessmentSectionAssemblyGroup.APlus; case EAssessmentGrade.A: - return AssessmentSectionAssemblyCategoryGroup.A; + return AssessmentSectionAssemblyGroup.A; case EAssessmentGrade.B: - return AssessmentSectionAssemblyCategoryGroup.B; + return AssessmentSectionAssemblyGroup.B; case EAssessmentGrade.C: - return AssessmentSectionAssemblyCategoryGroup.C; + return AssessmentSectionAssemblyGroup.C; case EAssessmentGrade.D: - return AssessmentSectionAssemblyCategoryGroup.D; + return AssessmentSectionAssemblyGroup.D; case EAssessmentGrade.Gr: - return AssessmentSectionAssemblyCategoryGroup.None; + return AssessmentSectionAssemblyGroup.None; case EAssessmentGrade.Ngo: - return AssessmentSectionAssemblyCategoryGroup.NotAssessed; + return AssessmentSectionAssemblyGroup.NotAssessed; case EAssessmentGrade.Nvt: - return AssessmentSectionAssemblyCategoryGroup.NotApplicable; + return AssessmentSectionAssemblyGroup.NotApplicable; default: throw new NotSupportedException(); } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs =================================================================== diff -u -r8e00cdca05f9cccf95410f8e592643a5a1c3525b -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs (.../AssessmentGradeConversionTestHelper.cs) (revision 8e00cdca05f9cccf95410f8e592643a5a1c3525b) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs (.../AssessmentGradeConversionTestHelper.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -33,20 +33,20 @@ { /// /// Gets a collection of test cases to test the conversion between - /// and . + /// and . /// public static IEnumerable AssessmentGradeConversionCases { get { - yield return new TestCaseData(EAssessmentGrade.APlus, AssessmentSectionAssemblyCategoryGroup.APlus); - yield return new TestCaseData(EAssessmentGrade.A, AssessmentSectionAssemblyCategoryGroup.A); - yield return new TestCaseData(EAssessmentGrade.B, AssessmentSectionAssemblyCategoryGroup.B); - yield return new TestCaseData(EAssessmentGrade.C, AssessmentSectionAssemblyCategoryGroup.C); - yield return new TestCaseData(EAssessmentGrade.D, AssessmentSectionAssemblyCategoryGroup.D); - yield return new TestCaseData(EAssessmentGrade.Gr, AssessmentSectionAssemblyCategoryGroup.None); - yield return new TestCaseData(EAssessmentGrade.Nvt, AssessmentSectionAssemblyCategoryGroup.NotApplicable); - yield return new TestCaseData(EAssessmentGrade.Ngo, AssessmentSectionAssemblyCategoryGroup.NotAssessed); + yield return new TestCaseData(EAssessmentGrade.APlus, AssessmentSectionAssemblyGroup.APlus); + yield return new TestCaseData(EAssessmentGrade.A, AssessmentSectionAssemblyGroup.A); + yield return new TestCaseData(EAssessmentGrade.B, AssessmentSectionAssemblyGroup.B); + yield return new TestCaseData(EAssessmentGrade.C, AssessmentSectionAssemblyGroup.C); + yield return new TestCaseData(EAssessmentGrade.D, AssessmentSectionAssemblyGroup.D); + yield return new TestCaseData(EAssessmentGrade.Gr, AssessmentSectionAssemblyGroup.None); + yield return new TestCaseData(EAssessmentGrade.Nvt, AssessmentSectionAssemblyGroup.NotApplicable); + yield return new TestCaseData(EAssessmentGrade.Ngo, AssessmentSectionAssemblyGroup.NotAssessed); } } } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelperOld.cs =================================================================== diff -u -r50a62edbe5db7e54dadeaa7d005eed6a8e77b642 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelperOld.cs (.../AssessmentGradeConversionTestHelperOld.cs) (revision 50a62edbe5db7e54dadeaa7d005eed6a8e77b642) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelperOld.cs (.../AssessmentGradeConversionTestHelperOld.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -33,20 +33,20 @@ { /// /// Gets a collection of test cases to test the conversion between - /// and . + /// and . /// public static IEnumerable AssessmentGradeConversionCases { get { - yield return new TestCaseData(EAssessmentGrade.APlus, AssessmentSectionAssemblyCategoryGroup.APlus); - yield return new TestCaseData(EAssessmentGrade.A, AssessmentSectionAssemblyCategoryGroup.A); - yield return new TestCaseData(EAssessmentGrade.B, AssessmentSectionAssemblyCategoryGroup.B); - yield return new TestCaseData(EAssessmentGrade.C, AssessmentSectionAssemblyCategoryGroup.C); - yield return new TestCaseData(EAssessmentGrade.D, AssessmentSectionAssemblyCategoryGroup.D); - yield return new TestCaseData(EAssessmentGrade.Gr, AssessmentSectionAssemblyCategoryGroup.None); - yield return new TestCaseData(EAssessmentGrade.Nvt, AssessmentSectionAssemblyCategoryGroup.NotApplicable); - yield return new TestCaseData(EAssessmentGrade.Ngo, AssessmentSectionAssemblyCategoryGroup.NotAssessed); + yield return new TestCaseData(EAssessmentGrade.APlus, AssessmentSectionAssemblyGroup.APlus); + yield return new TestCaseData(EAssessmentGrade.A, AssessmentSectionAssemblyGroup.A); + yield return new TestCaseData(EAssessmentGrade.B, AssessmentSectionAssemblyGroup.B); + yield return new TestCaseData(EAssessmentGrade.C, AssessmentSectionAssemblyGroup.C); + yield return new TestCaseData(EAssessmentGrade.D, AssessmentSectionAssemblyGroup.D); + yield return new TestCaseData(EAssessmentGrade.Gr, AssessmentSectionAssemblyGroup.None); + yield return new TestCaseData(EAssessmentGrade.Nvt, AssessmentSectionAssemblyGroup.NotApplicable); + yield return new TestCaseData(EAssessmentGrade.Ngo, AssessmentSectionAssemblyGroup.NotAssessed); } } } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs =================================================================== diff -u -r882667e55a3e77e2679551c744688950eab842b7 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs (.../AssessmentSectionAssemblyCalculatorStub.cs) (revision 882667e55a3e77e2679551c744688950eab842b7) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs (.../AssessmentSectionAssemblyCalculatorStub.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -83,7 +83,7 @@ LowerLimitNormInput = lowerLimitNorm; SignalingNormInput = signalingNorm; - return AssessmentSectionAssemblyResult ?? (AssessmentSectionAssemblyResult = new AssessmentSectionAssemblyResult(0.14, AssessmentSectionAssemblyCategoryGroup.NotApplicable)); + return AssessmentSectionAssemblyResult ?? (AssessmentSectionAssemblyResult = new AssessmentSectionAssemblyResult(0.14, AssessmentSectionAssemblyGroup.NotApplicable)); } public IEnumerable AssembleCombinedFailureMechanismSections( Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculatorStub.cs =================================================================== diff -u -rafed83a0655d0c6f8527d6bc41417db7cce91931 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculatorStub.cs (.../AssessmentSectionAssemblyGroupBoundariesCalculatorStub.cs) (revision afed83a0655d0c6f8527d6bc41417db7cce91931) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculatorStub.cs (.../AssessmentSectionAssemblyGroupBoundariesCalculatorStub.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -64,9 +64,9 @@ return AssessmentSectionAssemblyGroupBoundariesOutput ?? (AssessmentSectionAssemblyGroupBoundariesOutput = new[] { - new AssessmentSectionAssemblyGroupBoundaries(1, 2, AssessmentSectionAssemblyCategoryGroup.A), - new AssessmentSectionAssemblyGroupBoundaries(2.01, 3, AssessmentSectionAssemblyCategoryGroup.B), - new AssessmentSectionAssemblyGroupBoundaries(3.01, 4, AssessmentSectionAssemblyCategoryGroup.C) + new AssessmentSectionAssemblyGroupBoundaries(1, 2, AssessmentSectionAssemblyGroup.A), + new AssessmentSectionAssemblyGroupBoundaries(2.01, 3, AssessmentSectionAssemblyGroup.B), + new AssessmentSectionAssemblyGroupBoundaries(3.01, 4, AssessmentSectionAssemblyGroup.C) }); } } Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs =================================================================== diff -u -r7c4df1814ba33b8a593dba98313d54207e063a3c -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs (.../AssemblyCategoryGroupColorHelper.cs) (revision 7c4df1814ba33b8a593dba98313d54207e063a3c) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs (.../AssemblyCategoryGroupColorHelper.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -37,33 +37,33 @@ /// The category group to get the color for. /// The corresponding to the given category group. /// Thrown when - /// has an invalid value for . + /// has an invalid value for . /// Thrown when /// is not supported. - public static Color GetAssessmentSectionAssemblyCategoryGroupColor(AssessmentSectionAssemblyCategoryGroup assemblyCategoryGroup) + public static Color GetAssessmentSectionAssemblyCategoryGroupColor(AssessmentSectionAssemblyGroup assemblyCategoryGroup) { - if (!Enum.IsDefined(typeof(AssessmentSectionAssemblyCategoryGroup), assemblyCategoryGroup)) + if (!Enum.IsDefined(typeof(AssessmentSectionAssemblyGroup), assemblyCategoryGroup)) { throw new InvalidEnumArgumentException(nameof(assemblyCategoryGroup), (int) assemblyCategoryGroup, - typeof(AssessmentSectionAssemblyCategoryGroup)); + typeof(AssessmentSectionAssemblyGroup)); } switch (assemblyCategoryGroup) { - case AssessmentSectionAssemblyCategoryGroup.APlus: + case AssessmentSectionAssemblyGroup.APlus: return Color.FromArgb(0, 255, 0); - case AssessmentSectionAssemblyCategoryGroup.A: + case AssessmentSectionAssemblyGroup.A: return Color.FromArgb(118, 147, 60); - case AssessmentSectionAssemblyCategoryGroup.B: + case AssessmentSectionAssemblyGroup.B: return Color.FromArgb(255, 255, 0); - case AssessmentSectionAssemblyCategoryGroup.C: + case AssessmentSectionAssemblyGroup.C: return Color.FromArgb(255, 153, 0); - case AssessmentSectionAssemblyCategoryGroup.D: + case AssessmentSectionAssemblyGroup.D: return Color.FromArgb(255, 0, 0); - case AssessmentSectionAssemblyCategoryGroup.None: - case AssessmentSectionAssemblyCategoryGroup.NotApplicable: - case AssessmentSectionAssemblyCategoryGroup.NotAssessed: + case AssessmentSectionAssemblyGroup.None: + case AssessmentSectionAssemblyGroup.NotApplicable: + case AssessmentSectionAssemblyGroup.NotAssessed: return Color.White; default: throw new NotSupportedException(); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/AssemblyCategoryGroupColorHelperTest.cs =================================================================== diff -u -r7c4df1814ba33b8a593dba98313d54207e063a3c -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/AssemblyCategoryGroupColorHelperTest.cs (.../AssemblyCategoryGroupColorHelperTest.cs) (revision 7c4df1814ba33b8a593dba98313d54207e063a3c) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/AssemblyCategoryGroupColorHelperTest.cs (.../AssemblyCategoryGroupColorHelperTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -37,7 +37,7 @@ { // Call TestDelegate test = () => AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor( - (AssessmentSectionAssemblyCategoryGroup) 99); + (AssessmentSectionAssemblyGroup) 99); // Assert const string expectedMessage = "The value of argument 'assemblyCategoryGroup' (99) is invalid for Enum type 'AssessmentSectionAssemblyCategoryGroup'."; @@ -47,7 +47,7 @@ [Test] [TestCaseSource(typeof(AssemblyCategoryColorTestHelper), nameof(AssemblyCategoryColorTestHelper.AssessmentSectionAssemblyCategoryGroupColorCases))] public void GetAssessmentSectionAssemblyCategoryGroupColor_WithAssessmentSectionAssemblyCategoryGroup_ReturnsExpectedColor( - AssessmentSectionAssemblyCategoryGroup assemblyCategoryGroup, Color expectedColor) + AssessmentSectionAssemblyGroup assemblyCategoryGroup, Color expectedColor) { // Call Color color = AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(assemblyCategoryGroup); Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs =================================================================== diff -u -r7c4df1814ba33b8a593dba98313d54207e063a3c -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs (.../AssemblyCategoryColorTestHelper.cs) (revision 7c4df1814ba33b8a593dba98313d54207e063a3c) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs (.../AssemblyCategoryColorTestHelper.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -33,20 +33,20 @@ { /// /// Gets a collection of test cases to test the colors belonging to various - /// values. + /// values. /// public static IEnumerable AssessmentSectionAssemblyCategoryGroupColorCases { get { - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.APlus, Color.FromArgb(0, 255, 0)); - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.A, Color.FromArgb(118, 147, 60)); - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.B, Color.FromArgb(255, 255, 0)); - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.C, Color.FromArgb(255, 153, 0)); - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.D, Color.FromArgb(255, 0, 0)); - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.None, Color.White); - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.NotAssessed, Color.White); - yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.NotApplicable, Color.White); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.APlus, Color.FromArgb(0, 255, 0)); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.A, Color.FromArgb(118, 147, 60)); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.B, Color.FromArgb(255, 255, 0)); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.C, Color.FromArgb(255, 153, 0)); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.D, Color.FromArgb(255, 0, 0)); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.None, Color.White); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.NotAssessed, Color.White); + yield return new TestCaseData(AssessmentSectionAssemblyGroup.NotApplicable, Color.White); } } } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssessmentSectionAssemblyResultControl.cs =================================================================== diff -u -r7b3022d33fb2717787713f30e219a3135b6c3554 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssessmentSectionAssemblyResultControl.cs (.../AssessmentSectionAssemblyResultControl.cs) (revision 7b3022d33fb2717787713f30e219a3135b6c3554) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssessmentSectionAssemblyResultControl.cs (.../AssessmentSectionAssemblyResultControl.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -75,7 +75,7 @@ /// The to set on the control. /// Thrown when is null. /// Thrown when - /// has an invalid value for . + /// has an invalid value for . /// Thrown when /// is not supported. public void SetAssemblyResult(AssessmentSectionAssemblyResult result) @@ -85,7 +85,7 @@ throw new ArgumentNullException(nameof(result)); } - groupLabel.Text = new EnumDisplayWrapper(result.AssemblyCategoryGroup).DisplayName; + groupLabel.Text = new EnumDisplayWrapper(result.AssemblyCategoryGroup).DisplayName; groupLabel.BackColor = AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(result.AssemblyCategoryGroup); probabilityLabel.Text = ProbabilityFormattingHelper.FormatWithDiscreteNumbers(result.Probability); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.Designer.cs =================================================================== diff -u -r5d3fcfc76fcab0152f1b9046a4b0cdd84f08ba46 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.Designer.cs (.../AssessmentSectionAssemblyGroupsView.Designer.cs) (revision 5d3fcfc76fcab0152f1b9046a4b0cdd84f08ba46) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.Designer.cs (.../AssessmentSectionAssemblyGroupsView.Designer.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -40,7 +40,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AssessmentSectionAssemblyGroupsView)); - this.assemblyGroupsTable = new AssemblyGroupsTable(); + this.assemblyGroupsTable = new AssemblyGroupsTable(); this.SuspendLayout(); // // assessmentSectionAssemblyCategoriesTable @@ -62,6 +62,6 @@ #endregion - private AssemblyGroupsTable assemblyGroupsTable; + private AssemblyGroupsTable assemblyGroupsTable; } } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.cs =================================================================== diff -u -r6162725c271932d3746f0536a6f1abda1fa4dec3 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.cs (.../AssessmentSectionAssemblyGroupsView.cs) (revision 6162725c271932d3746f0536a6f1abda1fa4dec3) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.cs (.../AssessmentSectionAssemblyGroupsView.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -89,10 +89,10 @@ AssessmentSectionAssemblyGroupBoundariesFactory.CreateAssessmentSectionAssemblyGroupBoundaries( FailureMechanismContribution.SignalingNorm, FailureMechanismContribution.LowerLimitNorm) - .Select(category => new Tuple( - category, - AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(category.Group), - category.Group)).ToArray()); + .Select(group => new Tuple( + group, + AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(group.Group), + group.Group)).ToArray()); } } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableAssessmentSectionAssemblyResult.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableAssessmentSectionAssemblyResult.cs (.../ExportableAssessmentSectionAssemblyResult.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableAssessmentSectionAssemblyResult.cs (.../ExportableAssessmentSectionAssemblyResult.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -35,7 +35,7 @@ /// The method that was used to assemble this result. /// The assembly result. public ExportableAssessmentSectionAssemblyResult(ExportableAssemblyMethod assemblyMethod, - AssessmentSectionAssemblyCategoryGroup assemblyCategory) + AssessmentSectionAssemblyGroup assemblyCategory) { AssemblyMethod = assemblyMethod; AssemblyCategory = assemblyCategory; @@ -49,6 +49,6 @@ /// /// Gets the assembly category. /// - public AssessmentSectionAssemblyCategoryGroup AssemblyCategory { get; } + public AssessmentSectionAssemblyGroup AssemblyCategory { get; } } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssessmentSectionCategoryGroupCreator.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssessmentSectionCategoryGroupCreator.cs (.../SerializableAssessmentSectionCategoryGroupCreator.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssessmentSectionCategoryGroupCreator.cs (.../SerializableAssessmentSectionCategoryGroupCreator.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -41,28 +41,28 @@ /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - public static SerializableAssessmentSectionCategoryGroup Create(AssessmentSectionAssemblyCategoryGroup categoryGroup) + public static SerializableAssessmentSectionCategoryGroup Create(AssessmentSectionAssemblyGroup categoryGroup) { - if (!Enum.IsDefined(typeof(AssessmentSectionAssemblyCategoryGroup), categoryGroup)) + if (!Enum.IsDefined(typeof(AssessmentSectionAssemblyGroup), categoryGroup)) { throw new InvalidEnumArgumentException(nameof(categoryGroup), (int) categoryGroup, - typeof(AssessmentSectionAssemblyCategoryGroup)); + typeof(AssessmentSectionAssemblyGroup)); } switch (categoryGroup) { - case AssessmentSectionAssemblyCategoryGroup.NotAssessed: + case AssessmentSectionAssemblyGroup.NotAssessed: return SerializableAssessmentSectionCategoryGroup.NotAssessed; - case AssessmentSectionAssemblyCategoryGroup.APlus: + case AssessmentSectionAssemblyGroup.APlus: return SerializableAssessmentSectionCategoryGroup.APlus; - case AssessmentSectionAssemblyCategoryGroup.A: + case AssessmentSectionAssemblyGroup.A: return SerializableAssessmentSectionCategoryGroup.A; - case AssessmentSectionAssemblyCategoryGroup.B: + case AssessmentSectionAssemblyGroup.B: return SerializableAssessmentSectionCategoryGroup.B; - case AssessmentSectionAssemblyCategoryGroup.C: + case AssessmentSectionAssemblyGroup.C: return SerializableAssessmentSectionCategoryGroup.C; - case AssessmentSectionAssemblyCategoryGroup.D: + case AssessmentSectionAssemblyGroup.D: return SerializableAssessmentSectionCategoryGroup.D; default: throw new NotSupportedException(); Index: Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/AssemblyExporter.cs =================================================================== diff -u -r392a294fe943895657d19f2534b66770ae258d25 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/AssemblyExporter.cs (.../AssemblyExporter.cs) (revision 392a294fe943895657d19f2534b66770ae258d25) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/AssemblyExporter.cs (.../AssemblyExporter.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -108,8 +108,8 @@ private static bool ValidateExportableAssessmentSection(ExportableAssessmentSection exportableAssessmentSection) { return exportableAssessmentSection != null - && exportableAssessmentSection.AssessmentSectionAssembly.AssemblyCategory != AssessmentSectionAssemblyCategoryGroup.None - && exportableAssessmentSection.AssessmentSectionAssembly.AssemblyCategory != AssessmentSectionAssemblyCategoryGroup.NotApplicable; + && exportableAssessmentSection.AssessmentSectionAssembly.AssemblyCategory != AssessmentSectionAssemblyGroup.None + && exportableAssessmentSection.AssessmentSectionAssembly.AssemblyCategory != AssessmentSectionAssemblyGroup.NotApplicable; } private static void LogErrorMessage() Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs =================================================================== diff -u -r31caffb05afa347ddcfa184d56f2e5eb97237ad6 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision 31caffb05afa347ddcfa184d56f2e5eb97237ad6) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -72,7 +72,7 @@ private static ExportableAssessmentSectionAssemblyResult CreateExportableAssessmentSectionAssemblyResult() { return new ExportableAssessmentSectionAssemblyResult(ExportableAssemblyMethod.WBI2C1, - AssessmentSectionAssemblyCategoryGroup.None); + AssessmentSectionAssemblyGroup.None); } /// Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Controls/AssessmentSectionAssemblyResultControlTest.cs =================================================================== diff -u -rd1a4ced1ed81f9b2866481821abef7c54fff37b3 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Controls/AssessmentSectionAssemblyResultControlTest.cs (.../AssessmentSectionAssemblyResultControlTest.cs) (revision d1a4ced1ed81f9b2866481821abef7c54fff37b3) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Controls/AssessmentSectionAssemblyResultControlTest.cs (.../AssessmentSectionAssemblyResultControlTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -110,7 +110,7 @@ // Setup var random = new Random(39); var result = new AssessmentSectionAssemblyResult(random.NextDouble(), - random.NextEnumValue()); + random.NextEnumValue()); using (var resultControl = new AssessmentSectionAssemblyResultControl()) { // Call @@ -134,7 +134,7 @@ using (var resultControl = new AssessmentSectionAssemblyResultControl()) { var result = new AssessmentSectionAssemblyResult(random.NextDouble(), - random.NextEnumValue()); + random.NextEnumValue()); resultControl.SetAssemblyResult(result); // Precondition @@ -218,9 +218,9 @@ } } - private static void AssertGroupLabel(AssessmentSectionAssemblyCategoryGroup result, BorderedLabel groupLabel) + private static void AssertGroupLabel(AssessmentSectionAssemblyGroup result, BorderedLabel groupLabel) { - Assert.AreEqual(new EnumDisplayWrapper(result).DisplayName, + Assert.AreEqual(new EnumDisplayWrapper(result).DisplayName, groupLabel.Text); Assert.AreEqual(AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(result), groupLabel.BackColor); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -rc975510c82744319cf957dc0018d7abb847ae95b -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision c975510c82744319cf957dc0018d7abb847ae95b) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -207,7 +207,7 @@ // When var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; - calculator.AssessmentSectionAssemblyResult = new AssessmentSectionAssemblyResult(0.5, AssessmentSectionAssemblyCategoryGroup.A); + calculator.AssessmentSectionAssemblyResult = new AssessmentSectionAssemblyResult(0.5, AssessmentSectionAssemblyGroup.A); buttonTester.Click(); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionAssemblyGroupsViewTest.cs =================================================================== diff -u -r7aa1bffd4b5b93ea029f87d6ac826cc1658d7b65 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionAssemblyGroupsViewTest.cs (.../AssessmentSectionAssemblyGroupsViewTest.cs) (revision 7aa1bffd4b5b93ea029f87d6ac826cc1658d7b65) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionAssemblyGroupsViewTest.cs (.../AssessmentSectionAssemblyGroupsViewTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -69,7 +69,7 @@ Assert.AreEqual(1, view.Controls.Count); Assert.AreSame(failureMechanismContribution, view.FailureMechanismContribution); - AssemblyGroupsTable tableControl = GetCategoriesTable(view); + AssemblyGroupsTable tableControl = GetCategoriesTable(view); Assert.AreEqual(DockStyle.Fill, tableControl.Dock); var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; @@ -98,7 +98,7 @@ var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; AssessmentSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator; - AssemblyGroupsTable groupsTable = GetCategoriesTable(view); + AssemblyGroupsTable groupsTable = GetCategoriesTable(view); // Precondition Assert.AreEqual(calculator.AssessmentSectionAssemblyGroupBoundariesOutput.Count(), groupsTable.Rows.Count); @@ -108,7 +108,7 @@ { new AssessmentSectionAssemblyGroupBoundaries(random.NextDouble(), random.NextDouble(), - random.NextEnumValue()) + random.NextEnumValue()) }; calculator.AssessmentSectionAssemblyGroupBoundariesOutput = newOutput; failureMechanismContribution.NotifyObservers(); @@ -120,9 +120,9 @@ mocks.VerifyAll(); } - private static AssemblyGroupsTable GetCategoriesTable(AssessmentSectionAssemblyGroupsView view) + private static AssemblyGroupsTable GetCategoriesTable(AssessmentSectionAssemblyGroupsView view) { - return ControlTestHelper.GetControls>( + return ControlTestHelper.GetControls>( view, "assemblyGroupsTable").Single(); } } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableAssessmentSectionAssemblyResultTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableAssessmentSectionAssemblyResultTest.cs (.../ExportableAssessmentSectionAssemblyResultTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableAssessmentSectionAssemblyResultTest.cs (.../ExportableAssessmentSectionAssemblyResultTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -36,7 +36,7 @@ // Setup var random = new Random(21); var assemblyMethod = random.NextEnumValue(); - var category = random.NextEnumValue(); + var category = random.NextEnumValue(); // Call var assembly = new ExportableAssessmentSectionAssemblyResult(assemblyMethod, category); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyResultCreatorTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyResultCreatorTest.cs (.../SerializableAssessmentSectionAssemblyResultCreatorTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyResultCreatorTest.cs (.../SerializableAssessmentSectionAssemblyResultCreatorTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -51,11 +51,11 @@ var result = new ExportableAssessmentSectionAssemblyResult(random.NextEnumValue(), random.NextEnumValue(new[] { - AssessmentSectionAssemblyCategoryGroup.NotAssessed, - AssessmentSectionAssemblyCategoryGroup.A, - AssessmentSectionAssemblyCategoryGroup.B, - AssessmentSectionAssemblyCategoryGroup.C, - AssessmentSectionAssemblyCategoryGroup.D + AssessmentSectionAssemblyGroup.NotAssessed, + AssessmentSectionAssemblyGroup.A, + AssessmentSectionAssemblyGroup.B, + AssessmentSectionAssemblyGroup.C, + AssessmentSectionAssemblyGroup.D })); // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs =================================================================== diff -u -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs (.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs) (revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs (.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -36,20 +36,20 @@ public void Create_InvalidAssessmentSectionAssemblyCategoryGroup_ThrowInvalidEnumArgumentException() { // Setup - const AssessmentSectionAssemblyCategoryGroup groupInput = (AssessmentSectionAssemblyCategoryGroup) 999; + const AssessmentSectionAssemblyGroup groupInput = (AssessmentSectionAssemblyGroup) 999; // Call TestDelegate call = () => SerializableAssessmentSectionCategoryGroupCreator.Create(groupInput); // Assert - string message = $"The value of argument 'categoryGroup' ({groupInput}) is invalid for Enum type '{nameof(AssessmentSectionAssemblyCategoryGroup)}'."; + string message = $"The value of argument 'categoryGroup' ({groupInput}) is invalid for Enum type '{nameof(AssessmentSectionAssemblyGroup)}'."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, message); } [Test] - [TestCase(AssessmentSectionAssemblyCategoryGroup.None)] - [TestCase(AssessmentSectionAssemblyCategoryGroup.NotApplicable)] - public void Create_WithNotSupportedInvalidCategoryGroup_ThrowsNotSupportedException(AssessmentSectionAssemblyCategoryGroup notSupportedCategoryGroup) + [TestCase(AssessmentSectionAssemblyGroup.None)] + [TestCase(AssessmentSectionAssemblyGroup.NotApplicable)] + public void Create_WithNotSupportedInvalidCategoryGroup_ThrowsNotSupportedException(AssessmentSectionAssemblyGroup notSupportedCategoryGroup) { // Call TestDelegate call = () => SerializableAssessmentSectionCategoryGroupCreator.Create(notSupportedCategoryGroup); @@ -59,13 +59,13 @@ } [Test] - [TestCase(AssessmentSectionAssemblyCategoryGroup.APlus, SerializableAssessmentSectionCategoryGroup.APlus)] - [TestCase(AssessmentSectionAssemblyCategoryGroup.A, SerializableAssessmentSectionCategoryGroup.A)] - [TestCase(AssessmentSectionAssemblyCategoryGroup.B, SerializableAssessmentSectionCategoryGroup.B)] - [TestCase(AssessmentSectionAssemblyCategoryGroup.C, SerializableAssessmentSectionCategoryGroup.C)] - [TestCase(AssessmentSectionAssemblyCategoryGroup.D, SerializableAssessmentSectionCategoryGroup.D)] - [TestCase(AssessmentSectionAssemblyCategoryGroup.NotAssessed, SerializableAssessmentSectionCategoryGroup.NotAssessed)] - public void Create_WithValidAssessmentSectionAssemblyCategoryGroup_ReturnExpectedValues(AssessmentSectionAssemblyCategoryGroup categoryGroup, + [TestCase(AssessmentSectionAssemblyGroup.APlus, SerializableAssessmentSectionCategoryGroup.APlus)] + [TestCase(AssessmentSectionAssemblyGroup.A, SerializableAssessmentSectionCategoryGroup.A)] + [TestCase(AssessmentSectionAssemblyGroup.B, SerializableAssessmentSectionCategoryGroup.B)] + [TestCase(AssessmentSectionAssemblyGroup.C, SerializableAssessmentSectionCategoryGroup.C)] + [TestCase(AssessmentSectionAssemblyGroup.D, SerializableAssessmentSectionCategoryGroup.D)] + [TestCase(AssessmentSectionAssemblyGroup.NotAssessed, SerializableAssessmentSectionCategoryGroup.NotAssessed)] + public void Create_WithValidAssessmentSectionAssemblyCategoryGroup_ReturnExpectedValues(AssessmentSectionAssemblyGroup categoryGroup, SerializableAssessmentSectionCategoryGroup expectedGroup) { // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -rdc9211089959e02aeea2ab96d684fb3fa731dd15 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision dc9211089959e02aeea2ab96d684fb3fa731dd15) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -104,7 +104,7 @@ Assert.AreEqual(assemblyCategoryGroup, failureMechanismAssemblyWithoutProbability.AssemblyCategory); ExportableAssessmentSectionAssemblyResult exportableAssessmentSectionAssemblyResult = exportableAssessmentSection.AssessmentSectionAssembly; - Assert.AreEqual(AssessmentSectionAssemblyCategoryGroup.None, exportableAssessmentSectionAssemblyResult.AssemblyCategory); + Assert.AreEqual(AssessmentSectionAssemblyGroup.None, exportableAssessmentSectionAssemblyResult.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI2C1, exportableAssessmentSectionAssemblyResult.AssemblyMethod); AssertExportableFailureMechanismsWithProbability(exportableAssessmentSection.FailureMechanismsWithProbability, Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableAssessmentSectionAssemblyResultTestFactory.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 --- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableAssessmentSectionAssemblyResultTestFactory.cs (.../ExportableAssessmentSectionAssemblyResultTestFactory.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableAssessmentSectionAssemblyResultTestFactory.cs (.../ExportableAssessmentSectionAssemblyResultTestFactory.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) @@ -37,7 +37,7 @@ public static ExportableAssessmentSectionAssemblyResult CreateResult() { return new ExportableAssessmentSectionAssemblyResult(ExportableAssemblyMethod.WBI2C1, - AssessmentSectionAssemblyCategoryGroup.C); + AssessmentSectionAssemblyGroup.C); } } } \ No newline at end of file