Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs =================================================================== diff -u -r4944cd3d81cde6827703ce8a475f8c51935b4bc9 -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs (.../AssemblyXmlIdentifiers.cs) (revision 4944cd3d81cde6827703ce8a475f8c51935b4bc9) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs (.../AssemblyXmlIdentifiers.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -208,11 +208,16 @@ public const string FailureMechanismSectionType = "typeWaterkeringsectie"; /// - /// Identifier for a failure mechanism group element. + /// Identifier for a failure mechanism type element. /// public const string FailureMechanismType = "typeFaalmechanisme"; /// + /// Identifier for a generic failure mechanism element. + /// + public const string GenericFailureMechanism = "generiekFaalmechanisme"; + + /// /// Identifier for a feature member element. /// public const string FeatureMember = "featureMember"; Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs =================================================================== diff -u -r98966494faaf14289e8e5cbdfa9ad6852ab2ad09 -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs (.../SerializableFailureMechanism.cs) (revision 98966494faaf14289e8e5cbdfa9ad6852ab2ad09) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs (.../SerializableFailureMechanism.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -24,6 +24,7 @@ using Riskeer.AssemblyTool.IO.Model.DataTypes; using Riskeer.AssemblyTool.IO.Model.Enums; using Riskeer.AssemblyTool.IO.Model.Helpers; +using Riskeer.AssemblyTool.IO.Properties; namespace Riskeer.AssemblyTool.IO.Model { @@ -36,7 +37,10 @@ /// /// Creates a new instance of . /// - public SerializableFailureMechanism() {} + public SerializableFailureMechanism() + { + FailureMechanismType = Resources.FailureMechanismType_Generic_DisplayName; + } /// /// Creates a new instance of . @@ -69,7 +73,7 @@ Id = id; TotalAssemblyResultId = totalAssemblyResult.Id; - FailureMechanismType = failureMechanismType; + GenericFailureMechanism = failureMechanismType; FailureMechanismAssemblyResult = failureMechanismAssemblyResult; } @@ -89,9 +93,15 @@ /// Gets or sets the failure mechanism type. /// [XmlElement(AssemblyXmlIdentifiers.FailureMechanismType)] - public SerializableFailureMechanismType FailureMechanismType { get; set; } + public string FailureMechanismType { get; set; } /// + /// Gets or sets the failure mechanism type. + /// + [XmlElement(AssemblyXmlIdentifiers.GenericFailureMechanism)] + public SerializableFailureMechanismType GenericFailureMechanism { get; set; } + + /// /// Gets or sets the total failure mechanism assembly result. /// [XmlElement(AssemblyXmlIdentifiers.FailureMechanismAssemblyResult)] Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -109,6 +109,15 @@ } /// + /// Looks up a localized string similar to GENRK. + /// + internal static string FailureMechanismType_Generic_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismType_Generic_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to VOLLDG. /// internal static string FullAssembly { Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx (.../Resources.resx) (revision 2e55afd890468db1b25c734216956ab5c2126e58) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx (.../Resources.resx) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -132,4 +132,7 @@ EPSG:28992 + + GENRK + \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs =================================================================== diff -u -r4944cd3d81cde6827703ce8a475f8c51935b4bc9 -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision 4944cd3d81cde6827703ce8a475f8c51935b4bc9) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -70,6 +70,7 @@ Assert.AreEqual("VakindelingIDRef", AssemblyXmlIdentifiers.FailureMechanismSectionCollectionIdRef); Assert.AreEqual("typeWaterkeringsectie", AssemblyXmlIdentifiers.FailureMechanismSectionType); Assert.AreEqual("typeFaalmechanisme", AssemblyXmlIdentifiers.FailureMechanismType); + Assert.AreEqual("generiekFaalmechanisme", AssemblyXmlIdentifiers.GenericFailureMechanism); Assert.AreEqual("featureMember", AssemblyXmlIdentifiers.FeatureMember); Assert.AreEqual("posList", AssemblyXmlIdentifiers.Geometry); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs =================================================================== diff -u -r4944cd3d81cde6827703ce8a475f8c51935b4bc9 -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs (.../SerializableFailureMechanismTest.cs) (revision 4944cd3d81cde6827703ce8a475f8c51935b4bc9) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs (.../SerializableFailureMechanismTest.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -43,7 +43,8 @@ Assert.IsNull(failureMechanism.Id); Assert.IsNull(failureMechanism.TotalAssemblyResultId); Assert.IsNull(failureMechanism.FailureMechanismAssemblyResult); - Assert.AreEqual((SerializableFailureMechanismType) 0, failureMechanism.FailureMechanismType); + Assert.AreEqual((SerializableFailureMechanismType) 0, failureMechanism.GenericFailureMechanism); + Assert.AreEqual("GENRK", failureMechanism.FailureMechanismType); SerializableAttributeTestHelper.AssertXmlTypeAttribute(typeof(SerializableFailureMechanism), "Faalmechanisme"); @@ -53,6 +54,8 @@ nameof(SerializableFailureMechanism.TotalAssemblyResultId), "VeiligheidsoordeelIDRef"); SerializableAttributeTestHelper.AssertXmlElementAttribute( + nameof(SerializableFailureMechanism.GenericFailureMechanism), "generiekFaalmechanisme"); + SerializableAttributeTestHelper.AssertXmlElementAttribute( nameof(SerializableFailureMechanism.FailureMechanismType), "typeFaalmechanisme"); SerializableAttributeTestHelper.AssertXmlElementAttribute( nameof(SerializableFailureMechanism.FailureMechanismAssemblyResult), "analyseFaalmechanisme"); @@ -127,7 +130,7 @@ // Assert Assert.AreEqual(id, failureMechanism.Id); Assert.AreEqual(totalResultId, failureMechanism.TotalAssemblyResultId); - Assert.AreEqual(type, failureMechanism.FailureMechanismType); + Assert.AreEqual(type, failureMechanism.GenericFailureMechanism); Assert.AreSame(assemblyResult, failureMechanism.FailureMechanismAssemblyResult); } } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml =================================================================== diff -u -r4944cd3d81cde6827703ce8a475f8c51935b4bc9 -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml (.../configuredAssembly.gml) (revision 4944cd3d81cde6827703ce8a475f8c51935b4bc9) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml (.../configuredAssembly.gml) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -23,14 +23,15 @@ - WBI-2C-1 + WBI-2B-1 B 0.00068354 VOLLDG - GABI + GENRK + GABI WBI-1B-1 0.08419 Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs =================================================================== diff -u -r81e692fea64a1118533822921834b740d7d1b6ab -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 81e692fea64a1118533822921834b740d7d1b6ab) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -116,7 +116,7 @@ SerializableFailureMechanism serializableFailureMechanism = aggregatedFailureMechanism.FailureMechanism; Assert.AreEqual("Ts.0", serializableFailureMechanism.Id); Assert.AreEqual(serializableTotalAssembly.Id, serializableFailureMechanism.TotalAssemblyResultId); - Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.FailureMechanismType); + Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.GenericFailureMechanism); SerializableFailureMechanismAssemblyResultTestHelper.AssertSerializableFailureMechanismAssemblyResult(failureMechanism.FailureMechanismAssembly, serializableFailureMechanism.FailureMechanismAssemblyResult); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs =================================================================== diff -u -rd16ce04ea57344fa114871eae33ba4bb23751fad -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs (.../SerializableFailureMechanismCreatorTest.cs) (revision d16ce04ea57344fa114871eae33ba4bb23751fad) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs (.../SerializableFailureMechanismCreatorTest.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94) @@ -86,7 +86,7 @@ // Assert Assert.AreEqual("Ts.0", serializableFailureMechanism.Id); Assert.AreEqual(serializableTotalAssembly.Id, serializableFailureMechanism.TotalAssemblyResultId); - Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.FailureMechanismType); + Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.GenericFailureMechanism); SerializableFailureMechanismAssemblyResultTestHelper.AssertSerializableFailureMechanismAssemblyResult(failureMechanism.FailureMechanismAssembly, serializableFailureMechanism.FailureMechanismAssemblyResult);