Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs
===================================================================
diff -u -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9 -r641cbbb4010e957aae4f133ab9c91c3a4113784e
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs (.../SerializableFailureMechanism.cs) (revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs (.../SerializableFailureMechanism.cs) (revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
@@ -45,13 +45,13 @@
/// Creates a new instance of .
///
/// The unique ID of the assembly result.
- /// The total assembly result the failure mechanism belongs to.
/// The code of the failure mechanism.
+ /// The total assembly result the failure mechanism belongs to.
/// The total failure mechanism assembly result.
/// Thrown when any parameter except is null.
/// Thrown when is invalid.
- public SerializableFailureMechanism(string id, SerializableTotalAssemblyResult totalAssemblyResult,
- string code,
+ public SerializableFailureMechanism(string id, string code,
+ SerializableTotalAssemblyResult totalAssemblyResult,
SerializableFailureMechanismAssemblyResult failureMechanismAssemblyResult)
: this()
{
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9 -r641cbbb4010e957aae4f133ab9c91c3a4113784e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs (.../SerializableFailureMechanismSectionAssemblyTest.cs) (revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs (.../SerializableFailureMechanismSectionAssemblyTest.cs) (revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
@@ -118,9 +118,8 @@
var random = new Random(39);
var failureMechanism = new SerializableFailureMechanism("failureMechanismID",
- new SerializableTotalAssemblyResult(),
"code",
- new SerializableFailureMechanismAssemblyResult());
+ new SerializableTotalAssemblyResult(), new SerializableFailureMechanismAssemblyResult());
var section = new SerializableFailureMechanismSection("sectionID",
new SerializableFailureMechanismSectionCollection(),
random.NextDouble(),
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs
===================================================================
diff -u -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9 -r641cbbb4010e957aae4f133ab9c91c3a4113784e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs (.../SerializableFailureMechanismTest.cs) (revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs (.../SerializableFailureMechanismTest.cs) (revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
@@ -65,8 +65,8 @@
public void Constructor_InvalidId_ThrowsArgumentException(string invalidId)
{
// Call
- void Call() => new SerializableFailureMechanism(invalidId, new SerializableTotalAssemblyResult(),
- "code", new SerializableFailureMechanismAssemblyResult());
+ void Call() => new SerializableFailureMechanism(invalidId, "code", new SerializableTotalAssemblyResult(),
+ new SerializableFailureMechanismAssemblyResult());
// Assert
const string expectedMessage = "'id' must have a value and consist only of alphanumerical characters, '-', '_' or '.'.";
@@ -77,8 +77,7 @@
public void Constructor_TotalAssemblyResultNull_ThrowsArgumentNullException()
{
// Call
- void Call() => new SerializableFailureMechanism("id", null, "code",
- new SerializableFailureMechanismAssemblyResult());
+ void Call() => new SerializableFailureMechanism("id", "code", null, new SerializableFailureMechanismAssemblyResult());
// Assert
var exception = Assert.Throws(Call);
@@ -89,8 +88,7 @@
public void Constructor_FailureMechanismAssemblyResultNull_ThrowsArgumentNullException()
{
// Call
- void Call() => new SerializableFailureMechanism("id", new SerializableTotalAssemblyResult(),
- "code", null);
+ void Call() => new SerializableFailureMechanism("id", "code", new SerializableTotalAssemblyResult(), null);
// Assert
var exception = Assert.Throws(Call);
@@ -109,9 +107,9 @@
// Call
var failureMechanism = new SerializableFailureMechanism(
- id, new SerializableTotalAssemblyResult(
- totalResultId, new SerializableAssessmentProcess(), new SerializableAssessmentSectionAssemblyResult()),
- code, assemblyResult);
+ id, code, new SerializableTotalAssemblyResult(totalResultId, new SerializableAssessmentProcess(),
+ new SerializableAssessmentSectionAssemblyResult()),
+ assemblyResult);
// Assert
Assert.AreEqual(id, failureMechanism.Id);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs
===================================================================
diff -u -r2077c21eebd3514bbc3f49f2cf9039100760f966 -r641cbbb4010e957aae4f133ab9c91c3a4113784e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 2077c21eebd3514bbc3f49f2cf9039100760f966)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
@@ -277,15 +277,13 @@
assessmentSection);
var totalAssemblyResult = new SerializableTotalAssemblyResult(
- "veiligheidsoordeel_1",
- assessmentProcess,
- new SerializableAssessmentSectionAssemblyResult(SerializableAssemblyMethod.WBI2B1, SerializableAssessmentSectionAssemblyGroup.B, 0.00068354));
+ "veiligheidsoordeel_1", assessmentProcess,
+ new SerializableAssessmentSectionAssemblyResult(
+ SerializableAssemblyMethod.WBI2B1, SerializableAssessmentSectionAssemblyGroup.B, 0.00068354));
var failureMechanism = new SerializableFailureMechanism(
- "toetsspoorGABI",
- totalAssemblyResult,
- "GABI",
- new SerializableFailureMechanismAssemblyResult(0.08419, false));
+ "toetsspoorGABI", "GABI", totalAssemblyResult,
+ new SerializableFailureMechanismAssemblyResult(0.08419, false));
var sections1 = new SerializableFailureMechanismSectionCollection("vakindelingGABI");
var section1 = new SerializableFailureMechanismSection(
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs
===================================================================
diff -u -r73991051d9869bec831a714115eb8c635566fd4d -r641cbbb4010e957aae4f133ab9c91c3a4113784e
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs (.../SerializableFailureMechanismCreator.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs (.../SerializableFailureMechanismCreator.cs) (revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
@@ -65,7 +65,7 @@
}
return new SerializableFailureMechanism(idGenerator.GetNewId(Resources.SerializableFailureMechanismCreator_IdPrefix),
- serializableTotalAssembly, failureMechanism.Code,
+ failureMechanism.Code, serializableTotalAssembly,
SerializableFailureMechanismResultCreator.Create(failureMechanism.FailureMechanismAssembly));
}
}