Fisheye: Tag b575bc36b19f2219d30693b262b3a60ba4bea1a3 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableAssessmentSectionAssemblyResult.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs
===================================================================
diff -u -r78d2b865ab4d9df5179f804b8cb4b09203d39a9f -rb575bc36b19f2219d30693b262b3a60ba4bea1a3
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs (.../SerializableTotalAssemblyResult.cs) (revision 78d2b865ab4d9df5179f804b8cb4b09203d39a9f)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs (.../SerializableTotalAssemblyResult.cs) (revision b575bc36b19f2219d30693b262b3a60ba4bea1a3)
@@ -21,7 +21,6 @@
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;
@@ -44,12 +43,16 @@
///
/// The unique assembly ID.
/// The assessment process this result belongs to.
- /// The assembly result for the assessment section.
+ /// The method used to assemble this result.
+ /// The group of this assembly result.
+ /// The probability of this assembly result.
/// Thrown when any parameter except is null.
/// Thrown when is invalid.
public SerializableTotalAssemblyResult(string id,
SerializableAssessmentProcess assessmentProcess,
- SerializableAssessmentSectionAssemblyResult assessmentSectionAssemblyResult) : this()
+ SerializableAssemblyMethod assemblyMethod,
+ SerializableAssessmentSectionAssemblyGroup assemblyGroup,
+ double probability) : this()
{
SerializableIdValidator.ThrowIfInvalid(id);
@@ -58,16 +61,11 @@
throw new ArgumentNullException(nameof(assessmentProcess));
}
- if (assessmentSectionAssemblyResult == null)
- {
- throw new ArgumentNullException(nameof(assessmentSectionAssemblyResult));
- }
-
Id = id;
AssessmentProcessId = assessmentProcess.Id;
- AssemblyMethod = assessmentSectionAssemblyResult.AssemblyMethod;
- AssemblyGroup = assessmentSectionAssemblyResult.AssemblyGroup;
- Probability = assessmentSectionAssemblyResult.Probability;
+ AssemblyMethod = assemblyMethod;
+ AssemblyGroup = assemblyGroup;
+ Probability = probability;
Status = Resources.FullAssembly;
}
@@ -84,7 +82,7 @@
public string AssessmentProcessId { get; set; }
///
- /// Gets or sets the name of the method used to assemble this result.
+ /// Gets or sets the method used to assemble this result.
///
[XmlElement(AssemblyXmlIdentifiers.AssemblyMethod)]
public SerializableAssemblyMethod AssemblyMethod { get; set; }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs
===================================================================
diff -u -r78d2b865ab4d9df5179f804b8cb4b09203d39a9f -rb575bc36b19f2219d30693b262b3a60ba4bea1a3
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs (.../SerializableTotalAssemblyResultTest.cs) (revision 78d2b865ab4d9df5179f804b8cb4b09203d39a9f)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs (.../SerializableTotalAssemblyResultTest.cs) (revision b575bc36b19f2219d30693b262b3a60ba4bea1a3)
@@ -109,20 +109,21 @@
var random = new Random(39);
var assemblyMethod = random.NextEnumValue();
- var group = random.NextEnumValue();
+ var assemblyGroup = random.NextEnumValue();
double probability = random.NextDouble();
- var assessmentSectionResult = new SerializableAssessmentSectionAssemblyResult(assemblyMethod, group, probability);
// Call
var totalAssemblyResult = new SerializableTotalAssemblyResult(id,
assessmentProcess,
- assessmentSectionResult);
+ assemblyMethod,
+ assemblyGroup,
+ probability);
// Assert
Assert.AreEqual(id, totalAssemblyResult.Id);
Assert.AreEqual(assessmentProcess.Id, totalAssemblyResult.AssessmentProcessId);
Assert.AreEqual(assemblyMethod, totalAssemblyResult.AssemblyMethod);
- Assert.AreEqual(group, totalAssemblyResult.AssemblyGroup);
+ Assert.AreEqual(assemblyGroup, totalAssemblyResult.AssemblyGroup);
Assert.AreEqual(probability, totalAssemblyResult.Probability);
Assert.AreEqual("VOLLDG", totalAssemblyResult.Status);
}