Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs =================================================================== diff -u -r8d667bcf47df168bda37270bdf8ea0cee98398d1 -r63c142bfa1b3e74168fd6f92488c43e2fd4816f8 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 8d667bcf47df168bda37270bdf8ea0cee98398d1) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 63c142bfa1b3e74168fd6f92488c43e2fd4816f8) @@ -33,18 +33,20 @@ /// Grass Cover Slip Off Inwards failure mechanism. /// public class GrassCoverSlipOffInwardsFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IHasSectionResults, IHasGeneralInput { - private readonly ObservableList sectionResults; + private readonly ObservableList sectionResultsOld; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public GrassCoverSlipOffInwardsFailureMechanism() : base(Resources.GrassCoverSlipOffInwardsFailureMechanism_DisplayName, Resources.GrassCoverSlipOffInwardsFailureMechanism_Code, 4) { - sectionResults = new ObservableList(); + sectionResultsOld = new ObservableList(); + sectionResults = new ObservableList(); GeneralInput = new GeneralInput(); } @@ -58,23 +60,19 @@ } } - public IObservableEnumerable SectionResultsOld - { - get - { - return sectionResults; - } - } + public IObservableEnumerable SectionResultsOld => sectionResultsOld; + public IObservableEnumerable SectionResults => sectionResults; + protected override void AddSectionDependentData(FailureMechanismSection section) { base.AddSectionDependentData(section); - sectionResults.Add(new GrassCoverSlipOffInwardsFailureMechanismSectionResultOld(section)); + sectionResultsOld.Add(new GrassCoverSlipOffInwardsFailureMechanismSectionResultOld(section)); } protected override void ClearSectionDependentData() { - sectionResults.Clear(); + sectionResultsOld.Clear(); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs =================================================================== diff -u -r8d667bcf47df168bda37270bdf8ea0cee98398d1 -r63c142bfa1b3e74168fd6f92488c43e2fd4816f8 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision 8d667bcf47df168bda37270bdf8ea0cee98398d1) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision 63c142bfa1b3e74168fd6f92488c43e2fd4816f8) @@ -33,20 +33,23 @@ public class GrassCoverSlipOffInwardsFailureMechanismTest { [Test] - public void DefaultConstructor_Always_PropertiesSet() + public void Constructor_ExpectedValues() { // Call var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Grasbekleding afschuiven binnentalud", failureMechanism.Name); Assert.AreEqual("GABI", failureMechanism.Code); Assert.AreEqual(4, failureMechanism.Group); CollectionAssert.IsEmpty(failureMechanism.Sections); Assert.IsNotNull(failureMechanism.GeneralInput); + + CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs =================================================================== diff -u -r55802c6bd98681e5f21fbb5e18e33c6aa2325e53 -r63c142bfa1b3e74168fd6f92488c43e2fd4816f8 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision 55802c6bd98681e5f21fbb5e18e33c6aa2325e53) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision 63c142bfa1b3e74168fd6f92488c43e2fd4816f8) @@ -206,7 +206,7 @@ IObservable[] observables = handler.Update(assessmentSection.ReferenceLine, referenceLine).ToArray(); // Assert - Assert.AreEqual(74, observables.Length); + Assert.AreEqual(75, observables.Length); PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping; CollectionAssert.IsEmpty(pipingFailureMechanism.Sections); @@ -369,8 +369,10 @@ GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwardsFailureMechanism = assessmentSection.GrassCoverSlipOffInwards; CollectionAssert.IsEmpty(grassCoverSlipOffInwardsFailureMechanism.Sections); CollectionAssert.IsEmpty(grassCoverSlipOffInwardsFailureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(grassCoverSlipOffInwardsFailureMechanism.SectionResults); CollectionAssert.Contains(observables, grassCoverSlipOffInwardsFailureMechanism); CollectionAssert.Contains(observables, grassCoverSlipOffInwardsFailureMechanism.SectionResultsOld); + CollectionAssert.Contains(observables, grassCoverSlipOffInwardsFailureMechanism.SectionResults); StrengthStabilityLengthwiseConstructionFailureMechanism stabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction; CollectionAssert.IsEmpty(stabilityLengthwiseConstructionFailureMechanism.Sections); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -re66f854231d2dd02b83f3f5e8c480be2b7d70bb2 -r63c142bfa1b3e74168fd6f92488c43e2fd4816f8 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision e66f854231d2dd02b83f3f5e8c480be2b7d70bb2) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 63c142bfa1b3e74168fd6f92488c43e2fd4816f8) @@ -1671,7 +1671,7 @@ private static void AssertChangedObjects(ClearResults results, AssessmentSection assessmentSection) { IObservable[] changedObjects = results.ChangedObjects.ToArray(); - Assert.AreEqual(74, changedObjects.Length); + Assert.AreEqual(75, changedObjects.Length); PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping; CollectionAssert.Contains(changedObjects, pipingFailureMechanism); @@ -1769,6 +1769,7 @@ GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwardsFailureMechanism = assessmentSection.GrassCoverSlipOffInwards; CollectionAssert.Contains(changedObjects, grassCoverSlipOffInwardsFailureMechanism); CollectionAssert.Contains(changedObjects, grassCoverSlipOffInwardsFailureMechanism.SectionResultsOld); + CollectionAssert.Contains(changedObjects, grassCoverSlipOffInwardsFailureMechanism.SectionResults); StrengthStabilityLengthwiseConstructionFailureMechanism stabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction; CollectionAssert.Contains(changedObjects, stabilityLengthwiseConstructionFailureMechanism); @@ -1797,7 +1798,7 @@ expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.WaterPressureAsphaltCover)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverErosionOutwards)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverSlipOffOutwards)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLineOld(assessmentSection.GrassCoverSlipOffInwards)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverSlipOffInwards)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.HeightStructures)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.ClosingStructures)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.PipingStructure));