Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -r3192f0b781afb4da048556c46e1b78c4079d05e4 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 3192f0b781afb4da048556c46e1b78c4079d05e4)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -59,7 +59,6 @@
private PipingFailureMechanism piping;
private GrassCoverErosionInwardsFailureMechanism grassCoverErosionInwards;
private MacroStabilityInwardsFailureMechanism macroStabilityInwards;
- private MacroStabilityOutwardsFailureMechanism macroStabilityOutwards;
private MicrostabilityFailureMechanism microstability;
private StabilityStoneCoverFailureMechanism stabilityStoneCover;
private WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCover;
@@ -117,7 +116,6 @@
piping = new PipingFailureMechanism();
grassCoverErosionInwards = new GrassCoverErosionInwardsFailureMechanism();
macroStabilityInwards = new MacroStabilityInwardsFailureMechanism();
- macroStabilityOutwards = new MacroStabilityOutwardsFailureMechanism();
microstability = new MicrostabilityFailureMechanism();
stabilityStoneCover = new StabilityStoneCoverFailureMechanism();
waveImpactAsphaltCover = new WaveImpactAsphaltCoverFailureMechanism();
@@ -195,24 +193,6 @@
}
///
- /// Gets or sets the "Dijken en dammen - Macrostabiliteit buitenwaarts" failure mechanism.
- ///
- /// Thrown when the contribution of
- /// is not equal to the contribution of the current failure mechanism.
- public MacroStabilityOutwardsFailureMechanism MacroStabilityOutwards
- {
- get
- {
- return macroStabilityOutwards;
- }
- set
- {
- ValidateContribution(macroStabilityOutwards, value);
- macroStabilityOutwards = value;
- }
- }
-
- ///
/// Gets or sets the "Dijken en dammen - Microstabiliteit" failure mechanism.
///
/// Thrown when the contribution of
@@ -547,7 +527,6 @@
yield return Piping;
yield return GrassCoverErosionInwards;
yield return MacroStabilityInwards;
- yield return MacroStabilityOutwards;
yield return Microstability;
yield return StabilityStoneCover;
yield return WaveImpactAsphaltCover;
@@ -600,7 +579,6 @@
Piping.Contribution = 24;
GrassCoverErosionInwards.Contribution = 24;
MacroStabilityInwards.Contribution = 4;
- MacroStabilityOutwards.Contribution = 4;
StabilityStoneCover.Contribution = 5;
WaveImpactAsphaltCover.Contribution = 5;
GrassCoverErosionOutwards.Contribution = 5;
@@ -616,7 +594,6 @@
Piping.Contribution = 0;
GrassCoverErosionInwards.Contribution = 0;
MacroStabilityInwards.Contribution = 0;
- MacroStabilityOutwards.Contribution = 4;
StabilityStoneCover.Contribution = 0;
WaveImpactAsphaltCover.Contribution = 0;
GrassCoverErosionOutwards.Contribution = 0;
@@ -632,7 +609,6 @@
Piping.Contribution = 24;
GrassCoverErosionInwards.Contribution = 24;
MacroStabilityInwards.Contribution = 4;
- MacroStabilityOutwards.Contribution = 4;
StabilityStoneCover.Contribution = 5;
WaveImpactAsphaltCover.Contribution = 5;
GrassCoverErosionOutwards.Contribution = 5;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -r354e43927c20c4e341db023e0d5fefe3aa6026c4 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 354e43927c20c4e341db023e0d5fefe3aa6026c4)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -88,7 +88,6 @@
Assert.NotNull(assessmentSection.Piping);
Assert.NotNull(assessmentSection.GrassCoverErosionInwards);
Assert.NotNull(assessmentSection.MacroStabilityInwards);
- Assert.NotNull(assessmentSection.MacroStabilityOutwards);
Assert.NotNull(assessmentSection.Microstability);
Assert.NotNull(assessmentSection.StabilityStoneCover);
Assert.NotNull(assessmentSection.WaveImpactAsphaltCover);
@@ -237,13 +236,12 @@
IFailureMechanism[] failureMechanisms = assessmentSection.GetFailureMechanisms().ToArray();
// Assert
- Assert.AreEqual(18, failureMechanisms.Length);
+ Assert.AreEqual(17, failureMechanisms.Length);
CollectionAssert.AreEqual(new IFailureMechanism[]
{
assessmentSection.Piping,
assessmentSection.GrassCoverErosionInwards,
assessmentSection.MacroStabilityInwards,
- assessmentSection.MacroStabilityOutwards,
assessmentSection.Microstability,
assessmentSection.StabilityStoneCover,
assessmentSection.WaveImpactAsphaltCover,
@@ -470,81 +468,76 @@
private static void AssertExpectedContributions(AssessmentSectionComposition composition, AssessmentSection assessmentSection)
{
- Tuple[] contributionTuples = GetContributionsTuples(composition).ToArray();
- double[] contributions = contributionTuples.Select(tuple => tuple.Item1).ToArray();
+ double[] contributions = GetContributions(composition).ToArray();
Assert.AreEqual(contributions[0], assessmentSection.Piping.Contribution);
Assert.AreEqual(contributions[1], assessmentSection.GrassCoverErosionInwards.Contribution);
Assert.AreEqual(contributions[2], assessmentSection.MacroStabilityInwards.Contribution);
- Assert.AreEqual(contributions[3], assessmentSection.MacroStabilityOutwards.Contribution);
- Assert.AreEqual(contributions[4], assessmentSection.StabilityStoneCover.Contribution);
- Assert.AreEqual(contributions[5], assessmentSection.WaveImpactAsphaltCover.Contribution);
- Assert.AreEqual(contributions[6], assessmentSection.GrassCoverErosionOutwards.Contribution);
- Assert.AreEqual(contributions[7], assessmentSection.HeightStructures.Contribution);
- Assert.AreEqual(contributions[8], assessmentSection.ClosingStructures.Contribution);
- Assert.AreEqual(contributions[9], assessmentSection.PipingStructure.Contribution);
- Assert.AreEqual(contributions[10], assessmentSection.StabilityPointStructures.Contribution);
- Assert.AreEqual(contributions[11], assessmentSection.DuneErosion.Contribution);
- Assert.AreEqual(contributions[12], assessmentSection.OtherFailureMechanism.Contribution);
+ Assert.AreEqual(contributions[3], assessmentSection.StabilityStoneCover.Contribution);
+ Assert.AreEqual(contributions[4], assessmentSection.WaveImpactAsphaltCover.Contribution);
+ Assert.AreEqual(contributions[5], assessmentSection.GrassCoverErosionOutwards.Contribution);
+ Assert.AreEqual(contributions[6], assessmentSection.HeightStructures.Contribution);
+ Assert.AreEqual(contributions[7], assessmentSection.ClosingStructures.Contribution);
+ Assert.AreEqual(contributions[8], assessmentSection.PipingStructure.Contribution);
+ Assert.AreEqual(contributions[9], assessmentSection.StabilityPointStructures.Contribution);
+ Assert.AreEqual(contributions[10], assessmentSection.DuneErosion.Contribution);
+ Assert.AreEqual(contributions[11], assessmentSection.OtherFailureMechanism.Contribution);
}
- private static IEnumerable> GetContributionsTuples(AssessmentSectionComposition composition)
+ private static IEnumerable GetContributions(AssessmentSectionComposition composition)
{
- Tuple[] contributions = null;
+ double[] contributions = null;
switch (composition)
{
case AssessmentSectionComposition.Dike:
- contributions = new[]
+ contributions = new double[]
{
- new Tuple(24, true),
- new Tuple(24, true),
- new Tuple(4, true),
- new Tuple(4, false),
- new Tuple(5, true),
- new Tuple(5, true),
- new Tuple(5, true),
- new Tuple(24, true),
- new Tuple(4, true),
- new Tuple(2, true),
- new Tuple(2, true),
- new Tuple(0, true),
- new Tuple(30, true)
+ 24,
+ 24,
+ 4,
+ 5,
+ 5,
+ 5,
+ 24,
+ 4,
+ 2,
+ 2,
+ 0,
+ 30
};
break;
case AssessmentSectionComposition.Dune:
- contributions = new[]
+ contributions = new double[]
{
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(4, false),
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(0, true),
- new Tuple(70, true),
- new Tuple(30, true)
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 70,
+ 30
};
break;
case AssessmentSectionComposition.DikeAndDune:
- contributions = new[]
+ contributions = new double[]
{
- new Tuple(24, true),
- new Tuple(24, true),
- new Tuple(4, true),
- new Tuple(4, false),
- new Tuple(5, true),
- new Tuple(5, true),
- new Tuple(5, true),
- new Tuple(24, true),
- new Tuple(4, true),
- new Tuple(2, true),
- new Tuple(2, true),
- new Tuple(10, true),
- new Tuple(20, true)
+ 24,
+ 24,
+ 4,
+ 5,
+ 5,
+ 5,
+ 24,
+ 4,
+ 2,
+ 2,
+ 10,
+ 20
};
break;
default:
@@ -679,9 +672,6 @@
yield return new FailureMechanismTestData((section, failureMechanism) => section.MacroStabilityInwards = (MacroStabilityInwardsFailureMechanism) failureMechanism,
new MacroStabilityInwardsFailureMechanism(),
section => section.MacroStabilityInwards);
- yield return new FailureMechanismTestData((section, failureMechanism) => section.MacroStabilityOutwards = (MacroStabilityOutwardsFailureMechanism) failureMechanism,
- new MacroStabilityOutwardsFailureMechanism(),
- section => section.MacroStabilityOutwards);
yield return new FailureMechanismTestData((section, failureMechanism) => section.Microstability = (MicrostabilityFailureMechanism) failureMechanism,
new MicrostabilityFailureMechanism(),
section => section.Microstability);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs
===================================================================
diff -u -r544db932c9fceb40ee7347da0b586a03fca16e69 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 544db932c9fceb40ee7347da0b586a03fca16e69)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -361,21 +361,20 @@
AssertDataGridViewRow(expectedAssessmentSection.Piping, rows[0].Cells);
AssertDataGridViewRow(expectedAssessmentSection.GrassCoverErosionInwards, rows[1].Cells);
AssertDataGridViewRow(expectedAssessmentSection.MacroStabilityInwards, rows[2].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.MacroStabilityOutwards, rows[3].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.Microstability, rows[4].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.StabilityStoneCover, rows[5].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.WaveImpactAsphaltCover, rows[6].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.WaterPressureAsphaltCover, rows[7].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.GrassCoverErosionOutwards, rows[8].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.GrassCoverSlipOffOutwards, rows[9].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.GrassCoverSlipOffInwards, rows[10].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.HeightStructures, rows[11].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.ClosingStructures, rows[12].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.PipingStructure, rows[13].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.StabilityPointStructures, rows[14].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.StrengthStabilityLengthwiseConstruction, rows[15].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.DuneErosion, rows[16].Cells);
- AssertDataGridViewRow(expectedAssessmentSection.TechnicalInnovation, rows[17].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.Microstability, rows[3].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.StabilityStoneCover, rows[4].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.WaveImpactAsphaltCover, rows[5].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.WaterPressureAsphaltCover, rows[6].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.GrassCoverErosionOutwards, rows[7].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.GrassCoverSlipOffOutwards, rows[8].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.GrassCoverSlipOffInwards, rows[9].Cells);
+ AssertDataGridViewRow(expectedAssessmentSection.HeightStructures, rows[10].Cells);
+ 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);
}
private static void AssertFailurePathRows(AssessmentSection expectedAssessmentSection, DataGridViewRowCollection rows)
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs
===================================================================
diff -u -r3e0814af5f0045f57ab89723d8d55db530c8f6f5 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision 3e0814af5f0045f57ab89723d8d55db530c8f6f5)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -469,29 +469,6 @@
}
[Test]
- public void GivenAssessmentSectionResultObserverWithAttachedObserver_WhenMacroStabilityOutwardsFailureMechanismNotified_ThenAttachedObserverNotified()
- {
- // Given
- AssessmentSection assessmentSection = CreateAssessmentSection();
-
- using (var resultObserver = new AssessmentSectionResultObserver(assessmentSection))
- {
- var mocks = new MockRepository();
- var observer = mocks.StrictMock();
- observer.Expect(o => o.UpdateObserver());
- mocks.ReplayAll();
-
- resultObserver.Attach(observer);
-
- // When
- assessmentSection.MacroStabilityOutwards.NotifyObservers();
-
- // Then
- mocks.VerifyAll();
- }
- }
-
- [Test]
public void GivenAssessmentSectionResultObserverWithAttachedObserver_WhenMicrostabilityFailureMechanismNotified_ThenAttachedObserverNotified()
{
// Given
@@ -617,8 +594,6 @@
new Action(() => assessmentSection1.GrassCoverErosionInwards = assessmentSection2.GrassCoverErosionInwards));
yield return new TestCaseData(assessmentSection1, new Func(assessmentSection => assessmentSection.MacroStabilityInwards),
new Action(() => assessmentSection1.MacroStabilityInwards = assessmentSection2.MacroStabilityInwards));
- yield return new TestCaseData(assessmentSection1, new Func(assessmentSection => assessmentSection.MacroStabilityOutwards),
- new Action(() => assessmentSection1.MacroStabilityOutwards = assessmentSection2.MacroStabilityOutwards));
yield return new TestCaseData(assessmentSection1, new Func(assessmentSection => assessmentSection.Microstability),
new Action(() => assessmentSection1.Microstability = assessmentSection2.Microstability));
yield return new TestCaseData(assessmentSection1, new Func(assessmentSection => assessmentSection.StabilityStoneCover),
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs
===================================================================
diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -268,7 +268,6 @@
FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverErosionOutwards, 2);
FailureMechanismTestHelper.AddSections(assessmentSection.DuneErosion, 2);
- FailureMechanismTestHelper.AddSections(assessmentSection.MacroStabilityOutwards, 2);
FailureMechanismTestHelper.AddSections(assessmentSection.Microstability, 2);
FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverSlipOffOutwards, 2);
FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverSlipOffInwards, 2);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -r5ec279990157ae0f567b7307675fd31a5a0dca92 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 5ec279990157ae0f567b7307675fd31a5a0dca92)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -80,7 +80,6 @@
FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverErosionOutwards, random.Next(1, 10));
FailureMechanismTestHelper.AddSections(assessmentSection.DuneErosion, random.Next(1, 10));
- FailureMechanismTestHelper.AddSections(assessmentSection.MacroStabilityOutwards, random.Next(1, 10));
FailureMechanismTestHelper.AddSections(assessmentSection.Microstability, random.Next(1, 10));
FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverSlipOffOutwards, random.Next(1, 10));
FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverSlipOffInwards, random.Next(1, 10));
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml
===================================================================
diff -u -r0c270535c4f48525d32835e587fe6ad32de3149f -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision 0c270535c4f48525d32835e587fe6ad32de3149f)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -231,8 +231,8 @@
WBI-0G-5
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-5
@@ -257,8 +257,8 @@
WBI-0G-5
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-5
@@ -283,8 +283,8 @@
WBI-0G-5
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-5
@@ -309,8 +309,8 @@
WBI-0G-5
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-5
@@ -335,8 +335,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
@@ -361,8 +361,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
@@ -387,8 +387,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
@@ -413,8 +413,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
@@ -439,8 +439,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
@@ -465,8 +465,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
@@ -491,8 +491,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
@@ -517,8 +517,8 @@
WBI-0G-3
GEDTETS
- IV-vak
- 0.25
+ VI-vak
+ 1
WBI-0T-3
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs
===================================================================
diff -u -rab73658fb4717a49d3b530b0069d41b52b0bed0c -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision ab73658fb4717a49d3b530b0069d41b52b0bed0c)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -49,7 +49,7 @@
[TestFixture]
public class ReferenceLineUpdateHandlerTest : NUnitFormTest
{
- private const int expectedNumberOfRemovedInstances = 227;
+ private const int expectedNumberOfRemovedInstances = 223;
[Test]
public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
@@ -206,7 +206,7 @@
IObservable[] observables = handler.Update(assessmentSection.ReferenceLine, referenceLine).ToArray();
// Assert
- Assert.AreEqual(75, observables.Length);
+ Assert.AreEqual(73, observables.Length);
PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping;
CollectionAssert.IsEmpty(pipingFailureMechanism.Sections);
@@ -336,12 +336,6 @@
CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SurfaceLines);
CollectionAssert.Contains(observables, macroStabilityInwardsFailureMechanism.SurfaceLines);
- MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards;
- CollectionAssert.IsEmpty(macroStabilityOutwardsFailureMechanism.Sections);
- CollectionAssert.IsEmpty(macroStabilityOutwardsFailureMechanism.SectionResultsOld);
- CollectionAssert.Contains(observables, macroStabilityOutwardsFailureMechanism);
- CollectionAssert.Contains(observables, macroStabilityOutwardsFailureMechanism.SectionResultsOld);
-
MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability;
CollectionAssert.IsEmpty(microstabilityFailureMechanism.Sections);
CollectionAssert.IsEmpty(microstabilityFailureMechanism.SectionResultsOld);
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -r63c142bfa1b3e74168fd6f92488c43e2fd4816f8 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 63c142bfa1b3e74168fd6f92488c43e2fd4816f8)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -1015,10 +1015,6 @@
CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.StochasticSoilModels);
CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SurfaceLines);
- MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards;
- CollectionAssert.IsEmpty(macroStabilityOutwardsFailureMechanism.Sections);
- CollectionAssert.IsEmpty(macroStabilityOutwardsFailureMechanism.SectionResultsOld);
-
MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability;
CollectionAssert.IsEmpty(microstabilityFailureMechanism.Sections);
CollectionAssert.IsEmpty(microstabilityFailureMechanism.SectionResultsOld);
@@ -1671,7 +1667,7 @@
private static void AssertChangedObjects(ClearResults results, AssessmentSection assessmentSection)
{
IObservable[] changedObjects = results.ChangedObjects.ToArray();
- Assert.AreEqual(75, changedObjects.Length);
+ Assert.AreEqual(73, changedObjects.Length);
PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping;
CollectionAssert.Contains(changedObjects, pipingFailureMechanism);
@@ -1747,10 +1743,6 @@
CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.StochasticSoilModels);
CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.SurfaceLines);
- MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards;
- CollectionAssert.Contains(changedObjects, macroStabilityOutwardsFailureMechanism);
- CollectionAssert.Contains(changedObjects, macroStabilityOutwardsFailureMechanism.SectionResultsOld);
-
MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability;
CollectionAssert.Contains(changedObjects, microstabilityFailureMechanism);
CollectionAssert.Contains(changedObjects, microstabilityFailureMechanism.SectionResultsOld);
@@ -1791,7 +1783,6 @@
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.Piping));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverErosionInwards));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.MacroStabilityInwards));
- expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLineOld(assessmentSection.MacroStabilityOutwards));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.Microstability));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.StabilityStoneCover));
expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.WaveImpactAsphaltCover));
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -r3192f0b781afb4da048556c46e1b78c4079d05e4 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 3192f0b781afb4da048556c46e1b78c4079d05e4)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -123,7 +123,6 @@
SetFullyConfiguredFailureMechanism(assessmentSection.DuneErosion);
SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverSlipOffInwards);
SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards);
- SetFullyConfiguredFailureMechanism(assessmentSection.MacroStabilityOutwards);
SetFullyConfiguredFailureMechanism(assessmentSection.Microstability);
SetFullyConfiguredFailureMechanism(assessmentSection.PipingStructure);
SetFullyConfiguredFailureMechanism(assessmentSection.StrengthStabilityLengthwiseConstruction);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -rad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0 -rb11441e2bf7d3b169c51a56df1fd90016065784a
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision ad2d2ffd6212aefefd04fb6ac6d386a38b5cd1f0)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision b11441e2bf7d3b169c51a56df1fd90016065784a)
@@ -188,11 +188,6 @@
SetSections(stabilityPointStructuresFailureMechanism);
SetSectionResults(stabilityPointStructuresFailureMechanism.SectionResults);
- MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards;
- ConfigureMacroStabilityOutwardsFailureMechanism(macroStabilityOutwardsFailureMechanism);
- SetSections(macroStabilityOutwardsFailureMechanism);
- SetSectionResults(macroStabilityOutwardsFailureMechanism.SectionResultsOld);
-
PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure;
ConfigurePipingStructureFailureMechanism(pipingStructureFailureMechanism);
SetSections(pipingStructureFailureMechanism);