Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs =================================================================== diff -u -reb950e6a1d087f488fdf31962a3d6175d1a71fc6 -rc70b456800bddb4bb2952abeb592a3f4368490dd --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResult.cs) (revision eb950e6a1d087f488fdf31962a3d6175d1a71fc6) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResult.cs) (revision c70b456800bddb4bb2952abeb592a3f4368490dd) @@ -43,17 +43,18 @@ /// /// The method used to assemble this result. /// The type of the failure mechanism. - /// The generic failure mechanism code this result is assembled for. + /// The code of the failure mechanism this result is assembled for. + /// The name of the failure mechanism this result is assembled for. /// The group of this assembly result. public SerializableCombinedFailureMechanismSectionAssemblyResult( SerializableAssemblyMethod assemblyMethod, SerializableFailureMechanismType failureMechanismType, - string code, SerializableFailureMechanismSectionAssemblyGroup assemblyGroup) + string code, string name, SerializableFailureMechanismSectionAssemblyGroup assemblyGroup) : this() { AssemblyMethod = assemblyMethod; FailureMechanismType = failureMechanismType; GenericFailureMechanismCode = code; - SpecificFailureMechanismName = code; + SpecificFailureMechanismName = name; AssemblyGroup = assemblyGroup; } @@ -70,13 +71,13 @@ public SerializableFailureMechanismType FailureMechanismType { get; set; } /// - /// Gets or sets the generic failure mechanism code of this assembly result. + /// Gets or sets the code of the failure mechanism this result is assembled for. /// [XmlElement(AssemblyXmlIdentifiers.GenericFailureMechanism)] public string GenericFailureMechanismCode { get; set; } /// - /// Gets or sets the specific failure mechanism name of this assembly result. + /// Gets or sets the name of the failure mechanism this result is assembled for. /// [XmlElement(AssemblyXmlIdentifiers.SpecificFailureMechanism)] public string SpecificFailureMechanismName { get; set; } Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs =================================================================== diff -u -r89145d222d256199fe957520aa7677dafbc1420d -rc70b456800bddb4bb2952abeb592a3f4368490dd --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs (.../SerializableFailureMechanism.cs) (revision 89145d222d256199fe957520aa7677dafbc1420d) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs (.../SerializableFailureMechanism.cs) (revision c70b456800bddb4bb2952abeb592a3f4368490dd) @@ -96,13 +96,13 @@ public SerializableFailureMechanismType FailureMechanismType { get; set; } /// - /// Gets or sets the generic failure mechanism code. + /// Gets or sets the code of the failure mechanism. /// [XmlElement(AssemblyXmlIdentifiers.GenericFailureMechanism)] public string GenericFailureMechanismCode { get; set; } /// - /// Gets or sets the specific failure mechanism name. + /// Gets or sets the name of the failure mechanism. /// [XmlElement(AssemblyXmlIdentifiers.SpecificFailureMechanism)] public string SpecificFailureMechanismName { get; set; } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs =================================================================== diff -u -r853e4f606df6247deba8d0d5bd313fb780b11d10 -rc70b456800bddb4bb2952abeb592a3f4368490dd --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs) (revision 853e4f606df6247deba8d0d5bd313fb780b11d10) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs) (revision c70b456800bddb4bb2952abeb592a3f4368490dd) @@ -65,17 +65,18 @@ var assemblyMethod = random.NextEnumValue(); var failureMechanismType = random.NextEnumValue(); const string code = "code"; + const string name = "name"; var assemblyGroup = random.NextEnumValue(); // Call var assemblyResult = new SerializableCombinedFailureMechanismSectionAssemblyResult( - assemblyMethod, failureMechanismType, code, assemblyGroup); + assemblyMethod, failureMechanismType, code, name, assemblyGroup); // Assert Assert.AreEqual(assemblyMethod, assemblyResult.AssemblyMethod); Assert.AreEqual(failureMechanismType, assemblyResult.FailureMechanismType); Assert.AreEqual(code, assemblyResult.GenericFailureMechanismCode); - Assert.AreEqual(code, assemblyResult.SpecificFailureMechanismName); + Assert.AreEqual(name, assemblyResult.SpecificFailureMechanismName); Assert.AreEqual(assemblyGroup, assemblyResult.AssemblyGroup); Assert.AreEqual("VOLLDG", assemblyResult.Status); } @@ -90,7 +91,7 @@ var random = new Random(39); var assemblyResult = new SerializableCombinedFailureMechanismSectionAssemblyResult( random.NextEnumValue(), failureMechanismType, "code", - random.NextEnumValue()); + "name", random.NextEnumValue()); // When bool shouldSerializeGeneric = assemblyResult.ShouldSerializeGenericFailureMechanismCode(); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs =================================================================== diff -u -r0b50fd9fcfc14b23f0fa5536ad05a486ebed6b8f -rc70b456800bddb4bb2952abeb592a3f4368490dd --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 0b50fd9fcfc14b23f0fa5536ad05a486ebed6b8f) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision c70b456800bddb4bb2952abeb592a3f4368490dd) @@ -328,15 +328,15 @@ { new SerializableCombinedFailureMechanismSectionAssemblyResult( SerializableAssemblyMethod.WBI3B1, - SerializableFailureMechanismType.Generic, "HTKW", + SerializableFailureMechanismType.Generic, "HTKW", "Hoogte kunstwerk", SerializableFailureMechanismSectionAssemblyGroup.III), new SerializableCombinedFailureMechanismSectionAssemblyResult( SerializableAssemblyMethod.WBI3B1, - SerializableFailureMechanismType.Generic, "STPH", + SerializableFailureMechanismType.Generic, "STPH", "Piping", SerializableFailureMechanismSectionAssemblyGroup.II), new SerializableCombinedFailureMechanismSectionAssemblyResult( SerializableAssemblyMethod.WBI3B1, - SerializableFailureMechanismType.Specific, "NIEUW", + SerializableFailureMechanismType.Specific, "NIEUW", "Specifiek", SerializableFailureMechanismSectionAssemblyGroup.Zero) }, new SerializableFailureMechanismSectionAssemblyResult( Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs =================================================================== diff -u -rcee2db52a72ec34d52c88a4ba6e199153e9e1252 -rc70b456800bddb4bb2952abeb592a3f4368490dd --- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs) (revision cee2db52a72ec34d52c88a4ba6e199153e9e1252) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs) (revision c70b456800bddb4bb2952abeb592a3f4368490dd) @@ -60,6 +60,7 @@ SerializableAssemblyMethodCreator.Create(sectionResultSectionAssemblyResult.AssemblyMethod), SerializableFailureMechanismTypeCreator.Create(sectionResult.FailureMechanismType), sectionResult.Code, + sectionResult.Name, SerializableFailureMechanismSectionAssemblyGroupCreator.Create(sectionResultSectionAssemblyResult.AssemblyGroup)); } }