Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableFailureMechanismSectionAssemblyResult.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rd12beb1dfd1ad0efca048ed811ce86db7aa3c1e4 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableFailureMechanismSectionAssemblyResult.cs (.../SerializableFailureMechanismSectionAssemblyResult.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableFailureMechanismSectionAssemblyResult.cs (.../SerializableFailureMechanismSectionAssemblyResult.cs) (revision d12beb1dfd1ad0efca048ed811ce86db7aa3c1e4) @@ -37,6 +37,19 @@ /// /// Creates a new instance of . /// + /// The assembly group of this assembly result. + /// The probability of this assembly result. + public SerializableFailureMechanismSectionAssemblyResult(SerializableFailureMechanismSectionAssemblyGroup assemblyGroup, + double probability) + : this() + { + AssemblyGroup = assemblyGroup; + Probability = probability; + } + + /// + /// Creates a new instance of . + /// /// The method used to assemble this result. /// The assessment type of this assembly result. /// The category group of this assembly result. @@ -65,14 +78,20 @@ public SerializableAssessmentType AssessmentType { get; set; } /// - /// Gets or sets the category group of this assembly result. + /// Gets or sets the category group of this result. /// [XmlElement(AssemblyXmlIdentifiers.FailureMechanismSectionCategoryGroup)] public SerializableFailureMechanismSectionCategoryGroup CategoryGroup { get; set; } /// - /// Gets or sets the probability of this assembly result. + /// Gets or sets the assembly group of this result. /// + [XmlElement(AssemblyXmlIdentifiers.FailureMechanismSectionCategoryGroup)] + public SerializableFailureMechanismSectionAssemblyGroup AssemblyGroup { get; set; } + + /// + /// Gets or sets the probability of this result. + /// [XmlElement(AssemblyXmlIdentifiers.Probability)] public double? Probability { get; set; } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableFailureMechanismSectionAssemblyResultTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rd12beb1dfd1ad0efca048ed811ce86db7aa3c1e4 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableFailureMechanismSectionAssemblyResultTest.cs (.../SerializableFailureMechanismSectionAssemblyResultTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableFailureMechanismSectionAssemblyResultTest.cs (.../SerializableFailureMechanismSectionAssemblyResultTest.cs) (revision d12beb1dfd1ad0efca048ed811ce86db7aa3c1e4) @@ -54,6 +54,22 @@ } [Test] + public void Constructor_ExpectedValues() + { + // Setup + var random = new Random(21); + var assemblyGroup = random.NextEnumValue(); + double probability = random.NextDouble(); + + // Call + var assemblyResult = new SerializableFailureMechanismSectionAssemblyResult(assemblyGroup, probability); + + // Assert + Assert.AreEqual(assemblyGroup, assemblyResult.AssemblyGroup); + Assert.AreEqual(probability, assemblyResult.Probability); + } + + [Test] public void Constructor_WithValidData_ReturnsExpectedValues() { // Setup