Index: Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs
===================================================================
diff -u -r544db932c9fceb40ee7347da0b586a03fca16e69 -rbdddac9b033b41f1f4fb75a87875e98bf189d314
--- Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision 544db932c9fceb40ee7347da0b586a03fca16e69)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision bdddac9b033b41f1f4fb75a87875e98bf189d314)
@@ -66,7 +66,6 @@
MergeClosingStructures = properties.MergeClosingStructures;
MergePipingStructure = properties.MergePipingStructure;
MergeStabilityPointStructures = properties.MergeStabilityPointStructures;
- MergeStrengthStabilityLengthwiseConstruction = properties.MergeStrengthStabilityLengthwiseConstruction;
MergeDuneErosion = properties.MergeDuneErosion;
MergeTechnicalInnovation = properties.MergeTechnicalInnovation;
MergeSpecificFailurePaths = properties.MergeSpecificFailurePaths;
@@ -148,11 +147,6 @@
public bool MergeStabilityPointStructures { get; }
///
- /// Gets the indicator whether strength stability lengthwise construction should be merged.
- ///
- public bool MergeStrengthStabilityLengthwiseConstruction { get; }
-
- ///
/// Gets the indicator whether dune erosion should be merged.
///
public bool MergeDuneErosion { get; }
@@ -243,11 +237,6 @@
public bool MergeStabilityPointStructures { internal get; set; }
///
- /// Gets or sets the indicator whether strength stability lengthwise construction should be merged.
- ///
- public bool MergeStrengthStabilityLengthwiseConstruction { internal get; set; }
-
- ///
/// Gets or sets the indicator whether dune erosion should be merged.
///
public bool MergeDuneErosion { internal get; set; }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs
===================================================================
diff -u -r0aac83ae84c097520ec172d11191830280f666df -rbdddac9b033b41f1f4fb75a87875e98bf189d314
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 0aac83ae84c097520ec172d11191830280f666df)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision bdddac9b033b41f1f4fb75a87875e98bf189d314)
@@ -93,7 +93,6 @@
MergeClosingStructures = FailureMechanismIsSelectedToMerge(),
MergePipingStructure = FailureMechanismIsSelectedToMerge(),
MergeStabilityPointStructures = FailureMechanismIsSelectedToMerge(),
- MergeStrengthStabilityLengthwiseConstruction = FailureMechanismIsSelectedToMerge(),
MergeDuneErosion = FailureMechanismIsSelectedToMerge(),
MergeTechnicalInnovation = FailureMechanismIsSelectedToMerge()
};
@@ -167,7 +166,6 @@
new FailureMechanismMergeDataRow(assessmentSection.ClosingStructures),
new FailureMechanismMergeDataRow(assessmentSection.PipingStructure),
new FailureMechanismMergeDataRow(assessmentSection.StabilityPointStructures),
- new FailureMechanismMergeDataRow(assessmentSection.StrengthStabilityLengthwiseConstruction),
new FailureMechanismMergeDataRow(assessmentSection.DuneErosion),
new FailureMechanismMergeDataRow(assessmentSection.TechnicalInnovation)
}
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs
===================================================================
diff -u -r544db932c9fceb40ee7347da0b586a03fca16e69 -rbdddac9b033b41f1f4fb75a87875e98bf189d314
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 544db932c9fceb40ee7347da0b586a03fca16e69)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision bdddac9b033b41f1f4fb75a87875e98bf189d314)
@@ -366,12 +366,6 @@
LogMergeMessage(targetAssessmentSection.StabilityPointStructures);
}
- if (mergeData.MergeStrengthStabilityLengthwiseConstruction)
- {
- targetAssessmentSection.StrengthStabilityLengthwiseConstruction = sourceAssessmentSection.StrengthStabilityLengthwiseConstruction;
- LogMergeMessage(targetAssessmentSection.StrengthStabilityLengthwiseConstruction);
- }
-
if (mergeData.MergeDuneErosion)
{
targetAssessmentSection.DuneErosion = sourceAssessmentSection.DuneErosion;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs
===================================================================
diff -u -r544db932c9fceb40ee7347da0b586a03fca16e69 -rbdddac9b033b41f1f4fb75a87875e98bf189d314
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs (.../AssessmentSectionMergeDataTest.cs) (revision 544db932c9fceb40ee7347da0b586a03fca16e69)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs (.../AssessmentSectionMergeDataTest.cs) (revision bdddac9b033b41f1f4fb75a87875e98bf189d314)
@@ -78,7 +78,6 @@
Assert.IsFalse(mergeData.MergeClosingStructures);
Assert.IsFalse(mergeData.MergePipingStructure);
Assert.IsFalse(mergeData.MergeStabilityPointStructures);
- Assert.IsFalse(mergeData.MergeStrengthStabilityLengthwiseConstruction);
Assert.IsFalse(mergeData.MergeDuneErosion);
Assert.IsFalse(mergeData.MergeTechnicalInnovation);
CollectionAssert.IsEmpty(mergeData.MergeSpecificFailurePaths);
@@ -107,7 +106,6 @@
MergeClosingStructures = random.NextBoolean(),
MergePipingStructure = random.NextBoolean(),
MergeStabilityPointStructures = random.NextBoolean(),
- MergeStrengthStabilityLengthwiseConstruction = random.NextBoolean(),
MergeDuneErosion = random.NextBoolean(),
MergeTechnicalInnovation = random.NextBoolean()
};
@@ -131,7 +129,6 @@
Assert.AreEqual(constructionProperties.MergeClosingStructures, mergeData.MergeClosingStructures);
Assert.AreEqual(constructionProperties.MergePipingStructure, mergeData.MergePipingStructure);
Assert.AreEqual(constructionProperties.MergeStabilityPointStructures, mergeData.MergeStabilityPointStructures);
- Assert.AreEqual(constructionProperties.MergeStrengthStabilityLengthwiseConstruction, mergeData.MergeStrengthStabilityLengthwiseConstruction);
Assert.AreEqual(constructionProperties.MergeDuneErosion, mergeData.MergeDuneErosion);
Assert.AreEqual(constructionProperties.MergeTechnicalInnovation, mergeData.MergeTechnicalInnovation);
Assert.AreSame(constructionProperties.MergeSpecificFailurePaths, mergeData.MergeSpecificFailurePaths);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs
===================================================================
diff -u -rb11441e2bf7d3b169c51a56df1fd90016065784a -rbdddac9b033b41f1f4fb75a87875e98bf189d314
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision bdddac9b033b41f1f4fb75a87875e98bf189d314)
@@ -293,7 +293,6 @@
Assert.IsFalse(result.MergeClosingStructures);
Assert.IsFalse(result.MergePipingStructure);
Assert.IsFalse(result.MergeStabilityPointStructures);
- Assert.IsFalse(result.MergeStrengthStabilityLengthwiseConstruction);
Assert.IsFalse(result.MergeDuneErosion);
Assert.IsFalse(result.MergeTechnicalInnovation);
CollectionAssert.IsEmpty(result.MergeSpecificFailurePaths);
@@ -349,7 +348,6 @@
Assert.IsTrue(result.MergeClosingStructures);
Assert.IsTrue(result.MergePipingStructure);
Assert.IsTrue(result.MergeStabilityPointStructures);
- Assert.IsTrue(result.MergeStrengthStabilityLengthwiseConstruction);
Assert.IsTrue(result.MergeDuneErosion);
Assert.IsTrue(result.MergeTechnicalInnovation);
CollectionAssert.AreEqual(assessmentSection.SpecificFailurePaths, result.MergeSpecificFailurePaths);
@@ -372,9 +370,8 @@
AssertDataGridViewRow(expectedAssessmentSection.ClosingStructures, rows[11].Cells);
AssertDataGridViewRow(expectedAssessmentSection.PipingStructure, rows[12].Cells);
AssertDataGridViewRow(expectedAssessmentSection.StabilityPointStructures, rows[13].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.StrengthStabilityLengthwiseConstruction, rows[14].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.DuneErosion, rows[15].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.TechnicalInnovation, rows[16].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.DuneErosion, rows[14].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.TechnicalInnovation, rows[15].Cells);
}
private static void AssertFailurePathRows(AssessmentSection expectedAssessmentSection, DataGridViewRowCollection rows)
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -reba59b7a97c3268457dd9a939280fe45cfc5b0ac -rbdddac9b033b41f1f4fb75a87875e98bf189d314
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision eba59b7a97c3268457dd9a939280fe45cfc5b0ac)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision bdddac9b033b41f1f4fb75a87875e98bf189d314)
@@ -115,7 +115,6 @@
MergeClosingStructures = true,
MergePipingStructure = true,
MergeStabilityPointStructures = true,
- MergeStrengthStabilityLengthwiseConstruction = true,
MergeDuneErosion = true,
MergeTechnicalInnovation = true
});
@@ -138,7 +137,6 @@
Assert.AreSame(sourceAssessmentSection.ClosingStructures, targetAssessmentSection.ClosingStructures);
Assert.AreSame(sourceAssessmentSection.PipingStructure, targetAssessmentSection.PipingStructure);
Assert.AreSame(sourceAssessmentSection.StabilityPointStructures, targetAssessmentSection.StabilityPointStructures);
- Assert.AreSame(sourceAssessmentSection.StrengthStabilityLengthwiseConstruction, targetAssessmentSection.StrengthStabilityLengthwiseConstruction);
Assert.AreSame(sourceAssessmentSection.DuneErosion, targetAssessmentSection.DuneErosion);
Assert.AreSame(sourceAssessmentSection.TechnicalInnovation, targetAssessmentSection.TechnicalInnovation);
}
@@ -171,7 +169,6 @@
Assert.AreNotSame(sourceAssessmentSection.ClosingStructures, targetAssessmentSection.ClosingStructures);
Assert.AreNotSame(sourceAssessmentSection.PipingStructure, targetAssessmentSection.PipingStructure);
Assert.AreNotSame(sourceAssessmentSection.StabilityPointStructures, targetAssessmentSection.StabilityPointStructures);
- Assert.AreNotSame(sourceAssessmentSection.StrengthStabilityLengthwiseConstruction, targetAssessmentSection.StrengthStabilityLengthwiseConstruction);
Assert.AreNotSame(sourceAssessmentSection.DuneErosion, targetAssessmentSection.DuneErosion);
Assert.AreNotSame(sourceAssessmentSection.TechnicalInnovation, targetAssessmentSection.TechnicalInnovation);
}
@@ -202,7 +199,6 @@
MergeClosingStructures = true,
MergePipingStructure = true,
MergeStabilityPointStructures = true,
- MergeStrengthStabilityLengthwiseConstruction = true,
MergeDuneErosion = true,
MergeTechnicalInnovation = true
}));
@@ -211,7 +207,7 @@
TestHelper.AssertLogMessages(Call, messages =>
{
string[] msgs = messages.ToArray();
- Assert.AreEqual(18, msgs.Length);
+ Assert.AreEqual(17, msgs.Length);
Assert.AreEqual("Gegevens van het generieke faalpad 'Piping' zijn vervangen.", msgs[1]);
Assert.AreEqual("Gegevens van het generieke faalpad 'Grasbekleding erosie kruin en binnentalud' zijn vervangen.", msgs[2]);
Assert.AreEqual("Gegevens van het generieke faalpad 'Macrostabiliteit binnenwaarts' zijn vervangen.", msgs[3]);
@@ -226,9 +222,8 @@
Assert.AreEqual("Gegevens van het generieke faalpad 'Betrouwbaarheid sluiting kunstwerk' zijn vervangen.", msgs[12]);
Assert.AreEqual("Gegevens van het generieke faalpad 'Kunstwerken - Piping bij kunstwerk' zijn vervangen.", msgs[13]);
Assert.AreEqual("Gegevens van het generieke faalpad 'Sterkte en stabiliteit puntconstructies' zijn vervangen.", msgs[14]);
- Assert.AreEqual("Gegevens van het generieke faalpad 'Kunstwerken - Sterkte en stabiliteit langsconstructies' zijn vervangen.", msgs[15]);
- Assert.AreEqual("Gegevens van het generieke faalpad 'Duinafslag' zijn vervangen.", msgs[16]);
- Assert.AreEqual("Gegevens van het generieke faalpad 'Technische innovaties - Technische innovaties' zijn vervangen.", msgs[17]);
+ Assert.AreEqual("Gegevens van het generieke faalpad 'Duinafslag' zijn vervangen.", msgs[15]);
+ Assert.AreEqual("Gegevens van het generieke faalpad 'Technische innovaties - Technische innovaties' zijn vervangen.", msgs[16]);
});
}