Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs =================================================================== diff -u -r9a74e582accc7364423a32cc2c0135f303c7cc5b -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs (.../AssessmentSectionAssemblyGroup.cs) (revision 9a74e582accc7364423a32cc2c0135f303c7cc5b) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs (.../AssessmentSectionAssemblyGroup.cs) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -30,51 +30,33 @@ public enum AssessmentSectionAssemblyGroup { /// - /// Represents group GR (No result). - /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_None_DisplayName))] - None = 1, - - /// - /// Represents group NVT (Not applicable). - /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_Empty_DisplayName))] - NotApplicable = 2, - - /// - /// Represents group NGO (Not assessed). - /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_NotAssessed_DisplayName))] - NotAssessed = 3, - - /// /// Represents group A+. /// [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_APlus_DisplayName))] - APlus = 4, + APlus = 1, /// /// Represents group A. /// [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_A_DisplayName))] - A = 5, + A = 2, /// /// Represents group B. /// [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_B_DisplayName))] - B = 6, + B = 3, /// /// Represents group C. /// [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_C_DisplayName))] - C = 7, + C = 4, /// /// Represents group D. /// [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_D_DisplayName))] - D = 8 + D = 5 } } \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r6b0a96491d3989c47a96d80ee5518adda10a29e8 -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6b0a96491d3989c47a96d80ee5518adda10a29e8) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -127,33 +127,6 @@ } /// - /// Looks up a localized string similar to -. - /// - internal static string AssessmentSectionAssemblyGroup_Empty_DisplayName { - get { - return ResourceManager.GetString("AssessmentSectionAssemblyGroup_Empty_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to . - /// - internal static string AssessmentSectionAssemblyGroup_None_DisplayName { - get { - return ResourceManager.GetString("AssessmentSectionAssemblyGroup_None_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to NGO. - /// - internal static string AssessmentSectionAssemblyGroup_NotAssessed_DisplayName { - get { - return ResourceManager.GetString("AssessmentSectionAssemblyGroup_NotAssessed_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to D. /// internal static string FailureMechanismSectionAssemblyGroup_Dominant_DisplayName { Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx =================================================================== diff -u -r6b0a96491d3989c47a96d80ee5518adda10a29e8 -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision 6b0a96491d3989c47a96d80ee5518adda10a29e8) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -132,15 +132,6 @@ D - - - - - - NGO - - - - ND Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyGroupTest.cs =================================================================== diff -u -r6b5adbc497684ca76ac228a263f0d4717b80f0c1 -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyGroupTest.cs (.../AssessmentSectionAssemblyGroupTest.cs) (revision 6b5adbc497684ca76ac228a263f0d4717b80f0c1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyGroupTest.cs (.../AssessmentSectionAssemblyGroupTest.cs) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -28,72 +28,44 @@ [TestFixture] public class AssessmentSectionAssemblyGroupTest : EnumWithResourcesDisplayNameTestFixture { - protected override IDictionary ExpectedValueForEnumValues - { - get + protected override IDictionary ExpectedValueForEnumValues => + new Dictionary { - return new Dictionary { - { - AssessmentSectionAssemblyGroup.None, 1 - }, - { - AssessmentSectionAssemblyGroup.NotApplicable, 2 - }, - { - AssessmentSectionAssemblyGroup.NotAssessed, 3 - }, - { - AssessmentSectionAssemblyGroup.APlus, 4 - }, - { - AssessmentSectionAssemblyGroup.A, 5 - }, - { - AssessmentSectionAssemblyGroup.B, 6 - }, - { - AssessmentSectionAssemblyGroup.C, 7 - }, - { - AssessmentSectionAssemblyGroup.D, 8 - } - }; - } - } + AssessmentSectionAssemblyGroup.APlus, 1 + }, + { + AssessmentSectionAssemblyGroup.A, 2 + }, + { + AssessmentSectionAssemblyGroup.B, 3 + }, + { + AssessmentSectionAssemblyGroup.C, 4 + }, + { + AssessmentSectionAssemblyGroup.D, 5 + } + }; - protected override IDictionary ExpectedDisplayNameForEnumValues - { - get + protected override IDictionary ExpectedDisplayNameForEnumValues => + new Dictionary { - return new Dictionary { - { - AssessmentSectionAssemblyGroup.None, "" - }, - { - AssessmentSectionAssemblyGroup.APlus, "A+" - }, - { - AssessmentSectionAssemblyGroup.A, "A" - }, - { - AssessmentSectionAssemblyGroup.B, "B" - }, - { - AssessmentSectionAssemblyGroup.C, "C" - }, - { - AssessmentSectionAssemblyGroup.D, "D" - }, - { - AssessmentSectionAssemblyGroup.NotApplicable, "-" - }, - { - AssessmentSectionAssemblyGroup.NotAssessed, "NGO" - } - }; - } - } + AssessmentSectionAssemblyGroup.APlus, "A+" + }, + { + AssessmentSectionAssemblyGroup.A, "A" + }, + { + AssessmentSectionAssemblyGroup.B, "B" + }, + { + AssessmentSectionAssemblyGroup.C, "C" + }, + { + AssessmentSectionAssemblyGroup.D, "D" + } + }; } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssessmentSectionAssemblyGroupColorHelper.cs =================================================================== diff -u -r5c92c1b7301fef7753270ec2fde2f78af73ee48b -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssessmentSectionAssemblyGroupColorHelper.cs (.../AssessmentSectionAssemblyGroupColorHelper.cs) (revision 5c92c1b7301fef7753270ec2fde2f78af73ee48b) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/AssessmentSectionAssemblyGroupColorHelper.cs (.../AssessmentSectionAssemblyGroupColorHelper.cs) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -61,10 +61,6 @@ return Color.FromArgb(255, 153, 0); case AssessmentSectionAssemblyGroup.D: return Color.FromArgb(255, 0, 0); - case AssessmentSectionAssemblyGroup.None: - case AssessmentSectionAssemblyGroup.NotApplicable: - case AssessmentSectionAssemblyGroup.NotAssessed: - return Color.White; default: throw new NotSupportedException(); } Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssessmentSectionAssemblyGroupColorTestHelper.cs =================================================================== diff -u -r5c92c1b7301fef7753270ec2fde2f78af73ee48b -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssessmentSectionAssemblyGroupColorTestHelper.cs (.../AssessmentSectionAssemblyGroupColorTestHelper.cs) (revision 5c92c1b7301fef7753270ec2fde2f78af73ee48b) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/AssessmentSectionAssemblyGroupColorTestHelper.cs (.../AssessmentSectionAssemblyGroupColorTestHelper.cs) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -44,9 +44,6 @@ 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.IO/Exporters/AssemblyExporter.cs =================================================================== diff -u -rad2396baa4d9fd688cdb17c82628c77069e2937f -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/AssemblyExporter.cs (.../AssemblyExporter.cs) (revision ad2396baa4d9fd688cdb17c82628c77069e2937f) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/AssemblyExporter.cs (.../AssemblyExporter.cs) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -24,7 +24,6 @@ using Core.Common.IO.Exceptions; using Core.Common.Util; using log4net; -using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.IO; using Riskeer.Common.Data.Exceptions; using Riskeer.Integration.Data; @@ -107,9 +106,7 @@ private static bool ValidateExportableAssessmentSection(ExportableAssessmentSection exportableAssessmentSection) { - return exportableAssessmentSection != null - && exportableAssessmentSection.AssessmentSectionAssembly.AssemblyGroup != AssessmentSectionAssemblyGroup.None - && exportableAssessmentSection.AssessmentSectionAssembly.AssemblyGroup != AssessmentSectionAssemblyGroup.NotApplicable; + return exportableAssessmentSection != null; } private static void LogErrorMessage() Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyGroupCreatorTest.cs =================================================================== diff -u -rc49e1e75eee1c75f210f7bdf5b9590ca2e91022d -r495519de6bd7b9efd08771dd6bf1c96e272af9aa --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyGroupCreatorTest.cs (.../SerializableAssessmentSectionAssemblyGroupCreatorTest.cs) (revision c49e1e75eee1c75f210f7bdf5b9590ca2e91022d) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyGroupCreatorTest.cs (.../SerializableAssessmentSectionAssemblyGroupCreatorTest.cs) (revision 495519de6bd7b9efd08771dd6bf1c96e272af9aa) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.ComponentModel; using Core.Common.TestUtil; using NUnit.Framework; @@ -47,18 +46,6 @@ } [Test] - [TestCase(AssessmentSectionAssemblyGroup.None)] - [TestCase(AssessmentSectionAssemblyGroup.NotApplicable)] - public void Create_WithNotSupportedAssessmentSectionAssemblyGroup_ThrowsNotSupportedException(AssessmentSectionAssemblyGroup notSupportedGroup) - { - // Call - void Call() => SerializableAssessmentSectionAssemblyGroupCreator.Create(notSupportedGroup); - - // Assert - Assert.Throws(Call); - } - - [Test] [TestCase(AssessmentSectionAssemblyGroup.APlus, SerializableAssessmentSectionAssemblyGroup.APlus)] [TestCase(AssessmentSectionAssemblyGroup.A, SerializableAssessmentSectionAssemblyGroup.A)] [TestCase(AssessmentSectionAssemblyGroup.B, SerializableAssessmentSectionAssemblyGroup.B)]