Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs =================================================================== diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 6257662de18fbfde1fa3285f82648f2798cdc511) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -24,7 +24,6 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Integration.Data.Properties; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.StandAlone { @@ -33,10 +32,9 @@ /// Grass Cover Slip Off Inwards failure mechanism. /// public class GrassCoverSlipOffInwardsFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IHasSectionResults, IHasGeneralInput { - private readonly ObservableList sectionResultsOld; private readonly ObservableList sectionResults; /// @@ -45,7 +43,6 @@ public GrassCoverSlipOffInwardsFailureMechanism() : base(Resources.GrassCoverSlipOffInwardsFailureMechanism_DisplayName, Resources.GrassCoverSlipOffInwardsFailureMechanism_Code) { - sectionResultsOld = new ObservableList(); sectionResults = new ObservableList(); GeneralInput = new GeneralInput(); } @@ -60,20 +57,16 @@ } } - public IObservableEnumerable SectionResultsOld => sectionResultsOld; - public IObservableEnumerable SectionResults => sectionResults; protected override void AddSectionDependentData(FailureMechanismSection section) { base.AddSectionDependentData(section); - sectionResultsOld.Add(new GrassCoverSlipOffInwardsFailureMechanismSectionResultOld(section)); sectionResults.Add(new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)); } protected override void ClearSectionDependentData() { - sectionResultsOld.Clear(); sectionResults.Clear(); } } Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs =================================================================== diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision 6257662de18fbfde1fa3285f82648f2798cdc511) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -24,7 +24,6 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Integration.Data.Properties; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.StandAlone { @@ -33,10 +32,9 @@ /// Grass Cover Slip Off Outwards failure mechanism. /// public class GrassCoverSlipOffOutwardsFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IHasSectionResults, IHasGeneralInput { - private readonly ObservableList sectionResultsOld; private readonly ObservableList sectionResults; /// @@ -45,7 +43,6 @@ public GrassCoverSlipOffOutwardsFailureMechanism() : base(Resources.GrassCoverSlipOffOutwardsFailureMechanism_DisplayName, Resources.GrassCoverSlipOffOutwardsFailureMechanism_Code) { - sectionResultsOld = new ObservableList(); sectionResults = new ObservableList(); GeneralInput = new GeneralInput(); } @@ -60,20 +57,16 @@ } } - public IObservableEnumerable SectionResultsOld => sectionResultsOld; - public IObservableEnumerable SectionResults => sectionResults; protected override void AddSectionDependentData(FailureMechanismSection section) { base.AddSectionDependentData(section); - sectionResultsOld.Add(new GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld(section)); sectionResults.Add(new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)); } protected override void ClearSectionDependentData() { - sectionResultsOld.Clear(); sectionResults.Clear(); } } Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs =================================================================== diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 6257662de18fbfde1fa3285f82648f2798cdc511) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -24,18 +24,16 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Integration.Data.Properties; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.StandAlone { /// /// 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 sectionResultsOld; private readonly ObservableList sectionResults; /// @@ -44,7 +42,6 @@ public MicrostabilityFailureMechanism() : base(Resources.MicrostabilityFailureMechanism_DisplayName, Resources.MicrostabilityFailureMechanism_Code) { - sectionResultsOld = new ObservableList(); sectionResults = new ObservableList(); GeneralInput = new GeneralInput(); } @@ -59,20 +56,16 @@ } } - public IObservableEnumerable SectionResultsOld => sectionResultsOld; - public IObservableEnumerable SectionResults => sectionResults; protected override void AddSectionDependentData(FailureMechanismSection section) { base.AddSectionDependentData(section); - sectionResultsOld.Add(new MicrostabilityFailureMechanismSectionResultOld(section)); sectionResults.Add(new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)); } protected override void ClearSectionDependentData() { - sectionResultsOld.Clear(); sectionResults.Clear(); } } Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs =================================================================== diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision 6257662de18fbfde1fa3285f82648f2798cdc511) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -24,7 +24,6 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Integration.Data.Properties; -using Riskeer.Integration.Data.StandAlone.SectionResults; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; namespace Riskeer.Integration.Data.StandAlone @@ -34,10 +33,9 @@ /// Piping Structure failure mechanism. /// public class PipingStructureFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IHasSectionResults, IHasGeneralInput { - private readonly ObservableList sectionResultsOld; private readonly ObservableList sectionResults; /// @@ -47,7 +45,6 @@ : base(Resources.PipingStructureFailureMechanism_DisplayName, Resources.PipingStructureFailureMechanism_Code) { sectionResults = new ObservableList(); - sectionResultsOld = new ObservableList(); GeneralInput = new GeneralInput { ApplyLengthEffectInSection = false @@ -64,20 +61,16 @@ } } - public IObservableEnumerable SectionResultsOld => sectionResultsOld; - public IObservableEnumerable SectionResults => sectionResults; protected override void AddSectionDependentData(FailureMechanismSection section) { base.AddSectionDependentData(section); - sectionResultsOld.Add(new PipingStructureFailureMechanismSectionResultOld(section)); sectionResults.Add(new NonAdoptableFailureMechanismSectionResult(section)); } protected override void ClearSectionDependentData() { - sectionResultsOld.Clear(); sectionResults.Clear(); } } Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultOld.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultOld.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultOld.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResultOld.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs =================================================================== diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision 6257662de18fbfde1fa3285f82648f2798cdc511) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -24,7 +24,6 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Integration.Data.Properties; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.StandAlone { @@ -33,10 +32,9 @@ /// Water Pressure on Asphalt failure mechanism. /// public class WaterPressureAsphaltCoverFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IHasSectionResults, IHasGeneralInput { - private readonly ObservableList sectionResultsOld; private readonly ObservableList sectionResults; /// @@ -45,7 +43,6 @@ public WaterPressureAsphaltCoverFailureMechanism() : base(Resources.WaterPressureAsphaltCoverFailureMechanism_DisplayName, Resources.WaterPressureAsphaltCoverFailureMechanism_Code) { - sectionResultsOld = new ObservableList(); sectionResults = new ObservableList(); GeneralInput = new GeneralInput(); } @@ -60,20 +57,16 @@ } } - public IObservableEnumerable SectionResultsOld => sectionResultsOld; - public IObservableEnumerable SectionResults => sectionResults; protected override void AddSectionDependentData(FailureMechanismSection section) { base.AddSectionDependentData(section); - sectionResultsOld.Add(new WaterPressureAsphaltCoverFailureMechanismSectionResultOld(section)); sectionResults.Add(new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)); } protected override void ClearSectionDependentData() { - sectionResultsOld.Clear(); sectionResults.Clear(); } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs =================================================================== diff -u -rc08ab9a9934129758efbef975c69d54f927720c3 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision c08ab9a9934129758efbef975c69d54f927720c3) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -25,7 +25,6 @@ using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.Test.StandAlone { @@ -40,14 +39,13 @@ // 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); CollectionAssert.IsEmpty(failureMechanism.Sections); Assert.IsNotNull(failureMechanism.GeneralInput); - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } @@ -66,8 +64,6 @@ // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); - Assert.AreEqual(1, failureMechanism.SectionResultsOld.Count()); - Assert.AreSame(section, failureMechanism.SectionResultsOld.First().Section); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } @@ -91,14 +87,12 @@ }); // Precondition - Assert.AreEqual(2, failureMechanism.SectionResultsOld.Count()); Assert.AreEqual(2, failureMechanism.SectionResults.Count()); // Call failureMechanism.ClearAllSections(); // Assert - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs =================================================================== diff -u -rc08ab9a9934129758efbef975c69d54f927720c3 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision c08ab9a9934129758efbef975c69d54f927720c3) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -25,7 +25,6 @@ using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.Test.StandAlone { @@ -40,14 +39,13 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Grasbekleding afschuiven buitentalud", failureMechanism.Name); Assert.AreEqual("GABU", failureMechanism.Code); CollectionAssert.IsEmpty(failureMechanism.Sections); Assert.IsNotNull(failureMechanism.GeneralInput); - - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } @@ -66,8 +64,6 @@ // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); - Assert.AreEqual(1, failureMechanism.SectionResultsOld.Count()); - Assert.AreSame(section, failureMechanism.SectionResultsOld.First().Section); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } @@ -91,14 +87,12 @@ }); // Precondition - Assert.AreEqual(2, failureMechanism.SectionResultsOld.Count()); Assert.AreEqual(2, failureMechanism.SectionResults.Count()); // Call failureMechanism.ClearAllSections(); // Assert - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs =================================================================== diff -u -rc08ab9a9934129758efbef975c69d54f927720c3 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision c08ab9a9934129758efbef975c69d54f927720c3) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -25,7 +25,6 @@ using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.Test.StandAlone { @@ -40,14 +39,13 @@ // 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); CollectionAssert.IsEmpty(failureMechanism.Sections); Assert.IsNotNull(failureMechanism.GeneralInput); - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } @@ -66,8 +64,6 @@ // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); - Assert.AreEqual(1, failureMechanism.SectionResultsOld.Count()); - Assert.AreSame(section, failureMechanism.SectionResultsOld.First().Section); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } @@ -91,14 +87,12 @@ }); // Precondition - Assert.AreEqual(2, failureMechanism.SectionResultsOld.Count()); Assert.AreEqual(2, failureMechanism.SectionResults.Count()); // Call failureMechanism.ClearAllSections(); // Assert - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs =================================================================== diff -u -rc08ab9a9934129758efbef975c69d54f927720c3 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision c08ab9a9934129758efbef975c69d54f927720c3) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -25,30 +25,28 @@ using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.Test.StandAlone { [TestFixture] public class PipingStructureFailureMechanismTest { [Test] - public void DefaultConstructor_Always_PropertiesSet() + public void Constructor_ExpectedValues() { // Call var failureMechanism = new PipingStructureFailureMechanism(); // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Kunstwerken - Piping bij kunstwerk", failureMechanism.Name); Assert.AreEqual("PKW", failureMechanism.Code); Assert.IsFalse(failureMechanism.GeneralInput.ApplyLengthEffectInSection); CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.SectionResults); - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); } [Test] @@ -66,9 +64,6 @@ // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); - Assert.AreEqual(1, failureMechanism.SectionResultsOld.Count()); - Assert.AreSame(section, failureMechanism.SectionResultsOld.First().Section); - Assert.AreEqual(1, failureMechanism.SectionResults.Count()); Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } @@ -92,14 +87,12 @@ }); // Precondition - Assert.AreEqual(2, failureMechanism.SectionResultsOld.Count()); Assert.AreEqual(2, failureMechanism.SectionResults.Count()); // Call failureMechanism.ClearAllSections(); // Assert - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultOldTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultOldTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultOldTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultOldTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0476ac86d287af8644c2c3e61cda1455cb1e07c2 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResultOldTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -rc08ab9a9934129758efbef975c69d54f927720c3 -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision c08ab9a9934129758efbef975c69d54f927720c3) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) @@ -25,29 +25,27 @@ using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; namespace Riskeer.Integration.Data.Test.StandAlone { [TestFixture] public class WaterPressureAsphaltCoverFailureMechanismTest { [Test] - public void DefaultConstructor_Always_PropertiesSet() + public void Constructor_ExpectedValues() { // Call var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Wateroverdruk bij asfaltbekleding", failureMechanism.Name); Assert.AreEqual("AWO", failureMechanism.Code); Assert.IsNotNull(failureMechanism.GeneralInput); CollectionAssert.IsEmpty(failureMechanism.Sections); - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } @@ -66,9 +64,6 @@ // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); - Assert.AreEqual(1, failureMechanism.SectionResultsOld.Count()); - Assert.AreSame(section, failureMechanism.SectionResultsOld.First().Section); - Assert.AreEqual(1, failureMechanism.SectionResults.Count()); Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } @@ -92,14 +87,12 @@ }); // Precondition - Assert.AreEqual(2, failureMechanism.SectionResultsOld.Count()); Assert.AreEqual(2, failureMechanism.SectionResults.Count()); // Call failureMechanism.ClearAllSections(); // Assert - CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } }