Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs =================================================================== diff -u -rb8f08406d6090fac1ef3e711929406cb4cc1110f -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs (.../ClosingStructuresFailureMechanismTest.cs) (revision b8f08406d6090fac1ef3e711929406cb4cc1110f) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs (.../ClosingStructuresFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -63,14 +63,15 @@ { // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -96,8 +97,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IHasSectionResults.cs =================================================================== diff -u -r421cbbc8a7149960b5e6908bde1744c63e4d1169 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IHasSectionResults.cs (.../IHasSectionResults.cs) (revision 421cbbc8a7149960b5e6908bde1744c63e4d1169) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IHasSectionResults.cs (.../IHasSectionResults.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -30,7 +30,7 @@ public interface IHasSectionResults where T : FailureMechanismSectionResult { /// - /// Gets an of . + /// Gets an of . /// IObservableEnumerable SectionResults { get; } } Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs =================================================================== diff -u -r42c710f0341da1ca4fc911ef8ba502a41073e400 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs (.../TestFailureMechanismTest.cs) (revision 42c710f0341da1ca4fc911ef8ba502a41073e400) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs (.../TestFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -19,13 +19,10 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Linq; -using Core.Common.Base; using Core.Common.Base.Geometry; using NUnit.Framework; -using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; @@ -85,17 +82,15 @@ { // Setup var failureMechanism = new TestFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -104,11 +99,11 @@ // Setup var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -121,8 +116,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs =================================================================== diff -u -r98544d1ded83f880238cb8e69f77b58ec1dbcc19 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision 98544d1ded83f880238cb8e69f77b58ec1dbcc19) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -50,17 +50,15 @@ { // Setup var failureMechanism = new DuneErosionFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -69,11 +67,11 @@ // Setup var failureMechanism = new DuneErosionFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -86,8 +84,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs =================================================================== diff -u -rac8798cf0a66cf04df1294d4fd08e0b1915a5b91 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision ac8798cf0a66cf04df1294d4fd08e0b1915a5b91) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -58,20 +58,19 @@ } [Test] - public void AddSection_WithSection_AddedFailureMechanismSectionResult() + public void AddSection_WithSection_AddedSectionResult() { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection("", new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert + Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -80,11 +79,11 @@ // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -97,8 +96,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs (.../GrassCoverErosionOutwardsFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs (.../GrassCoverErosionOutwardsFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.GrassCoverErosionOutwards.Data.Test { @@ -57,17 +58,15 @@ { // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -76,11 +75,11 @@ // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -93,8 +92,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs =================================================================== diff -u -r83b296875f93a77296ecbcad892eac7e4f5216e0 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision 83b296875f93a77296ecbcad892eac7e4f5216e0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -62,14 +62,15 @@ { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -95,8 +96,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -49,17 +50,15 @@ { // Setup var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -68,11 +67,11 @@ // Setup var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -85,8 +84,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -49,17 +50,15 @@ { // Setup var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -68,11 +67,11 @@ // Setup var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -85,8 +84,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs (.../MacroStabilityOutwardsFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs (.../MacroStabilityOutwardsFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -51,17 +52,15 @@ { // Setup var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -70,11 +69,11 @@ // Setup var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -87,8 +86,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -49,17 +50,15 @@ { // Setup var failureMechanism = new MicrostabilityFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -68,11 +67,11 @@ // Setup var failureMechanism = new MicrostabilityFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -85,8 +84,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs =================================================================== diff -u -r98544d1ded83f880238cb8e69f77b58ec1dbcc19 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision 98544d1ded83f880238cb8e69f77b58ec1dbcc19) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -56,17 +56,15 @@ { // Setup var failureMechanism = new PipingStructureFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -75,11 +73,11 @@ // Setup var failureMechanism = new PipingStructureFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -92,8 +90,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -49,17 +50,15 @@ { // Setup var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -68,11 +67,11 @@ // Setup var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -85,8 +84,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/TechnicalInnovationFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/TechnicalInnovationFailureMechanismTest.cs (.../TechnicalInnovationFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/TechnicalInnovationFailureMechanismTest.cs (.../TechnicalInnovationFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -49,17 +50,15 @@ { // Setup var failureMechanism = new TechnicalInnovationFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -68,11 +67,11 @@ // Setup var failureMechanism = new TechnicalInnovationFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -85,8 +84,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -49,17 +50,15 @@ { // Setup var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -68,11 +67,11 @@ // Setup var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -85,8 +84,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -24,6 +24,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.MacroStabilityInwards.Data.Test { @@ -117,17 +118,15 @@ { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -136,11 +135,11 @@ // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -153,8 +152,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -24,6 +24,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Piping.Data.Test { @@ -119,17 +120,15 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -138,11 +137,11 @@ // Setup var failureMechanism = new PipingFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -155,8 +154,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs =================================================================== diff -u -r30f69be7d009744f9d2422bc69b5aefc50db5d38 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs (.../StabilityPointStructuresFailureMechanismTest.cs) (revision 30f69be7d009744f9d2422bc69b5aefc50db5d38) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs (.../StabilityPointStructuresFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -63,14 +63,15 @@ { // Setup var failureMechanism = new StabilityPointStructuresFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -96,8 +97,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.StabilityStoneCover.Data.Test { @@ -57,17 +58,15 @@ { // Setup var failureMechanism = new StabilityStoneCoverFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -76,11 +75,11 @@ // Setup var failureMechanism = new StabilityStoneCoverFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -93,8 +92,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test] Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -rfc8446fc65eb82bb381278d8a94fd061e6278bbe --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision fc8446fc65eb82bb381278d8a94fd061e6278bbe) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.WaveImpactAsphaltCover.Data.Test { @@ -58,17 +59,15 @@ { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] - { - new Point2D(2, 1) - })); + failureMechanism.AddSection(section); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); Assert.AreEqual(1, failureMechanism.SectionResults.Count()); - Assert.IsInstanceOf(failureMechanism.SectionResults.ElementAt(0)); + Assert.AreSame(section, failureMechanism.SectionResults.First().Section); } [Test] @@ -77,11 +76,11 @@ // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); - failureMechanism.AddSection(new FailureMechanismSection("", new[] + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(2, 1) })); @@ -94,8 +93,8 @@ failureMechanism.ClearAllSections(); // Assert - Assert.AreEqual(0, failureMechanism.Sections.Count()); - Assert.AreEqual(0, failureMechanism.SectionResults.Count()); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test]