Index: Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs
===================================================================
diff -u -ra0404ba256ba7bc2184c57d04237c98718c272b4 -r60c65d3676b15908531c1df11a1e543e3b3e4b7d
--- Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision a0404ba256ba7bc2184c57d04237c98718c272b4)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision 60c65d3676b15908531c1df11a1e543e3b3e4b7d)
@@ -37,7 +37,7 @@
/// The container of the properties for the
/// .
/// Thrown when any parameter is null.
- /// Thrown when is null.
+ /// Thrown when is null.
public AssessmentSectionMergeData(AssessmentSection assessmentSection,
ConstructionProperties properties)
{
@@ -51,9 +51,9 @@
throw new ArgumentNullException(nameof(properties));
}
- if (properties.MergeFailurePaths == null)
+ if (properties.MergeSpecificFailurePaths == null)
{
- throw new ArgumentException("MergeFailurePaths must be set");
+ throw new ArgumentException($"{nameof(properties.MergeSpecificFailurePaths)} must be set");
}
AssessmentSection = assessmentSection;
@@ -76,7 +76,7 @@
MergeStrengthStabilityLengthwiseConstruction = properties.MergeStrengthStabilityLengthwiseConstruction;
MergeDuneErosion = properties.MergeDuneErosion;
MergeTechnicalInnovation = properties.MergeTechnicalInnovation;
- MergeFailurePaths = properties.MergeFailurePaths;
+ MergeSpecificFailurePaths = properties.MergeSpecificFailurePaths;
}
///
@@ -175,9 +175,9 @@
public bool MergeTechnicalInnovation { get; }
///
- /// Gets the collection of failure paths that should be merged.
+ /// Gets the collection of specific failure paths that should be merged.
///
- public IEnumerable MergeFailurePaths { get; }
+ public IEnumerable MergeSpecificFailurePaths { get; }
///
/// Container for properties for constructing an .
@@ -275,9 +275,9 @@
public bool MergeTechnicalInnovation { internal get; set; }
///
- /// Gets or sets the collection of failure paths that should be merged.
+ /// Gets or sets the collection of specific failure paths that should be merged.
///
- public IEnumerable MergeFailurePaths { internal get; set; }
+ public IEnumerable MergeSpecificFailurePaths { internal get; set; }
}
}
}
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs
===================================================================
diff -u -rf5ae787df2002236c35a3d92c15da0213fd9db38 -r60c65d3676b15908531c1df11a1e543e3b3e4b7d
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision f5ae787df2002236c35a3d92c15da0213fd9db38)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 60c65d3676b15908531c1df11a1e543e3b3e4b7d)
@@ -103,7 +103,7 @@
MergeStrengthStabilityLengthwiseConstruction = FailureMechanismIsSelectedToMerge(),
MergeDuneErosion = FailureMechanismIsSelectedToMerge(),
MergeTechnicalInnovation = FailureMechanismIsSelectedToMerge(),
- MergeFailurePaths = GetSelectedFailurePathsToMerge()
+ MergeSpecificFailurePaths = GetSelectedSpecificFailurePathsToMerge()
};
return new AssessmentSectionMergeData((AssessmentSection) assessmentSectionComboBox.SelectedItem,
@@ -153,7 +153,7 @@
return failurePathMergeDataRows.Any(row => row.FailurePath is TFailureMechanism && row.IsSelected);
}
- private IEnumerable GetSelectedFailurePathsToMerge()
+ private IEnumerable GetSelectedSpecificFailurePathsToMerge()
{
return failurePathMergeDataRows.Where(row => row.IsSelected && !(row.FailurePath is IFailureMechanism))
.Select(row => row.FailurePath);
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs
===================================================================
diff -u -r53bd4444fd558b6b38dacaeed9e100ea26e60006 -r60c65d3676b15908531c1df11a1e543e3b3e4b7d
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 53bd4444fd558b6b38dacaeed9e100ea26e60006)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 60c65d3676b15908531c1df11a1e543e3b3e4b7d)
@@ -75,7 +75,7 @@
changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection, mergeData.AssessmentSection));
MergeFailureMechanisms(targetAssessmentSection, mergeData);
- MergeSpecificFailurePaths(targetAssessmentSection, mergeData.MergeFailurePaths);
+ MergeSpecificFailurePaths(targetAssessmentSection, mergeData.MergeSpecificFailurePaths);
AfterMerge(changedObjects);
}
@@ -88,9 +88,9 @@
private static void ValidateMergeData(AssessmentSectionMergeData mergeData)
{
AssessmentSection sourceAssessmentSection = mergeData.AssessmentSection;
- if (!mergeData.MergeFailurePaths.All(fp => sourceAssessmentSection.SpecificFailurePaths.Contains(fp)))
+ if (!mergeData.MergeSpecificFailurePaths.All(fp => sourceAssessmentSection.SpecificFailurePaths.Contains(fp)))
{
- throw new ArgumentException($"{nameof(AssessmentSectionMergeData.MergeFailurePaths)} must contain items of " +
+ throw new ArgumentException($"{nameof(AssessmentSectionMergeData.MergeSpecificFailurePaths)} must contain items of " +
$"the assessment section in {nameof(mergeData)}.");
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs
===================================================================
diff -u -ra0404ba256ba7bc2184c57d04237c98718c272b4 -r60c65d3676b15908531c1df11a1e543e3b3e4b7d
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs (.../AssessmentSectionMergeDataTest.cs) (revision a0404ba256ba7bc2184c57d04237c98718c272b4)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs (.../AssessmentSectionMergeDataTest.cs) (revision 60c65d3676b15908531c1df11a1e543e3b3e4b7d)
@@ -64,7 +64,7 @@
var mergeData = new AssessmentSectionMergeData(assessmentSection,
new AssessmentSectionMergeData.ConstructionProperties
{
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
});
// Assert
@@ -117,7 +117,7 @@
MergeStrengthStabilityLengthwiseConstruction = random.NextBoolean(),
MergeDuneErosion = random.NextBoolean(),
MergeTechnicalInnovation = random.NextBoolean(),
- MergeFailurePaths = failurePaths
+ MergeSpecificFailurePaths = failurePaths
};
// Call
@@ -143,7 +143,7 @@
Assert.AreEqual(constructionProperties.MergeStrengthStabilityLengthwiseConstruction, mergeData.MergeStrengthStabilityLengthwiseConstruction);
Assert.AreEqual(constructionProperties.MergeDuneErosion, mergeData.MergeDuneErosion);
Assert.AreEqual(constructionProperties.MergeTechnicalInnovation, mergeData.MergeTechnicalInnovation);
- Assert.AreSame(constructionProperties.MergeFailurePaths, mergeData.MergeFailurePaths);
+ Assert.AreSame(constructionProperties.MergeSpecificFailurePaths, mergeData.MergeSpecificFailurePaths);
}
[Test]
@@ -154,7 +154,7 @@
new AssessmentSectionMergeData.ConstructionProperties());
// Assert
- const string expectedMessage = "MergeFailurePaths must be set";
+ const string expectedMessage = "MergeSpecificFailurePaths must be set";
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage);
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs
===================================================================
diff -u -rf5ae787df2002236c35a3d92c15da0213fd9db38 -r60c65d3676b15908531c1df11a1e543e3b3e4b7d
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision f5ae787df2002236c35a3d92c15da0213fd9db38)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 60c65d3676b15908531c1df11a1e543e3b3e4b7d)
@@ -346,7 +346,7 @@
Assert.IsFalse(result.MergeStrengthStabilityLengthwiseConstruction);
Assert.IsFalse(result.MergeDuneErosion);
Assert.IsFalse(result.MergeTechnicalInnovation);
- CollectionAssert.IsEmpty(result.MergeFailurePaths);
+ CollectionAssert.IsEmpty(result.MergeSpecificFailurePaths);
}
}
@@ -410,7 +410,7 @@
Assert.IsTrue(result.MergeStrengthStabilityLengthwiseConstruction);
Assert.IsTrue(result.MergeDuneErosion);
Assert.IsTrue(result.MergeTechnicalInnovation);
- CollectionAssert.AreEqual(selectedAssessmentSection.SpecificFailurePaths, result.MergeFailurePaths);
+ CollectionAssert.AreEqual(selectedAssessmentSection.SpecificFailurePaths, result.MergeSpecificFailurePaths);
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -r53bd4444fd558b6b38dacaeed9e100ea26e60006 -r60c65d3676b15908531c1df11a1e543e3b3e4b7d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 53bd4444fd558b6b38dacaeed9e100ea26e60006)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 60c65d3676b15908531c1df11a1e543e3b3e4b7d)
@@ -118,7 +118,7 @@
MergeStrengthStabilityLengthwiseConstruction = true,
MergeDuneErosion = true,
MergeTechnicalInnovation = true,
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
});
// Call
@@ -209,7 +209,7 @@
MergeStrengthStabilityLengthwiseConstruction = true,
MergeDuneErosion = true,
MergeTechnicalInnovation = true,
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
}));
// Assert
@@ -263,7 +263,7 @@
var mergeData = new AssessmentSectionMergeData(sourceAssessmentSection,
new AssessmentSectionMergeData.ConstructionProperties
{
- MergeFailurePaths = failurePathsToMerge
+ MergeSpecificFailurePaths = failurePathsToMerge
});
// Call
@@ -299,7 +299,7 @@
var mergeData = new AssessmentSectionMergeData(sourceAssessmentSection,
new AssessmentSectionMergeData.ConstructionProperties
{
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
});
// Call
@@ -325,14 +325,14 @@
var mergeData = new AssessmentSectionMergeData(sourceAssessmentSection,
new AssessmentSectionMergeData.ConstructionProperties
{
- MergeFailurePaths = failurePathsToMerge
+ MergeSpecificFailurePaths = failurePathsToMerge
});
// Call
void Call() => handler.PerformMerge(targetAssessmentSection, mergeData);
// Assert
- const string expectedMessage = "MergeFailurePaths must contain items of the assessment section in mergeData.";
+ const string expectedMessage = "MergeSpecificFailurePaths must contain items of the assessment section in mergeData.";
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage);
}
@@ -366,7 +366,7 @@
var mergeData = new AssessmentSectionMergeData(sourceAssessmentSection,
new AssessmentSectionMergeData.ConstructionProperties
{
- MergeFailurePaths = failurePathsToMerge
+ MergeSpecificFailurePaths = failurePathsToMerge
});
// Call
@@ -484,7 +484,7 @@
MergeHeightStructures = true,
MergeClosingStructures = true,
MergeStabilityPointStructures = true,
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
}));
// Then
@@ -545,7 +545,7 @@
{
return new AssessmentSectionMergeData.ConstructionProperties
{
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
};
}
@@ -909,7 +909,7 @@
MergeHeightStructures = false,
MergeClosingStructures = false,
MergeStabilityPointStructures = false,
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
}));
// Then
@@ -972,7 +972,7 @@
MergeHeightStructures = false,
MergeClosingStructures = false,
MergeStabilityPointStructures = false,
- MergeFailurePaths = Enumerable.Empty()
+ MergeSpecificFailurePaths = Enumerable.Empty()
}));
// Then