Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs =================================================================== diff -u -r8d667bcf47df168bda37270bdf8ea0cee98398d1 -r65f0327bb80cb387df634a11963efbcdd5d82194 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 8d667bcf47df168bda37270bdf8ea0cee98398d1) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 65f0327bb80cb387df634a11963efbcdd5d82194) @@ -32,18 +32,20 @@ /// Model containing input and output needed to perform different levels of the /// Microstability failure mechanism. /// - public class MicrostabilityFailureMechanism : FailureMechanismBase, IHasSectionResults, + public class MicrostabilityFailureMechanism : FailureMechanismBase, IHasSectionResults, IHasGeneralInput { - private readonly ObservableList sectionResults; + private readonly ObservableList sectionResultsOld; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public MicrostabilityFailureMechanism() : base(Resources.MicrostabilityFailureMechanism_DisplayName, Resources.MicrostabilityFailureMechanism_Code, 4) { - sectionResults = new ObservableList(); + sectionResultsOld = new ObservableList(); + sectionResults = new ObservableList(); GeneralInput = new GeneralInput(); } @@ -57,23 +59,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 MicrostabilityFailureMechanismSectionResultOld(section)); + sectionResultsOld.Add(new MicrostabilityFailureMechanismSectionResultOld(section)); } protected override void ClearSectionDependentData() { - sectionResults.Clear(); + sectionResultsOld.Clear(); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs =================================================================== diff -u -r8d667bcf47df168bda37270bdf8ea0cee98398d1 -r65f0327bb80cb387df634a11963efbcdd5d82194 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision 8d667bcf47df168bda37270bdf8ea0cee98398d1) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision 65f0327bb80cb387df634a11963efbcdd5d82194) @@ -33,20 +33,23 @@ public class MicrostabilityFailureMechanismTest { [Test] - public void DefaultConstructor_Always_PropertiesSet() + public void Constructor_ExpectedValues() { // Call var failureMechanism = new MicrostabilityFailureMechanism(); // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Microstabiliteit", failureMechanism.Name); Assert.AreEqual("STMI", failureMechanism.Code); Assert.AreEqual(4, failureMechanism.Group); CollectionAssert.IsEmpty(failureMechanism.Sections); Assert.IsNotNull(failureMechanism.GeneralInput); + + CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test]