Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs
===================================================================
diff -u -r4e57db022ed85b0cbab5c10bad88ca5e2e65cb27 -r0d1eb93c536da17bfb1fd47333cc48e9179159f0
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 4e57db022ed85b0cbab5c10bad88ca5e2e65cb27)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0)
@@ -192,14 +192,13 @@
///
/// The assessment section that contains all
/// the failure mechanism sections to assemble.
- /// Indicator that determines whether the manual assembly should be considered when assembling the result.
/// A collection of .
/// Thrown when
/// is null.
/// Thrown when a
/// cannot be created.
- public static IEnumerable AssembleCombinedPerFailureMechanismSection(AssessmentSection assessmentSection,
- bool useManual)
+ public static IEnumerable AssembleCombinedPerFailureMechanismSection(
+ AssessmentSection assessmentSection)
{
if (assessmentSection == null)
{
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/AssessmentSectionAssemblyMapDataFeaturesFactory.cs
===================================================================
diff -u -r51a9a64a04bdf97edd25582d530ff2ac10a00932 -r0d1eb93c536da17bfb1fd47333cc48e9179159f0
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/AssessmentSectionAssemblyMapDataFeaturesFactory.cs (.../AssessmentSectionAssemblyMapDataFeaturesFactory.cs) (revision 51a9a64a04bdf97edd25582d530ff2ac10a00932)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/AssessmentSectionAssemblyMapDataFeaturesFactory.cs (.../AssessmentSectionAssemblyMapDataFeaturesFactory.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0)
@@ -58,8 +58,7 @@
IEnumerable assemblyResults;
try
{
- assemblyResults =
- AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, true);
+ assemblyResults = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
}
catch (AssemblyException)
{
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs
===================================================================
diff -u -r4ff827282554bc339864509448168e765c7e3cb9 -r0d1eb93c536da17bfb1fd47333cc48e9179159f0
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 4ff827282554bc339864509448168e765c7e3cb9)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0)
@@ -201,7 +201,7 @@
try
{
- dataGridViewControl.SetDataSource(AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(AssessmentSection, true)
+ dataGridViewControl.SetDataSource(AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(AssessmentSection)
.Select(r => new CombinedFailureMechanismSectionAssemblyResultRow(r))
.ToArray());
}
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs
===================================================================
diff -u -r4e57db022ed85b0cbab5c10bad88ca5e2e65cb27 -r0d1eb93c536da17bfb1fd47333cc48e9179159f0
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 4e57db022ed85b0cbab5c10bad88ca5e2e65cb27)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0)
@@ -768,7 +768,7 @@
public void AssembleCombinedPerFailureMechanismSection_AssessmentSectionNull_ThrowsArgumentNullException()
{
// Call
- void Call() => AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(null, new Random(39).NextBoolean());
+ void Call() => AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(null);
// Assert
var exception = Assert.Throws(Call);
@@ -789,7 +789,7 @@
calculator.CombinedFailureMechanismSectionAssemblyOutput = Array.Empty();
// Call
- AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, random.NextBoolean());
+ AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
// Assert
IEnumerable[] actualInput = calculator.CombinedFailureMechanismSectionsInput.ToArray();
@@ -831,8 +831,8 @@
};
// Call
- CombinedFailureMechanismSectionAssemblyResult[] output = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection,
- random.NextBoolean())
+ CombinedFailureMechanismSectionAssemblyResult[] output = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(
+ assessmentSection)
.ToArray();
// Assert
@@ -887,7 +887,7 @@
calculator.ThrowExceptionOnCalculate = true;
// Call
- void Call() => AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, random.NextBoolean());
+ void Call() => AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
// Assert
var exception = Assert.Throws(Call);
@@ -912,7 +912,7 @@
calculator.ThrowExceptionOnCalculate = true;
// Call
- void Call() => AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, random.NextBoolean());
+ void Call() => AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
// Assert
var exception = Assert.Throws(Call);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r51a9a64a04bdf97edd25582d530ff2ac10a00932 -r0d1eb93c536da17bfb1fd47333cc48e9179159f0
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs (.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs) (revision 51a9a64a04bdf97edd25582d530ff2ac10a00932)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs (.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0)
@@ -84,7 +84,7 @@
// Assert
IEnumerable expectedAssemblyResults =
- AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, true);
+ AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
int expectedNrOfResults = expectedAssemblyResults.Count();
Assert.AreEqual(expectedNrOfResults, features.Count());
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs
===================================================================
diff -u -r7e1401efb8abae242369b43140afcd456e6e529a -r0d1eb93c536da17bfb1fd47333cc48e9179159f0
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs (.../AssemblyResultPerSectionMapViewTest.cs) (revision 7e1401efb8abae242369b43140afcd456e6e529a)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs (.../AssemblyResultPerSectionMapViewTest.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0)
@@ -162,7 +162,7 @@
Assert.AreEqual(3, mapData.Collection.Count());
IEnumerable expectedResults =
- AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, true);
+ AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
AssertCombinedFailureMechanismSectionAssemblyResultMapData(expectedResults,
assessmentSection.ReferenceLine,
@@ -273,7 +273,7 @@
mocks.ReplayAll();
IEnumerable expectedResults =
- AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, true);
+ AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
AssertCombinedFailureMechanismSectionAssemblyResultMapData(expectedResults,
assessmentSection.ReferenceLine,
@@ -288,7 +288,7 @@
failureMechanisms.ElementAt(random.Next(failureMechanisms.Count())).NotifyObservers();
// Then
- expectedResults = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, true);
+ expectedResults = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
AssertCombinedFailureMechanismSectionAssemblyResultMapData(expectedResults,
assessmentSection.ReferenceLine,
mapData.Collection.ElementAt(assemblyResultsIndex));
@@ -324,7 +324,7 @@
mocks.ReplayAll();
IEnumerable expectedResults =
- AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, true);
+ AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
AssertCombinedFailureMechanismSectionAssemblyResultMapData(expectedResults,
assessmentSection.ReferenceLine,
@@ -338,7 +338,7 @@
assessmentSection.NotifyObservers();
// Then
- expectedResults = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, true);
+ expectedResults = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection);
AssertCombinedFailureMechanismSectionAssemblyResultMapData(expectedResults,
assessmentSection.ReferenceLine,
mapData.Collection.ElementAt(assemblyResultsIndex));