Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs =================================================================== diff -u -r5c5ccd7cfa27b2fa314f4fc00047e99fe199cb0b -r78d2b865ab4d9df5179f804b8cb4b09203d39a9f --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs (.../SerializableTotalAssemblyResult.cs) (revision 5c5ccd7cfa27b2fa314f4fc00047e99fe199cb0b) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs (.../SerializableTotalAssemblyResult.cs) (revision 78d2b865ab4d9df5179f804b8cb4b09203d39a9f) @@ -22,7 +22,9 @@ using System; using System.Xml.Serialization; 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 { @@ -63,7 +65,10 @@ Id = id; AssessmentProcessId = assessmentProcess.Id; - AssessmentSectionAssemblyResult = assessmentSectionAssemblyResult; + AssemblyMethod = assessmentSectionAssemblyResult.AssemblyMethod; + AssemblyGroup = assessmentSectionAssemblyResult.AssemblyGroup; + Probability = assessmentSectionAssemblyResult.Probability; + Status = Resources.FullAssembly; } /// @@ -79,9 +84,27 @@ public string AssessmentProcessId { get; set; } /// - /// Gets or sets the assessment section assembly result. + /// Gets or sets the name of the method used to assemble this result. /// - [XmlElement(AssemblyXmlIdentifiers.AssessmentSectionAssemblyResult)] - public SerializableAssessmentSectionAssemblyResult AssessmentSectionAssemblyResult { get; set; } + [XmlElement(AssemblyXmlIdentifiers.AssemblyMethod)] + public SerializableAssemblyMethod AssemblyMethod { get; set; } + + /// + /// Gets or sets the group of this assembly result. + /// + [XmlElement(AssemblyXmlIdentifiers.AssessmentSectionAssemblyGroup)] + public SerializableAssessmentSectionAssemblyGroup AssemblyGroup { get; set; } + + /// + /// Gets or sets the probability of this assembly result. + /// + [XmlElement(AssemblyXmlIdentifiers.Probability)] + public double Probability { get; set; } + + /// + /// Gets or sets the status of this assembly result. + /// + [XmlElement(AssemblyXmlIdentifiers.Status)] + public string Status { get; set; } } } \ No newline at end of file Fisheye: Tag 78d2b865ab4d9df5179f804b8cb4b09203d39a9f refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableAssessmentSectionAssemblyResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs =================================================================== diff -u -r17a9c7be85b873550e29ea918acb99fee9296c12 -r78d2b865ab4d9df5179f804b8cb4b09203d39a9f --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs (.../SerializableTotalAssemblyResultTest.cs) (revision 17a9c7be85b873550e29ea918acb99fee9296c12) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs (.../SerializableTotalAssemblyResultTest.cs) (revision 78d2b865ab4d9df5179f804b8cb4b09203d39a9f) @@ -24,6 +24,7 @@ using NUnit.Framework; using Riskeer.AssemblyTool.IO.Model; using Riskeer.AssemblyTool.IO.Model.DataTypes; +using Riskeer.AssemblyTool.IO.Model.Enums; using Riskeer.AssemblyTool.IO.TestUtil; namespace Riskeer.AssemblyTool.IO.Test.Model @@ -41,7 +42,10 @@ Assert.IsInstanceOf(totalAssemblyResult); Assert.IsNull(totalAssemblyResult.Id); Assert.IsNull(totalAssemblyResult.AssessmentProcessId); - Assert.IsNull(totalAssemblyResult.AssessmentSectionAssemblyResult); + Assert.AreEqual((SerializableAssemblyMethod) 0, totalAssemblyResult.AssemblyMethod); + Assert.AreEqual((SerializableAssessmentSectionAssemblyGroup) 0, totalAssemblyResult.AssemblyGroup); + Assert.AreEqual(0, totalAssemblyResult.Probability); + Assert.AreEqual("VOLLDG", totalAssemblyResult.Status); SerializableAttributeTestHelper.AssertXmlTypeAttribute(typeof(SerializableTotalAssemblyResult), "Veiligheidsoordeel"); @@ -50,8 +54,14 @@ SerializableAttributeTestHelper.AssertXmlAttributeAttribute( nameof(SerializableTotalAssemblyResult.AssessmentProcessId), "BeoordelingsprocesIDRef"); - SerializableAttributeTestHelper.AssertXmlElementAttribute( - nameof(SerializableTotalAssemblyResult.AssessmentSectionAssemblyResult), "veiligheidsoordeel"); + SerializableAttributeTestHelper.AssertXmlElementAttribute( + nameof(SerializableAssessmentSectionAssemblyResult.AssemblyMethod), "assemblagemethode"); + SerializableAttributeTestHelper.AssertXmlElementAttribute( + nameof(SerializableAssessmentSectionAssemblyResult.AssemblyGroup), "categorie"); + SerializableAttributeTestHelper.AssertXmlElementAttribute( + nameof(SerializableAssessmentSectionAssemblyResult.Probability), "faalkans"); + SerializableAttributeTestHelper.AssertXmlElementAttribute( + nameof(SerializableAssessmentSectionAssemblyResult.Status), "status"); } [Test] @@ -96,8 +106,13 @@ const string id = "id"; var assessmentProcess = new SerializableAssessmentProcess("processId", new SerializableAssessmentSection()); - var assessmentSectionResult = new SerializableAssessmentSectionAssemblyResult(); + var random = new Random(39); + var assemblyMethod = random.NextEnumValue(); + var group = random.NextEnumValue(); + double probability = random.NextDouble(); + var assessmentSectionResult = new SerializableAssessmentSectionAssemblyResult(assemblyMethod, group, probability); + // Call var totalAssemblyResult = new SerializableTotalAssemblyResult(id, assessmentProcess, @@ -106,7 +121,10 @@ // Assert Assert.AreEqual(id, totalAssemblyResult.Id); Assert.AreEqual(assessmentProcess.Id, totalAssemblyResult.AssessmentProcessId); - Assert.AreSame(assessmentSectionResult, totalAssemblyResult.AssessmentSectionAssemblyResult); + Assert.AreEqual(assemblyMethod, totalAssemblyResult.AssemblyMethod); + Assert.AreEqual(group, totalAssemblyResult.AssemblyGroup); + Assert.AreEqual(probability, totalAssemblyResult.Probability); + Assert.AreEqual("VOLLDG", totalAssemblyResult.Status); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs =================================================================== diff -u -r9ce07870a622701c04cce851bd034d6182ccd545 -r78d2b865ab4d9df5179f804b8cb4b09203d39a9f --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision 9ce07870a622701c04cce851bd034d6182ccd545) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision 78d2b865ab4d9df5179f804b8cb4b09203d39a9f) @@ -26,7 +26,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.AssemblyTool.IO.Model; -using Riskeer.AssemblyTool.IO.Model.DataTypes; using Riskeer.AssemblyTool.IO.Model.Gml; using Riskeer.AssemblyTool.IO.Model.Helpers; using Riskeer.Integration.IO.Assembly; @@ -215,12 +214,11 @@ { Assert.AreEqual(expectedId, serializableTotalAssembly.Id); Assert.AreEqual(expectedAssessmentProcess.Id, serializableTotalAssembly.AssessmentProcessId); - - SerializableAssessmentSectionAssemblyResult serializableAssessmentSectionAssemblyResult = serializableTotalAssembly.AssessmentSectionAssemblyResult; Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedAssessmentSectionAssemblyResult.AssemblyMethod), - serializableAssessmentSectionAssemblyResult.AssemblyMethod); + serializableTotalAssembly.AssemblyMethod); Assert.AreEqual(SerializableAssessmentSectionAssemblyGroupCreator.Create(expectedAssessmentSectionAssemblyResult.AssemblyGroup), - serializableAssessmentSectionAssemblyResult.AssemblyGroup); + serializableTotalAssembly.AssemblyGroup); + Assert.AreEqual(expectedAssessmentSectionAssemblyResult.Probability, serializableTotalAssembly.Probability); } private static void AssertSerializableFailureMechanismSection(string expectedId,