Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs (.../AssemblyXmlIdentifiers.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs (.../AssemblyXmlIdentifiers.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -85,7 +85,7 @@ /// /// Identifier for an assessment section category group element. /// - public const string AssessmentSectionCategoryGroup = "categorie"; + public const string AssessmentSectionAssemblyGroup = "categorie"; /// /// Identifier for an assessment section ID reference attribute. Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableAssessmentSectionAssemblyResult.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableAssessmentSectionAssemblyResult.cs (.../SerializableAssessmentSectionAssemblyResult.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableAssessmentSectionAssemblyResult.cs (.../SerializableAssessmentSectionAssemblyResult.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -42,11 +42,11 @@ /// Creates a new instance of . /// /// The method used to assemble this result. - /// The category group of this assembly result. + /// The group of this assembly result. public SerializableAssessmentSectionAssemblyResult(SerializableAssemblyMethod assemblyMethod, - SerializableAssessmentSectionCategoryGroup categoryGroup) : this() + SerializableAssessmentSectionGroup group) : this() { - CategoryGroup = categoryGroup; + Group = group; AssemblyMethod = assemblyMethod; } @@ -57,10 +57,10 @@ public SerializableAssemblyMethod AssemblyMethod { get; set; } /// - /// Gets or sets the category group of this assembly result. + /// Gets or sets the group of this assembly result. /// - [XmlElement(AssemblyXmlIdentifiers.AssessmentSectionCategoryGroup)] - public SerializableAssessmentSectionCategoryGroup CategoryGroup { get; set; } + [XmlElement(AssemblyXmlIdentifiers.AssessmentSectionAssemblyGroup)] + public SerializableAssessmentSectionGroup Group { get; set; } /// /// Gets or sets the status of this assembly result. Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs =================================================================== diff -u -rd37e5e5803205e86205bea9334df76e908a48eff -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs (.../AssemblyXmlEnumIdentifiers.cs) (revision d37e5e5803205e86205bea9334df76e908a48eff) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs (.../AssemblyXmlEnumIdentifiers.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -113,34 +113,34 @@ #region SerializableAssessmentSectionCategoryGroup /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssessmentSectionCategoryGroupAPlus = "A+"; + public const string SerializableAssessmentSectionGroupAPlus = "A+"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssessmentSectionCategoryGroupA = "A"; + public const string SerializableAssessmentSectionGroupA = "A"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssessmentSectionCategoryGroupB = "B"; + public const string SerializableAssessmentSectionGroupB = "B"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssessmentSectionCategoryGroupC = "C"; + public const string SerializableAssessmentSectionGroupC = "C"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssessmentSectionCategoryGroupD = "D"; + public const string SerializableAssessmentSectionGroupD = "D"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssessmentSectionCategoryGroupNotAssessed = "NGO"; + public const string SerializableAssessmentSectionGroupNotAssessed = "NGO"; #endregion Fisheye: Tag dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableAssessmentSectionCategoryGroup.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableAssessmentSectionGroup.cs =================================================================== diff -u --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableAssessmentSectionGroup.cs (revision 0) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableAssessmentSectionGroup.cs (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -0,0 +1,67 @@ +// 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 System.Xml.Serialization; + +namespace Riskeer.AssemblyTool.IO.Model.Enums +{ + /// + /// Serializable enum defining the assembly groups for an assessment section. + /// + public enum SerializableAssessmentSectionGroup + { + /// + /// Represents the assembly group A+. + /// + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupAPlus)] + APlus = 1, + + /// + /// Represents the assembly group A. + /// + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupA)] + A = 2, + + /// + /// Represents the assembly group B. + /// + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupB)] + B = 3, + + /// + /// Represents the assembly group C. + /// + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupC)] + C = 4, + + /// + /// Represents the assembly group D. + /// + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupD)] + D = 5, + + /// + /// Represents the assembly group NGO (Not assessed). + /// + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupNotAssessed)] + NotAssessed = 6 + } +} \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -41,7 +41,7 @@ Assert.AreEqual("BeoordelingsprocesID", AssemblyXmlIdentifiers.AssessmentProcessId); Assert.AreEqual("BeoordelingsprocesIDRef", AssemblyXmlIdentifiers.AssessmentProcessIdRef); Assert.AreEqual("veiligheidsoordeel", AssemblyXmlIdentifiers.AssessmentSectionAssemblyResult); - Assert.AreEqual("categorie", AssemblyXmlIdentifiers.AssessmentSectionCategoryGroup); + Assert.AreEqual("categorie", AssemblyXmlIdentifiers.AssessmentSectionAssemblyGroup); Assert.AreEqual("WaterkeringstelselIDRef", AssemblyXmlIdentifiers.AssessmentSectionIdRef); Assert.AreEqual("typeWaterkeringstelsel", AssemblyXmlIdentifiers.AssessmentSectionType); Assert.AreEqual("Waterkeringstelsel", AssemblyXmlIdentifiers.AssessmentSection); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableAssessmentSectionAssemblyResultTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableAssessmentSectionAssemblyResultTest.cs (.../SerializableAssessmentSectionAssemblyResultTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableAssessmentSectionAssemblyResultTest.cs (.../SerializableAssessmentSectionAssemblyResultTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -39,13 +39,13 @@ // Assert Assert.AreEqual((SerializableAssemblyMethod) 0, assemblyResult.AssemblyMethod); - Assert.AreEqual((SerializableAssessmentSectionCategoryGroup) 0, assemblyResult.CategoryGroup); + Assert.AreEqual((SerializableAssessmentSectionGroup) 0, assemblyResult.Group); Assert.AreEqual("VOLLDG", assemblyResult.Status); SerializableAttributeTestHelper.AssertXmlElementAttribute( nameof(SerializableAssessmentSectionAssemblyResult.AssemblyMethod), "assemblagemethode"); SerializableAttributeTestHelper.AssertXmlElementAttribute( - nameof(SerializableAssessmentSectionAssemblyResult.CategoryGroup), "categorie"); + nameof(SerializableAssessmentSectionAssemblyResult.Group), "categorie"); SerializableAttributeTestHelper.AssertXmlElementAttribute( nameof(SerializableAssessmentSectionAssemblyResult.Status), "status"); } @@ -55,14 +55,14 @@ { // Setup var random = new Random(39); - var category = random.NextEnumValue(); + var category = random.NextEnumValue(); var assemblyMethod = random.NextEnumValue(); // Call var assemblyResult = new SerializableAssessmentSectionAssemblyResult(assemblyMethod, category); // Assert - Assert.AreEqual(category, assemblyResult.CategoryGroup); + Assert.AreEqual(category, assemblyResult.Group); Assert.AreEqual(assemblyMethod, assemblyResult.AssemblyMethod); Assert.AreEqual("VOLLDG", assemblyResult.Status); } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs =================================================================== diff -u -rd37e5e5803205e86205bea9334df76e908a48eff -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs (.../AssemblyXmlEnumIdentifiersTest.cs) (revision d37e5e5803205e86205bea9334df76e908a48eff) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs (.../AssemblyXmlEnumIdentifiersTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -48,12 +48,12 @@ Assert.AreEqual("VI-vak", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionCategoryGroupVIv); Assert.AreEqual("VII-vak", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionCategoryGroupVIIv); - Assert.AreEqual("A+", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionCategoryGroupAPlus); - Assert.AreEqual("A", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionCategoryGroupA); - Assert.AreEqual("B", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionCategoryGroupB); - Assert.AreEqual("C", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionCategoryGroupC); - Assert.AreEqual("D", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionCategoryGroupD); - Assert.AreEqual("NGO", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionCategoryGroupNotAssessed); + Assert.AreEqual("A+", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupAPlus); + Assert.AreEqual("A", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupA); + Assert.AreEqual("B", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupB); + Assert.AreEqual("C", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupC); + Assert.AreEqual("D", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupD); + Assert.AreEqual("NGO", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionGroupNotAssessed); Assert.AreEqual("WBI-0E-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI0E1); Assert.AreEqual("WBI-0E-3", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI0E3); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableAssessmentSectionCategoryGroupTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableAssessmentSectionCategoryGroupTest.cs (.../SerializableAssessmentSectionCategoryGroupTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableAssessmentSectionCategoryGroupTest.cs (.../SerializableAssessmentSectionCategoryGroupTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -27,59 +27,59 @@ namespace Riskeer.AssemblyTool.IO.Test.Model.Enums { [TestFixture] - public class SerializableAssessmentSectionCategoryGroupTest : EnumWithXmlEnumNameTestFixture + public class SerializableAssessmentSectionCategoryGroupTest : EnumWithXmlEnumNameTestFixture { - protected override IDictionary ExpectedValueForEnumValues + protected override IDictionary ExpectedValueForEnumValues { get { - return new Dictionary + return new Dictionary { { - SerializableAssessmentSectionCategoryGroup.APlus, 1 + SerializableAssessmentSectionGroup.APlus, 1 }, { - SerializableAssessmentSectionCategoryGroup.A, 2 + SerializableAssessmentSectionGroup.A, 2 }, { - SerializableAssessmentSectionCategoryGroup.B, 3 + SerializableAssessmentSectionGroup.B, 3 }, { - SerializableAssessmentSectionCategoryGroup.C, 4 + SerializableAssessmentSectionGroup.C, 4 }, { - SerializableAssessmentSectionCategoryGroup.D, 5 + SerializableAssessmentSectionGroup.D, 5 }, { - SerializableAssessmentSectionCategoryGroup.NotAssessed, 6 + SerializableAssessmentSectionGroup.NotAssessed, 6 } }; } } - protected override IDictionary ExpectedDisplayNameForEnumValues + protected override IDictionary ExpectedDisplayNameForEnumValues { get { - return new Dictionary + return new Dictionary { { - SerializableAssessmentSectionCategoryGroup.APlus, "A+" + SerializableAssessmentSectionGroup.APlus, "A+" }, { - SerializableAssessmentSectionCategoryGroup.A, "A" + SerializableAssessmentSectionGroup.A, "A" }, { - SerializableAssessmentSectionCategoryGroup.B, "B" + SerializableAssessmentSectionGroup.B, "B" }, { - SerializableAssessmentSectionCategoryGroup.C, "C" + SerializableAssessmentSectionGroup.C, "C" }, { - SerializableAssessmentSectionCategoryGroup.D, "D" + SerializableAssessmentSectionGroup.D, "D" }, { - SerializableAssessmentSectionCategoryGroup.NotAssessed, "NGO" + SerializableAssessmentSectionGroup.NotAssessed, "NGO" } }; } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs =================================================================== diff -u -rc102d66218b0d87133f912bae031908c1c3129db -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision c102d66218b0d87133f912bae031908c1c3129db) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -278,7 +278,7 @@ assessmentProcess, new SerializableFailureMechanismAssemblyResult(SerializableAssemblyMethod.WBI2B1, SerializableFailureMechanismCategoryGroup.IIt), new SerializableFailureMechanismAssemblyResult(SerializableAssemblyMethod.WBI3C1, SerializableFailureMechanismCategoryGroup.NotApplicable, 0.000124), - new SerializableAssessmentSectionAssemblyResult(SerializableAssemblyMethod.WBI2C1, SerializableAssessmentSectionCategoryGroup.B)); + new SerializableAssessmentSectionAssemblyResult(SerializableAssemblyMethod.WBI2C1, SerializableAssessmentSectionGroup.B)); var failureMechanism = new SerializableFailureMechanism( "toetsspoorGABI", Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssessmentSectionCategoryGroupCreator.cs =================================================================== diff -u -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssessmentSectionCategoryGroupCreator.cs (.../SerializableAssessmentSectionCategoryGroupCreator.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssessmentSectionCategoryGroupCreator.cs (.../SerializableAssessmentSectionCategoryGroupCreator.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -27,7 +27,7 @@ namespace Riskeer.Integration.IO.Creators { /// - /// Creator to create . + /// Creator to create . /// public static class SerializableAssessmentSectionCategoryGroupCreator { @@ -41,7 +41,7 @@ /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - public static SerializableAssessmentSectionCategoryGroup Create(AssessmentSectionAssemblyGroup categoryGroup) + public static SerializableAssessmentSectionGroup Create(AssessmentSectionAssemblyGroup categoryGroup) { if (!Enum.IsDefined(typeof(AssessmentSectionAssemblyGroup), categoryGroup)) { @@ -53,17 +53,17 @@ switch (categoryGroup) { case AssessmentSectionAssemblyGroup.NotAssessed: - return SerializableAssessmentSectionCategoryGroup.NotAssessed; + return SerializableAssessmentSectionGroup.NotAssessed; case AssessmentSectionAssemblyGroup.APlus: - return SerializableAssessmentSectionCategoryGroup.APlus; + return SerializableAssessmentSectionGroup.APlus; case AssessmentSectionAssemblyGroup.A: - return SerializableAssessmentSectionCategoryGroup.A; + return SerializableAssessmentSectionGroup.A; case AssessmentSectionAssemblyGroup.B: - return SerializableAssessmentSectionCategoryGroup.B; + return SerializableAssessmentSectionGroup.B; case AssessmentSectionAssemblyGroup.C: - return SerializableAssessmentSectionCategoryGroup.C; + return SerializableAssessmentSectionGroup.C; case AssessmentSectionAssemblyGroup.D: - return SerializableAssessmentSectionCategoryGroup.D; + return SerializableAssessmentSectionGroup.D; default: throw new NotSupportedException(); } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -286,7 +286,7 @@ Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedAssessmentSectionAssemblyResult.AssemblyMethod), serializableAssessmentSectionAssemblyResult.AssemblyMethod); Assert.AreEqual(SerializableAssessmentSectionCategoryGroupCreator.Create(expectedAssessmentSectionAssemblyResult.AssemblyCategory), - serializableAssessmentSectionAssemblyResult.CategoryGroup); + serializableAssessmentSectionAssemblyResult.Group); } private static void AssertSerializableFailureMechanismSection(string expectedId, Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyResultCreatorTest.cs =================================================================== diff -u -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyResultCreatorTest.cs (.../SerializableAssessmentSectionAssemblyResultCreatorTest.cs) (revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionAssemblyResultCreatorTest.cs (.../SerializableAssessmentSectionAssemblyResultCreatorTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -66,7 +66,7 @@ Assert.AreEqual(SerializableAssemblyMethodCreator.Create(result.AssemblyMethod), serializableResult.AssemblyMethod); Assert.AreEqual(SerializableAssessmentSectionCategoryGroupCreator.Create(result.AssemblyCategory), - serializableResult.CategoryGroup); + serializableResult.Group); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs =================================================================== diff -u -r132e63ecfbb509b83e15f0f466b0d6e16f283c6d -rdd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs (.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs) (revision 132e63ecfbb509b83e15f0f466b0d6e16f283c6d) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs (.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs) (revision dd9b5820d9e0d87c2f0b0eef0b02ca88de51f6a1) @@ -59,17 +59,17 @@ } [Test] - [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)] + [TestCase(AssessmentSectionAssemblyGroup.APlus, SerializableAssessmentSectionGroup.APlus)] + [TestCase(AssessmentSectionAssemblyGroup.A, SerializableAssessmentSectionGroup.A)] + [TestCase(AssessmentSectionAssemblyGroup.B, SerializableAssessmentSectionGroup.B)] + [TestCase(AssessmentSectionAssemblyGroup.C, SerializableAssessmentSectionGroup.C)] + [TestCase(AssessmentSectionAssemblyGroup.D, SerializableAssessmentSectionGroup.D)] + [TestCase(AssessmentSectionAssemblyGroup.NotAssessed, SerializableAssessmentSectionGroup.NotAssessed)] public void Create_WithValidAssessmentSectionAssemblyGroup_ReturnExpectedValues(AssessmentSectionAssemblyGroup group, - SerializableAssessmentSectionCategoryGroup expectedGroup) + SerializableAssessmentSectionGroup expectedGroup) { // Call - SerializableAssessmentSectionCategoryGroup serializableGroup = SerializableAssessmentSectionCategoryGroupCreator.Create(group); + SerializableAssessmentSectionGroup serializableGroup = SerializableAssessmentSectionCategoryGroupCreator.Create(group); // Assert Assert.AreEqual(expectedGroup, serializableGroup);