Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r7c4df1814ba33b8a593dba98313d54207e063a3c --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs (.../AssemblyCategoryGroupColorHelper.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssemblyCategoryGroupColorHelper.cs (.../AssemblyCategoryGroupColorHelper.cs) (revision 7c4df1814ba33b8a593dba98313d54207e063a3c) @@ -69,87 +69,5 @@ throw new NotSupportedException(); } } - - /// - /// Gets the color for a failure mechanism section assembly category group. - /// - /// The category group to get the color for. - /// The corresponding to the given category group. - /// Thrown when - /// has an invalid value for . - /// Thrown when - /// is not supported. - public static Color GetFailureMechanismSectionAssemblyCategoryGroupColor(FailureMechanismSectionAssemblyCategoryGroup assemblyCategoryGroup) - { - if (!Enum.IsDefined(typeof(FailureMechanismSectionAssemblyCategoryGroup), assemblyCategoryGroup)) - { - throw new InvalidEnumArgumentException(nameof(assemblyCategoryGroup), - (int) assemblyCategoryGroup, - typeof(FailureMechanismSectionAssemblyCategoryGroup)); - } - - switch (assemblyCategoryGroup) - { - case FailureMechanismSectionAssemblyCategoryGroup.Iv: - return Color.FromArgb(0, 255, 0); - case FailureMechanismSectionAssemblyCategoryGroup.IIv: - return Color.FromArgb(118, 147, 60); - case FailureMechanismSectionAssemblyCategoryGroup.IIIv: - return Color.FromArgb(255, 255, 0); - case FailureMechanismSectionAssemblyCategoryGroup.IVv: - return Color.FromArgb(204, 192, 218); - case FailureMechanismSectionAssemblyCategoryGroup.Vv: - return Color.FromArgb(255, 153, 0); - case FailureMechanismSectionAssemblyCategoryGroup.VIv: - return Color.FromArgb(255, 0, 0); - case FailureMechanismSectionAssemblyCategoryGroup.VIIv: - case FailureMechanismSectionAssemblyCategoryGroup.None: - case FailureMechanismSectionAssemblyCategoryGroup.NotApplicable: - return Color.FromArgb(255, 255, 255); - default: - throw new NotSupportedException(); - } - } - - /// - /// Gets the color for a failure mechanism assembly category group. - /// - /// The category group to get the color for. - /// The corresponding to the given category group. - /// Thrown when - /// has an invalid value for . - /// Thrown when - /// is not supported. - public static Color GetFailureMechanismAssemblyCategoryGroupColor(FailureMechanismAssemblyCategoryGroup assemblyCategoryGroup) - { - if (!Enum.IsDefined(typeof(FailureMechanismAssemblyCategoryGroup), assemblyCategoryGroup)) - { - throw new InvalidEnumArgumentException(nameof(assemblyCategoryGroup), - (int) assemblyCategoryGroup, - typeof(FailureMechanismAssemblyCategoryGroup)); - } - - switch (assemblyCategoryGroup) - { - case FailureMechanismAssemblyCategoryGroup.It: - return Color.FromArgb(0, 255, 0); - case FailureMechanismAssemblyCategoryGroup.IIt: - return Color.FromArgb(118, 147, 60); - case FailureMechanismAssemblyCategoryGroup.IIIt: - return Color.FromArgb(255, 255, 0); - case FailureMechanismAssemblyCategoryGroup.IVt: - return Color.FromArgb(204, 192, 218); - case FailureMechanismAssemblyCategoryGroup.Vt: - return Color.FromArgb(255, 153, 0); - case FailureMechanismAssemblyCategoryGroup.VIt: - return Color.FromArgb(255, 0, 0); - case FailureMechanismAssemblyCategoryGroup.VIIt: - case FailureMechanismAssemblyCategoryGroup.None: - case FailureMechanismAssemblyCategoryGroup.NotApplicable: - return Color.FromArgb(255, 255, 255); - default: - throw new NotSupportedException(); - } - } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/AssemblyCategoryGroupColorHelperTest.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r7c4df1814ba33b8a593dba98313d54207e063a3c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/AssemblyCategoryGroupColorHelperTest.cs (.../AssemblyCategoryGroupColorHelperTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/AssemblyCategoryGroupColorHelperTest.cs (.../AssemblyCategoryGroupColorHelperTest.cs) (revision 7c4df1814ba33b8a593dba98313d54207e063a3c) @@ -33,30 +33,6 @@ public class AssemblyCategoryGroupColorHelperTest { [Test] - public void GetFailureMechanismSectionAssemblyCategoryGroupColor_WithInvalidFailureMechanismSectionAssemblyCategoryGroup_ThrowsInvalidEnumArgumentException() - { - // Call - TestDelegate test = () => AssemblyCategoryGroupColorHelper.GetFailureMechanismSectionAssemblyCategoryGroupColor( - (FailureMechanismSectionAssemblyCategoryGroup) 99); - - // Assert - const string expectedMessage = "The value of argument 'assemblyCategoryGroup' (99) is invalid for Enum type 'FailureMechanismSectionAssemblyCategoryGroup'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); - } - - [Test] - [TestCaseSource(typeof(AssemblyCategoryColorTestHelper), nameof(AssemblyCategoryColorTestHelper.FailureMechanismSectionAssemblyCategoryGroupColorCases))] - public void GetFailureMechanismSectionAssemblyCategoryGroupColor_WithFailureMechanismSectionAssemblyCategoryGroup_ReturnsExpectedColor( - FailureMechanismSectionAssemblyCategoryGroup assemblyCategoryGroup, Color expectedColor) - { - // Call - Color color = AssemblyCategoryGroupColorHelper.GetFailureMechanismSectionAssemblyCategoryGroupColor(assemblyCategoryGroup); - - // Assert - Assert.AreEqual(expectedColor, color); - } - - [Test] public void GetAssessmentSectionAssemblyCategoryGroupColor_WithInvalidAssessmentSectionAssemblyCategoryGroup_ThrowsInvalidEnumArgumentException() { // Call @@ -79,29 +55,5 @@ // Assert Assert.AreEqual(expectedColor, color); } - - [Test] - public void GetFailureMechanismAssemblyCategoryGroupColor_WithInvalidFailureMechanismSectionAssemblyCategoryGroup_ThrowsInvalidEnumArgumentException() - { - // Call - TestDelegate test = () => AssemblyCategoryGroupColorHelper.GetFailureMechanismAssemblyCategoryGroupColor( - (FailureMechanismAssemblyCategoryGroup) 99); - - // Assert - const string expectedMessage = "The value of argument 'assemblyCategoryGroup' (99) is invalid for Enum type 'FailureMechanismAssemblyCategoryGroup'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); - } - - [Test] - [TestCaseSource(typeof(AssemblyCategoryColorTestHelper), nameof(AssemblyCategoryColorTestHelper.FailureMechanismAssemblyCategoryGroupColorCases))] - public void GetFailureMechanismAssemblyCategoryGroupColor_WithFailureMechanismSectionAssemblyCategoryGroup_ReturnsExpectedColor( - FailureMechanismAssemblyCategoryGroup assemblyCategoryGroup, Color expectedColor) - { - // Call - Color color = AssemblyCategoryGroupColorHelper.GetFailureMechanismAssemblyCategoryGroupColor(assemblyCategoryGroup); - - // Assert - Assert.AreEqual(expectedColor, color); - } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r7c4df1814ba33b8a593dba98313d54207e063a3c --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs (.../AssemblyCategoryColorTestHelper.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssemblyCategoryColorTestHelper.cs (.../AssemblyCategoryColorTestHelper.cs) (revision 7c4df1814ba33b8a593dba98313d54207e063a3c) @@ -33,26 +33,6 @@ { /// /// Gets a collection of test cases to test the colors belonging to various - /// values. - /// - public static IEnumerable FailureMechanismSectionAssemblyCategoryGroupColorCases - { - get - { - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, Color.FromArgb(255, 255, 255)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.None, Color.FromArgb(255, 255, 255)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.Iv, Color.FromArgb(0, 255, 0)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.IIv, Color.FromArgb(118, 147, 60)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.IIIv, Color.FromArgb(255, 255, 0)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.IVv, Color.FromArgb(204, 192, 218)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.Vv, Color.FromArgb(255, 153, 0)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.VIv, Color.FromArgb(255, 0, 0)); - yield return new TestCaseData(FailureMechanismSectionAssemblyCategoryGroup.VIIv, Color.FromArgb(255, 255, 255)); - } - } - - /// - /// Gets a collection of test cases to test the colors belonging to various /// values. /// public static IEnumerable AssessmentSectionAssemblyCategoryGroupColorCases @@ -69,25 +49,5 @@ yield return new TestCaseData(AssessmentSectionAssemblyCategoryGroup.NotApplicable, Color.White); } } - - /// - /// Gets a collection of test cases to test the colors belong to various - /// values. - /// - public static IEnumerable FailureMechanismAssemblyCategoryGroupColorCases - { - get - { - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.NotApplicable, Color.FromArgb(255, 255, 255)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.None, Color.FromArgb(255, 255, 255)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.It, Color.FromArgb(0, 255, 0)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.IIt, Color.FromArgb(118, 147, 60)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.IIIt, Color.FromArgb(255, 255, 0)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.IVt, Color.FromArgb(204, 192, 218)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.Vt, Color.FromArgb(255, 153, 0)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.VIt, Color.FromArgb(255, 0, 0)); - yield return new TestCaseData(FailureMechanismAssemblyCategoryGroup.VIIt, Color.FromArgb(255, 255, 255)); - } - } } } \ No newline at end of file