Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rc33eeaaccadca7055d3e5476504c5af0a5dbf0bc --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision c33eeaaccadca7055d3e5476504c5af0a5dbf0bc) @@ -35,9 +35,10 @@ /// public class GrassCoverErosionInwardsFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, - IHasSectionResults + IHasSectionResults { - private readonly ObservableList sectionResults; + private readonly ObservableList sectionResultsOld; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. @@ -50,7 +51,8 @@ Name = RiskeerCommonDataResources.FailureMechanism_Calculations_DisplayName }; GeneralInput = new GeneralGrassCoverErosionInwardsInput(); - sectionResults = new ObservableList(); + sectionResultsOld = new ObservableList(); + sectionResults = new ObservableList(); DikeProfiles = new DikeProfileCollection(); } @@ -66,32 +68,22 @@ public CalculationGroup CalculationsGroup { get; } - public override IEnumerable Calculations - { - get - { - return CalculationsGroup.GetCalculations().OfType(); - } - } + public override IEnumerable Calculations => CalculationsGroup.GetCalculations().OfType(); - 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 GrassCoverErosionInwardsFailureMechanismSectionResultOld(section)); + sectionResultsOld.Add(new GrassCoverErosionInwardsFailureMechanismSectionResultOld(section)); } protected override void ClearSectionDependentData() { - sectionResults.Clear(); + sectionResultsOld.Clear(); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rc33eeaaccadca7055d3e5476504c5af0a5dbf0bc --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision c33eeaaccadca7055d3e5476504c5af0a5dbf0bc) @@ -36,15 +36,15 @@ public class GrassCoverErosionInwardsFailureMechanismTest { [Test] - public void DefaultConstructor_ExpectedValues() + public void Constructor_ExpectedValues() { // Call var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Grasbekleding erosie kruin en binnentalud", failureMechanism.Name); Assert.AreEqual("GEKB", failureMechanism.Code); Assert.AreEqual(1, failureMechanism.Group); @@ -56,6 +56,9 @@ CollectionAssert.IsEmpty(failureMechanism.Calculations); CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.DikeProfiles); + + CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test]