Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -rb11441e2bf7d3b169c51a56df1fd90016065784a -re3d3420a6ca00a55b1350691282eccb00c91d713
--- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision e3d3420a6ca00a55b1350691282eccb00c91d713)
@@ -70,7 +70,6 @@
private ClosingStructuresFailureMechanism closingStructures;
private PipingStructureFailureMechanism pipingStructure;
private StabilityPointStructuresFailureMechanism stabilityPointStructures;
- private StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstruction;
private DuneErosionFailureMechanism duneErosion;
private TechnicalInnovationFailureMechanism technicalInnovation;
private RoundedDouble failureProbabilityMarginFactor;
@@ -126,7 +125,6 @@
heightStructures = new HeightStructuresFailureMechanism();
closingStructures = new ClosingStructuresFailureMechanism();
stabilityPointStructures = new StabilityPointStructuresFailureMechanism();
- strengthStabilityLengthwiseConstruction = new StrengthStabilityLengthwiseConstructionFailureMechanism();
pipingStructure = new PipingStructureFailureMechanism();
duneErosion = new DuneErosionFailureMechanism();
technicalInnovation = new TechnicalInnovationFailureMechanism();
@@ -391,24 +389,6 @@
}
///
- /// Gets or sets the "Kunstwerken - Sterkte en stabiliteit langsconstructies" failure mechanism.
- ///
- /// Thrown when the contribution of
- /// is not equal to the contribution of the current failure mechanism.
- public StrengthStabilityLengthwiseConstructionFailureMechanism StrengthStabilityLengthwiseConstruction
- {
- get
- {
- return strengthStabilityLengthwiseConstruction;
- }
- set
- {
- ValidateContribution(strengthStabilityLengthwiseConstruction, value);
- strengthStabilityLengthwiseConstruction = value;
- }
- }
-
- ///
/// Gets or sets the "Duinafslag" failure mechanism.
///
/// Thrown when the contribution of
@@ -538,7 +518,6 @@
yield return ClosingStructures;
yield return PipingStructure;
yield return StabilityPointStructures;
- yield return StrengthStabilityLengthwiseConstruction;
yield return DuneErosion;
yield return TechnicalInnovation;
}
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionHelperTest.cs
===================================================================
diff -u -rd85530401d40e769244e163e9953d54ec604cf34 -re3d3420a6ca00a55b1350691282eccb00c91d713
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision d85530401d40e769244e163e9953d54ec604cf34)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision e3d3420a6ca00a55b1350691282eccb00c91d713)
@@ -96,7 +96,6 @@
assessmentSection => assessmentSection.GrassCoverSlipOffOutwards,
assessmentSection => assessmentSection.Microstability,
assessmentSection => assessmentSection.PipingStructure,
- assessmentSection => assessmentSection.StrengthStabilityLengthwiseConstruction,
assessmentSection => assessmentSection.TechnicalInnovation,
assessmentSection => assessmentSection.WaterPressureAsphaltCover
};
@@ -131,7 +130,6 @@
FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverSlipOffInwards, nrOfSections);
FailureMechanismTestHelper.AddSections(assessmentSection.PipingStructure, nrOfSections);
FailureMechanismTestHelper.AddSections(assessmentSection.WaterPressureAsphaltCover, nrOfSections);
- FailureMechanismTestHelper.AddSections(assessmentSection.StrengthStabilityLengthwiseConstruction, nrOfSections);
FailureMechanismTestHelper.AddSections(assessmentSection.TechnicalInnovation, nrOfSections);
return assessmentSection;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -rb11441e2bf7d3b169c51a56df1fd90016065784a -re3d3420a6ca00a55b1350691282eccb00c91d713
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision e3d3420a6ca00a55b1350691282eccb00c91d713)
@@ -99,7 +99,6 @@
Assert.NotNull(assessmentSection.ClosingStructures);
Assert.NotNull(assessmentSection.PipingStructure);
Assert.NotNull(assessmentSection.StabilityPointStructures);
- Assert.NotNull(assessmentSection.StrengthStabilityLengthwiseConstruction);
Assert.NotNull(assessmentSection.DuneErosion);
Assert.NotNull(assessmentSection.TechnicalInnovation);
@@ -236,7 +235,7 @@
IFailureMechanism[] failureMechanisms = assessmentSection.GetFailureMechanisms().ToArray();
// Assert
- Assert.AreEqual(17, failureMechanisms.Length);
+ Assert.AreEqual(16, failureMechanisms.Length);
CollectionAssert.AreEqual(new IFailureMechanism[]
{
assessmentSection.Piping,
@@ -253,7 +252,6 @@
assessmentSection.ClosingStructures,
assessmentSection.PipingStructure,
assessmentSection.StabilityPointStructures,
- assessmentSection.StrengthStabilityLengthwiseConstruction,
assessmentSection.DuneErosion,
assessmentSection.TechnicalInnovation
}, failureMechanisms);
@@ -705,9 +703,6 @@
yield return new FailureMechanismTestData((section, failureMechanism) => section.StabilityPointStructures = (StabilityPointStructuresFailureMechanism) failureMechanism,
new StabilityPointStructuresFailureMechanism(),
section => section.StabilityPointStructures);
- yield return new FailureMechanismTestData((section, failureMechanism) => section.StrengthStabilityLengthwiseConstruction = (StrengthStabilityLengthwiseConstructionFailureMechanism) failureMechanism,
- new StrengthStabilityLengthwiseConstructionFailureMechanism(),
- section => section.StrengthStabilityLengthwiseConstruction);
yield return new FailureMechanismTestData((section, failureMechanism) => section.DuneErosion = (DuneErosionFailureMechanism) failureMechanism,
new DuneErosionFailureMechanism(),
section => section.DuneErosion);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs
===================================================================
diff -u -rb11441e2bf7d3b169c51a56df1fd90016065784a -re3d3420a6ca00a55b1350691282eccb00c91d713
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision e3d3420a6ca00a55b1350691282eccb00c91d713)
@@ -49,7 +49,7 @@
[TestFixture]
public class ReferenceLineUpdateHandlerTest : NUnitFormTest
{
- private const int expectedNumberOfRemovedInstances = 223;
+ private const int expectedNumberOfRemovedInstances = 219;
[Test]
public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
@@ -206,7 +206,7 @@
IObservable[] observables = handler.Update(assessmentSection.ReferenceLine, referenceLine).ToArray();
// Assert
- Assert.AreEqual(73, observables.Length);
+ Assert.AreEqual(71, observables.Length);
PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping;
CollectionAssert.IsEmpty(pipingFailureMechanism.Sections);
@@ -368,12 +368,6 @@
CollectionAssert.Contains(observables, grassCoverSlipOffInwardsFailureMechanism.SectionResultsOld);
CollectionAssert.Contains(observables, grassCoverSlipOffInwardsFailureMechanism.SectionResults);
- StrengthStabilityLengthwiseConstructionFailureMechanism stabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction;
- CollectionAssert.IsEmpty(stabilityLengthwiseConstructionFailureMechanism.Sections);
- CollectionAssert.IsEmpty(stabilityLengthwiseConstructionFailureMechanism.SectionResultsOld);
- CollectionAssert.Contains(observables, stabilityLengthwiseConstructionFailureMechanism);
- CollectionAssert.Contains(observables, stabilityLengthwiseConstructionFailureMechanism.SectionResultsOld);
-
PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure;
CollectionAssert.IsEmpty(pipingStructureFailureMechanism.Sections);
CollectionAssert.IsEmpty(pipingStructureFailureMechanism.SectionResultsOld);
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -rb11441e2bf7d3b169c51a56df1fd90016065784a -re3d3420a6ca00a55b1350691282eccb00c91d713
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision e3d3420a6ca00a55b1350691282eccb00c91d713)
@@ -1031,10 +1031,6 @@
CollectionAssert.IsEmpty(grassCoverSlipOffInwardsFailureMechanism.Sections);
CollectionAssert.IsEmpty(grassCoverSlipOffInwardsFailureMechanism.SectionResultsOld);
- StrengthStabilityLengthwiseConstructionFailureMechanism stabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction;
- CollectionAssert.IsEmpty(stabilityLengthwiseConstructionFailureMechanism.Sections);
- CollectionAssert.IsEmpty(stabilityLengthwiseConstructionFailureMechanism.SectionResultsOld);
-
PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure;
CollectionAssert.IsEmpty(pipingStructureFailureMechanism.Sections);
CollectionAssert.IsEmpty(pipingStructureFailureMechanism.SectionResultsOld);
@@ -1667,7 +1663,7 @@
private static void AssertChangedObjects(ClearResults results, AssessmentSection assessmentSection)
{
IObservable[] changedObjects = results.ChangedObjects.ToArray();
- Assert.AreEqual(73, changedObjects.Length);
+ Assert.AreEqual(71, changedObjects.Length);
PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping;
CollectionAssert.Contains(changedObjects, pipingFailureMechanism);
@@ -1763,10 +1759,6 @@
CollectionAssert.Contains(changedObjects, grassCoverSlipOffInwardsFailureMechanism.SectionResultsOld);
CollectionAssert.Contains(changedObjects, grassCoverSlipOffInwardsFailureMechanism.SectionResults);
- StrengthStabilityLengthwiseConstructionFailureMechanism stabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction;
- CollectionAssert.Contains(changedObjects, stabilityLengthwiseConstructionFailureMechanism);
- CollectionAssert.Contains(changedObjects, stabilityLengthwiseConstructionFailureMechanism.SectionResultsOld);
-
PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure;
CollectionAssert.Contains(changedObjects, pipingStructureFailureMechanism);
CollectionAssert.Contains(changedObjects, pipingStructureFailureMechanism.SectionResultsOld);
@@ -1794,7 +1786,6 @@
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.ClosingStructures));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.PipingStructure));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.StabilityPointStructures));
- expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLineOld(assessmentSection.StrengthStabilityLengthwiseConstruction));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.DuneErosion));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLineOld(assessmentSection.TechnicalInnovation));
return expectedRemovedObjects;
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -rb11441e2bf7d3b169c51a56df1fd90016065784a -re3d3420a6ca00a55b1350691282eccb00c91d713
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision e3d3420a6ca00a55b1350691282eccb00c91d713)
@@ -125,7 +125,6 @@
SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards);
SetFullyConfiguredFailureMechanism(assessmentSection.Microstability);
SetFullyConfiguredFailureMechanism(assessmentSection.PipingStructure);
- SetFullyConfiguredFailureMechanism(assessmentSection.StrengthStabilityLengthwiseConstruction);
SetFullyConfiguredFailureMechanism(assessmentSection.TechnicalInnovation);
SetFullyConfiguredFailureMechanism(assessmentSection.WaterPressureAsphaltCover);