Index: Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanism.cs
===================================================================
diff -u -r17437b28d26ec6456c9b12c1874c2f4284ead57c -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanism.cs (.../ExportableFailureMechanism.cs) (revision 17437b28d26ec6456c9b12c1874c2f4284ead57c)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanism.cs (.../ExportableFailureMechanism.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -39,7 +39,7 @@
/// or is null.
public ExportableFailureMechanism(ExportableFailureMechanismAssemblyResult failureMechanismAssembly,
IEnumerable sectionAssemblyResults,
- ExportableFailureMechanismType code)
+ string code)
{
if (failureMechanismAssembly == null)
{
@@ -69,6 +69,6 @@
///
/// Gets the code of the failure mechanism.
///
- public ExportableFailureMechanismType Code { get; }
+ public string Code { get; }
}
}
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismCombinedSectionAssemblyResult.cs
===================================================================
diff -u -re512d8a06d1bed7093f968af74acb02a64d46769 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismCombinedSectionAssemblyResult.cs (.../ExportableFailureMechanismCombinedSectionAssemblyResult.cs) (revision e512d8a06d1bed7093f968af74acb02a64d46769)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismCombinedSectionAssemblyResult.cs (.../ExportableFailureMechanismCombinedSectionAssemblyResult.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -35,7 +35,7 @@
/// The code of the failure mechanism.
/// Thrown when is null.
public ExportableFailureMechanismCombinedSectionAssemblyResult(ExportableFailureMechanismSubSectionAssemblyResult sectionAssemblyResult,
- ExportableFailureMechanismType code)
+ string code)
{
if (sectionAssemblyResult == null)
{
@@ -54,6 +54,6 @@
///
/// Gets the code of the failure mechanism.
///
- public ExportableFailureMechanismType Code { get; }
+ public string Code { get; }
}
}
\ No newline at end of file
Fisheye: Tag 73991051d9869bec831a714115eb8c635566fd4d refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismType.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs
===================================================================
diff -u -re512d8a06d1bed7093f968af74acb02a64d46769 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs) (revision e512d8a06d1bed7093f968af74acb02a64d46769)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -58,8 +58,7 @@
return new SerializableCombinedFailureMechanismSectionAssemblyResult(
SerializableAssemblyMethodCreator.Create(sectionResultSectionAssemblyResult.AssemblyMethod),
- SerializableFailureMechanismTypeCreator.Create(sectionResult.Code),
- SerializableFailureMechanismSectionAssemblyGroupCreator.Create(sectionResultSectionAssemblyResult.AssemblyGroup));
+ sectionResult.Code, SerializableFailureMechanismSectionAssemblyGroupCreator.Create(sectionResultSectionAssemblyResult.AssemblyGroup));
}
}
}
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs
===================================================================
diff -u -r73a029ff60e9fc9121505cbd979718b9926cf9b7 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs (.../SerializableFailureMechanismCreator.cs) (revision 73a029ff60e9fc9121505cbd979718b9926cf9b7)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs (.../SerializableFailureMechanismCreator.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -65,8 +65,7 @@
}
return new SerializableFailureMechanism(idGenerator.GetNewId(Resources.SerializableFailureMechanismCreator_IdPrefix),
- serializableTotalAssembly,
- SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code),
+ serializableTotalAssembly, failureMechanism.Code,
SerializableFailureMechanismResultCreator.Create(failureMechanism.FailureMechanismAssembly));
}
}
Fisheye: Tag 73991051d9869bec831a714115eb8c635566fd4d refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismTypeCreator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs
===================================================================
diff -u -re512d8a06d1bed7093f968af74acb02a64d46769 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs (.../ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs) (revision e512d8a06d1bed7093f968af74acb02a64d46769)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs (.../ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -33,12 +33,8 @@
[Test]
public void Constructor_SectionAssemblyResultNull_ThrowsArgumentNullException()
{
- // Setup
- var random = new Random(21);
- var code = random.NextEnumValue();
-
// Call
- void Call() => new ExportableFailureMechanismCombinedSectionAssemblyResult(null, code);
+ void Call() => new ExportableFailureMechanismCombinedSectionAssemblyResult(null, string.Empty);
// Assert
var exception = Assert.Throws(Call);
@@ -49,8 +45,8 @@
public void Constructor_WithArguments_ExpectedValues()
{
// Setup
+ const string code = "code";
var random = new Random(21);
- var code = random.NextEnumValue();
var combinedSectionAssembly = new ExportableFailureMechanismSubSectionAssemblyResult(
random.NextEnumValue(), random.NextEnumValue());
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs
===================================================================
diff -u -r17437b28d26ec6456c9b12c1874c2f4284ead57c -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 17437b28d26ec6456c9b12c1874c2f4284ead57c)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Core.Common.TestUtil;
using NUnit.Framework;
using Riskeer.Integration.IO.Assembly;
using Riskeer.Integration.IO.TestUtil;
@@ -35,13 +34,10 @@
[Test]
public void Constructor_FailureMechanismAssemblyResultNull_ThrowsArgumentNullException()
{
- // Setup
- var random = new Random(21);
-
// Call
void Call() => new ExportableFailureMechanism(
null, Enumerable.Empty(),
- random.NextEnumValue());
+ string.Empty);
// Assert
var exception = Assert.Throws(Call);
@@ -51,13 +47,10 @@
[Test]
public void Constructor_SectionAssemblyResultsNull_ThrowsArgumentNullException()
{
- // Setup
- var random = new Random(21);
-
// Call
void Call() => new ExportableFailureMechanism(
ExportableFailureMechanismAssemblyResultTestFactory.CreateResult(),
- null, random.NextEnumValue());
+ null, string.Empty);
// Assert
var exception = Assert.Throws(Call);
@@ -68,12 +61,11 @@
public void Constructor_ExpectedValues()
{
// Setup
- var random = new Random(21);
ExportableFailureMechanismAssemblyResult failureMechanismAssembly =
ExportableFailureMechanismAssemblyResultTestFactory.CreateResult();
IEnumerable sectionAssemblyResults =
Enumerable.Empty();
- var code = random.NextEnumValue();
+ const string code = "code";
// Call
var failureMechanism = new ExportableFailureMechanism(
Fisheye: Tag 73991051d9869bec831a714115eb8c635566fd4d refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismTypeTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs
===================================================================
diff -u -rbd8b271e8423fb8ad5b4fe455f287e142ee10233 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -172,7 +172,7 @@
{
var random = new Random(seed);
return new ExportableFailureMechanismCombinedSectionAssemblyResult(CreateSectionAssemblyResult(random.Next()),
- random.NextEnumValue());
+ "code");
}
private static ExportableFailureMechanismSubSectionAssemblyResult CreateSectionAssemblyResult(int seed)
@@ -211,8 +211,7 @@
private static void AssertCombinedFailureMechanismSectionAssemblyResult(ExportableFailureMechanismCombinedSectionAssemblyResult expectedSectionResult,
SerializableCombinedFailureMechanismSectionAssemblyResult actualSectionResult)
{
- Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(expectedSectionResult.Code),
- actualSectionResult.GenericFailureMechanism);
+ Assert.AreEqual(expectedSectionResult.Code, actualSectionResult.GenericFailureMechanismCode);
ExportableFailureMechanismSubSectionAssemblyResult expectedSectionAssemblyResult = expectedSectionResult.SectionAssemblyResult;
Assert.AreEqual(SerializableFailureMechanismSectionAssemblyGroupCreator.Create(expectedSectionAssemblyResult.AssemblyGroup),
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -rbd8b271e8423fb8ad5b4fe455f287e142ee10233 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Core.Common.TestUtil;
using NUnit.Framework;
using Riskeer.AssemblyTool.IO.Model;
using Riskeer.AssemblyTool.IO.Model.DataTypes;
@@ -40,16 +39,13 @@
[Test]
public void Create_IdGeneratorNull_ThrowsArgumentNullException()
{
- // Setup
- var random = new Random(21);
-
// Call
void Call() => AggregatedSerializableFailureMechanismCreator.Create(
null, new SerializableTotalAssemblyResult(),
new ExportableFailureMechanism(
ExportableFailureMechanismAssemblyResultTestFactory.CreateResult(),
Enumerable.Empty(),
- random.NextEnumValue()));
+ string.Empty));
// Assert
var exception = Assert.Throws(Call);
@@ -59,16 +55,13 @@
[Test]
public void Create_TotalAssemblyResultNull_ThrowsArgumentNullException()
{
- // Setup
- var random = new Random(21);
-
// Call
void Call() => AggregatedSerializableFailureMechanismCreator.Create(
new IdentifierGenerator(), null,
new ExportableFailureMechanism(
ExportableFailureMechanismAssemblyResultTestFactory.CreateResult(),
Enumerable.Empty(),
- random.NextEnumValue()));
+ string.Empty));
// Assert
var exception = Assert.Throws(Call);
@@ -101,7 +94,7 @@
ExportableFailureMechanismSectionAssemblyResultTestFactory.CreateWithProbability(
ExportableFailureMechanismSectionTestFactory.CreateExportableFailureMechanismSection(random.Next()), random.Next())
},
- random.NextEnumValue());
+ "code");
var idGenerator = new IdentifierGenerator();
@@ -116,7 +109,7 @@
SerializableFailureMechanism serializableFailureMechanism = aggregatedFailureMechanism.FailureMechanism;
Assert.AreEqual("Fm.0", serializableFailureMechanism.Id);
Assert.AreEqual(serializableTotalAssembly.Id, serializableFailureMechanism.TotalAssemblyResultId);
- Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.GenericFailureMechanism);
+ Assert.AreEqual(failureMechanism.Code, serializableFailureMechanism.GenericFailureMechanismCode);
SerializableFailureMechanismAssemblyResultTestHelper.AssertSerializableFailureMechanismAssemblyResult(failureMechanism.FailureMechanismAssembly,
serializableFailureMechanism.FailureMechanismAssemblyResult);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs
===================================================================
diff -u -rbd8b271e8423fb8ad5b4fe455f287e142ee10233 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -139,17 +139,16 @@
ExportableFailureMechanismSectionAssemblyResultTestFactory.Create(section, 21),
new[]
{
- CreateCombinedSectionAssemblyResult(1),
- CreateCombinedSectionAssemblyResult(2)
+ CreateCombinedSectionAssemblyResult(),
+ CreateCombinedSectionAssemblyResult()
});
}
- private static ExportableFailureMechanismCombinedSectionAssemblyResult CreateCombinedSectionAssemblyResult(int seed)
+ private static ExportableFailureMechanismCombinedSectionAssemblyResult CreateCombinedSectionAssemblyResult()
{
- var random = new Random(seed);
return new ExportableFailureMechanismCombinedSectionAssemblyResult(
ExportableFailureMechanismSubSectionAssemblyResultTestFactory.Create(),
- random.NextEnumValue());
+ "code");
}
private static ExportableFailureMechanism CreateFailureMechanism()
@@ -162,7 +161,7 @@
{
ExportableFailureMechanismSectionAssemblyResultTestFactory.CreateWithProbability(failureMechanismSection, random.Next())
},
- random.NextEnumValue());
+ "code");
}
#endregion
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs
===================================================================
diff -u -ra1090298a1bbfca8db1877eed50cab25a1d00cc8 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs) (revision a1090298a1bbfca8db1877eed50cab25a1d00cc8)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -53,7 +53,7 @@
var random = new Random(21);
var sectionResult = new ExportableFailureMechanismCombinedSectionAssemblyResult(
new ExportableFailureMechanismSubSectionAssemblyResult(assemblyGroup, random.NextEnumValue()),
- random.NextEnumValue());
+ "code");
// Call
void Call() => SerializableCombinedFailureMechanismSectionAssemblyResultCreator.Create(sectionResult);
@@ -67,17 +67,15 @@
public void Create_WithExportableFailureMechanismCombinedSectionAssemblyResult_ReturnsSerializableCombinedFailureMechanismSectionAssemblyResult()
{
// Setup
- var random = new Random(21);
- var sectionResult = new ExportableFailureMechanismCombinedSectionAssemblyResult(CreateSectionAssemblyResult(),
- random.NextEnumValue());
+ var sectionResult = new ExportableFailureMechanismCombinedSectionAssemblyResult(
+ CreateSectionAssemblyResult(), "code");
// Call
SerializableCombinedFailureMechanismSectionAssemblyResult serializableResult =
SerializableCombinedFailureMechanismSectionAssemblyResultCreator.Create(sectionResult);
// Assert
- Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(sectionResult.Code),
- serializableResult.GenericFailureMechanism);
+ Assert.AreEqual(sectionResult.Code, serializableResult.GenericFailureMechanismCode);
ExportableFailureMechanismSubSectionAssemblyResult expectedSectionAssemblyResult = sectionResult.SectionAssemblyResult;
Assert.AreEqual(SerializableFailureMechanismSectionAssemblyGroupCreator.Create(expectedSectionAssemblyResult.AssemblyGroup),
serializableResult.AssemblyGroup);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -rbd8b271e8423fb8ad5b4fe455f287e142ee10233 -r73991051d9869bec831a714115eb8c635566fd4d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs (.../SerializableFailureMechanismCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs (.../SerializableFailureMechanismCreatorTest.cs) (revision 73991051d9869bec831a714115eb8c635566fd4d)
@@ -21,7 +21,6 @@
using System;
using System.Linq;
-using Core.Common.TestUtil;
using NUnit.Framework;
using Riskeer.AssemblyTool.IO.Model;
using Riskeer.AssemblyTool.IO.Model.DataTypes;
@@ -86,19 +85,18 @@
// Assert
Assert.AreEqual("Fm.0", serializableFailureMechanism.Id);
Assert.AreEqual(serializableTotalAssembly.Id, serializableFailureMechanism.TotalAssemblyResultId);
- Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.GenericFailureMechanism);
+ Assert.AreEqual(failureMechanism.Code, serializableFailureMechanism.GenericFailureMechanismCode);
SerializableFailureMechanismAssemblyResultTestHelper.AssertSerializableFailureMechanismAssemblyResult(failureMechanism.FailureMechanismAssembly,
serializableFailureMechanism.FailureMechanismAssemblyResult);
}
private static ExportableFailureMechanism CreateExportableFailureMechanism()
{
- var random = new Random(21);
return new ExportableFailureMechanism(
ExportableFailureMechanismAssemblyResultTestFactory.CreateResult(),
Enumerable.Empty(),
- random.NextEnumValue());
+ "code");
}
private static SerializableTotalAssemblyResult CreateSerializableTotalAssembly(string totalAssemblyId)
Fisheye: Tag 73991051d9869bec831a714115eb8c635566fd4d refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismTypeCreatorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?