Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb28a844780b613e1901fa82328ba3917f485c729 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision b28a844780b613e1901fa82328ba3917f485c729) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; @@ -34,7 +33,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new ClosingStructuresFailureMechanismSectionResult(section); @@ -48,8 +47,7 @@ public void AssessmentLayerTwoA_CalculationNull_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); - + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new ClosingStructuresFailureMechanismSectionResult(section) { Calculation = null @@ -66,8 +64,7 @@ public void AssessmentLayerTwoA_FailedCalculation_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); - + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new ClosingStructuresFailureMechanismSectionResult(section) { Calculation = new StructuresCalculation @@ -87,7 +84,7 @@ public void AssessmentLayerTwoA_SuccessfulCalculation_ReturnProbability() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); const double probability = 0.65; var result = new ClosingStructuresFailureMechanismSectionResult(section) @@ -104,13 +101,5 @@ // Assert Assert.AreEqual(probability, twoAValue); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.ClosingStructures.Data; @@ -41,7 +40,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new ClosingStructuresFailureMechanismSectionResult(section); // Call @@ -62,7 +61,7 @@ public void AssessmentLayerTwoA_NoCalculationSet_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new ClosingStructuresFailureMechanismSectionResult(section); // Precondition @@ -89,7 +88,7 @@ calculation.Output = new TestStructuresOutput(double.NaN); } - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new ClosingStructuresFailureMechanismSectionResult(section) { Calculation = calculation @@ -114,7 +113,7 @@ Output = new TestStructuresOutput(probability) }; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new ClosingStructuresFailureMechanismSectionResult(section) { Calculation = calculation @@ -133,7 +132,7 @@ public void GetSectionResultCalculation_NoCalculationSetOnSectionResult_ReturnNull() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new ClosingStructuresFailureMechanismSectionResult(section); // Precondition @@ -154,7 +153,7 @@ // Setup var expectedCalculation = new StructuresCalculation(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new ClosingStructuresFailureMechanismSectionResult(section) { Calculation = expectedCalculation @@ -176,7 +175,7 @@ var random = new Random(21); double assessmentLayerThree = random.NextDouble(); - var sectionResult = new ClosingStructuresFailureMechanismSectionResult(CreateSection()); + var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new ClosingStructuresFailureMechanismSectionResultRow(sectionResult); // Call @@ -185,13 +184,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismSectionResultTest.cs (.../FailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismSectionResultTest.cs (.../FailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,9 +20,9 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Common.Data.Test.FailureMechanism { @@ -33,7 +33,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new TestFailureMechanismSectionResult(section); @@ -62,7 +62,7 @@ public void AssessmentLayerOne_SetNewValue_ReturnsNewValue(AssessmentLayerOneState newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new TestFailureMechanismSectionResult(section); // Call @@ -72,14 +72,6 @@ Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerOne); } - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("test", new[] - { - new Point2D(0, 0) - }); - } - private class TestFailureMechanismSectionResult : FailureMechanismSectionResult { public TestFailureMechanismSectionResult(FailureMechanismSection section) : base(section) {} Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs (.../StructuresFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs (.../StructuresFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -25,6 +25,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Common.Data.Test.Structures { @@ -35,7 +36,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var sectionResult = new TestStructuresFailureMechanismSectionResult(section); @@ -51,7 +52,7 @@ public void Calculation_SetNewValue_GetNewlySetValue() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new TestStructuresFailureMechanismSectionResult(section); @@ -73,7 +74,8 @@ public void AssessmentLayerThree_SetInvalidValue_ThrowsArgumentOutOfRangeException(double invalidValue) { // Setup - var sectionResult = new TestStructuresFailureMechanismSectionResult(CreateSection()); + var sectionResult = new TestStructuresFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; @@ -91,7 +93,8 @@ public void AssessmentLayerThree_SetValidValue_SetsValue(double validValue) { // Setup - var sectionResult = new TestStructuresFailureMechanismSectionResult(CreateSection()); + var sectionResult = new TestStructuresFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call sectionResult.AssessmentLayerThree = validValue; @@ -100,14 +103,6 @@ Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } - private class TestStructuresFailureMechanismSectionResult : StructuresFailureMechanismSectionResult { public TestStructuresFailureMechanismSectionResult(FailureMechanismSection section) : base(section) {} Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/FailureMechanismSectionTestFactoryTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/FailureMechanismSectionTestFactoryTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/FailureMechanismSectionTestFactoryTest.cs (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -0,0 +1,46 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Base.Geometry; +using NUnit.Framework; +using Ringtoets.Common.Data.FailureMechanism; + +namespace Ringtoets.Common.Data.TestUtil.Test +{ + [TestFixture] + public class FailureMechanismSectionTestFactoryTest + { + [Test] + public void CreateSection_ReturnsExpectedValues() + { + // Call + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + + // Assert + Assert.AreEqual("test", section.Name); + CollectionAssert.AreEqual(new[] + { + new Point2D(0, 0), + new Point2D(1, 0) + }, section.Points); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj =================================================================== diff -u -r1b691808bc6321dcabd7ac123b5d8f2043aed602 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision 1b691808bc6321dcabd7ac123b5d8f2043aed602) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -55,6 +55,7 @@ + Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionTestFactory.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionTestFactory.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionTestFactory.cs (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -0,0 +1,47 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Base.Geometry; +using Ringtoets.Common.Data.FailureMechanism; + +namespace Ringtoets.Common.Data.TestUtil +{ + /// + /// Factory for creating valid which can + /// be used for testing. + /// + public static class FailureMechanismSectionTestFactory + { + /// + /// Creates a default which can be + /// used for testing. + /// + /// A valid . + public static FailureMechanismSection CreateFailureMechanismSection() + { + return new FailureMechanismSection("test", new[] + { + new Point2D(0, 0), + new Point2D(1, 0) + }); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj =================================================================== diff -u -r1b691808bc6321dcabd7ac123b5d8f2043aed602 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision 1b691808bc6321dcabd7ac123b5d8f2043aed602) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -60,6 +60,7 @@ + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionResultRowTest.cs (.../FailureMechanismSectionResultRowTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionResultRowTest.cs (.../FailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base; -using Core.Common.Base.Geometry; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.FailureMechanism; @@ -48,7 +47,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new TestFailureMechanismSectionResult(section); // Call @@ -71,7 +70,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new TestFailureMechanismSectionResult(section); result.Attach(observer); @@ -85,14 +84,6 @@ mocks.VerifyAll(); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } public class TestFailureMechanismSectionResultRow : FailureMechanismSectionResultRow Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -34,7 +33,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new DuneErosionFailureMechanismSectionResult(section); @@ -55,7 +54,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - var section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new DuneErosionFailureMechanismSectionResult(section); // Call @@ -65,13 +64,5 @@ Assert.AreEqual(newValue, result.AssessmentLayerThree, result.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,8 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - var result = new DuneErosionFailureMechanismSectionResult(CreateSection()); + var result = new DuneErosionFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call var row = new DuneErosionSectionResultRow(result); @@ -59,7 +59,7 @@ { // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new DuneErosionFailureMechanismSectionResult(section); var row = new DuneErosionSectionResultRow(result); @@ -76,7 +76,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new DuneErosionFailureMechanismSectionResult(section); var row = new DuneErosionSectionResultRow(result); @@ -86,13 +86,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,10 +20,10 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; namespace Ringtoets.GrassCoverErosionInwards.Data.Test @@ -35,7 +35,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); @@ -51,10 +51,8 @@ public void Calculation_SetNewValue_GetNewlySetValue() { // Setup - FailureMechanismSection section = CreateSection(); - + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); - var calculation = new GrassCoverErosionInwardsCalculation(); // Call @@ -68,7 +66,7 @@ public void AssessmentLayerTwoA_CalculationNull_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { @@ -86,7 +84,7 @@ public void AssessmentLayerTwoA_FailedCalculation_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { @@ -109,7 +107,7 @@ public void AssessmentLayerTwoA_SuccessfulCalculation_ReturnProbability() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); const double probability = 0.65; var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) @@ -138,7 +136,8 @@ public void AssessmentLayerThree_SetInvalidValue_ThrowsArgumentOutOfRangeException(double invalidValue) { // Setup - var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSection()); + var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; @@ -156,21 +155,14 @@ public void AssessmentLayerThree_SetValidValue_SetsValue(double validValue) { // Setup - var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSection()); + var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call sectionResult.AssessmentLayerThree = validValue; // Assert Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,11 +20,11 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.GrassCoverErosionInwards.Data; @@ -40,7 +40,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Call @@ -61,7 +61,7 @@ public void AssessmentLayerTwoA_NoCalculationSet_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Precondition @@ -90,7 +90,7 @@ new TestOvertoppingRateOutput(double.NaN)); } - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = calculation @@ -117,7 +117,7 @@ new TestOvertoppingRateOutput(0)) }; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = calculation @@ -136,7 +136,7 @@ public void GetSectionResultCalculation_NoCalculationSetOnSectionResult_ReturnNull() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Precondition @@ -157,7 +157,7 @@ // Setup var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = grassCoverErosionInwardsCalculation @@ -179,7 +179,8 @@ var random = new Random(21); double assessmentLayerThree = random.NextDouble(); - var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSection()); + var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult); // Call @@ -188,13 +189,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("A", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -22,13 +22,13 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; -using Core.Common.Base.Geometry; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; @@ -80,7 +80,7 @@ // Setup var sectionResults = new[] { - new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSection()) + new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) }; var context = new FailureMechanismSectionResultContext( @@ -287,14 +287,5 @@ // Assert mocks.VerifyAll(); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("test", new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -34,7 +33,7 @@ public void Constructor_WithSection_ResultCreatedForSection() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section); @@ -54,7 +53,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section); // Call @@ -64,13 +63,5 @@ Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,10 +21,10 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.GrassCoverErosionOutwards.Data; @@ -39,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section); // Call @@ -59,7 +59,7 @@ { // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section); var row = new GrassCoverErosionOutwardsFailureMechanismSectionResultRow(result); @@ -77,7 +77,8 @@ var random = new Random(21); RoundedDouble assessmentLayerThree = random.NextRoundedDouble(); - var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(CreateSection()); + var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new GrassCoverErosionOutwardsFailureMechanismSectionResultRow(sectionResult); // Call @@ -86,13 +87,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb28a844780b613e1901fa82328ba3917f485c729 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision b28a844780b613e1901fa82328ba3917f485c729) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; @@ -34,10 +33,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - var section = new FailureMechanismSection("test", new[] - { - new Point2D(0, 0) - }); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var sectionResult = new HeightStructuresFailureMechanismSectionResult(section); @@ -51,8 +47,7 @@ public void AssessmentLayerTwoA_CalculationNull_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); - + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new HeightStructuresFailureMechanismSectionResult(section) { Calculation = null @@ -69,7 +64,7 @@ public void AssessmentLayerTwoA_FailedCalculation_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new HeightStructuresFailureMechanismSectionResult(section) { Calculation = new StructuresCalculation @@ -89,7 +84,7 @@ public void AssessmentLayerTwoA_SuccessfulCalculation_ReturnProbability() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); const double probability = 0.65; var result = new HeightStructuresFailureMechanismSectionResult(section) @@ -106,13 +101,5 @@ // Assert Assert.AreEqual(probability, twoAValue); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; @@ -41,7 +40,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new HeightStructuresFailureMechanismSectionResult(section); // Call @@ -62,7 +61,7 @@ public void AssessmentLayerTwoA_NoCalculationSet_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new HeightStructuresFailureMechanismSectionResult(section); // Precondition @@ -89,7 +88,7 @@ calculation.Output = new TestStructuresOutput(double.NaN); } - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new HeightStructuresFailureMechanismSectionResult(section) { Calculation = calculation @@ -114,7 +113,7 @@ Output = new TestStructuresOutput(probability) }; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new HeightStructuresFailureMechanismSectionResult(section) { Calculation = calculation @@ -133,7 +132,7 @@ public void GetSectionResultCalculation_NoCalculationSetOnSectionResult_ReturnNull() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new HeightStructuresFailureMechanismSectionResult(section); // Precondition @@ -154,7 +153,7 @@ // Setup var expectedCalculation = new StructuresCalculation(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new HeightStructuresFailureMechanismSectionResult(section) { Calculation = expectedCalculation @@ -176,7 +175,8 @@ var random = new Random(21); double assessmentLayerThree = random.NextDouble(); - var sectionResult = new HeightStructuresFailureMechanismSectionResult(CreateSection()); + var sectionResult = new HeightStructuresFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new HeightStructuresFailureMechanismSectionResultRow(sectionResult); // Call @@ -185,13 +185,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs (.../HeightStructuresFailureMechanismResultViewInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs (.../HeightStructuresFailureMechanismResultViewInfoTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -22,13 +22,13 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; -using Core.Common.Base.Geometry; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Forms.PresentationObjects; @@ -80,10 +80,11 @@ // Setup var sectionResults = new[] { - new HeightStructuresFailureMechanismSectionResult(CreateSection()) + new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) }; - var context = new FailureMechanismSectionResultContext(sectionResults, new HeightStructuresFailureMechanism()); + var context = new FailureMechanismSectionResultContext(sectionResults, + new HeightStructuresFailureMechanism()); // Call object viewData = info.GetViewData(context); @@ -285,14 +286,5 @@ // Assert mocks.VerifyAll(); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("test", new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -35,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section); @@ -56,7 +55,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section); @@ -67,13 +66,5 @@ Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -35,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section); @@ -56,24 +55,15 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section); // Call - failureMechanismSectionResult.AssessmentLayerThree = (RoundedDouble)newValue; + failureMechanismSectionResult.AssessmentLayerThree = (RoundedDouble) newValue; // Assert Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - var section = new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - return section; - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacrostabilityOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacrostabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacrostabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -36,7 +35,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section); @@ -57,7 +56,7 @@ public void AssessmentLayerTwoA_ForInvalidValues_ThrowsException(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section); // Call @@ -79,7 +78,7 @@ public void AssessmentLayerTwoA_ForValidValues_NewValueSet(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section); // Call @@ -98,22 +97,15 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - var failureMechanismSectionResult = new MacrostabilityOutwardsFailureMechanismSectionResult(CreateSection()); + var failureMechanismSectionResult = new MacrostabilityOutwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call - failureMechanismSectionResult.AssessmentLayerThree = (RoundedDouble)newValue; + failureMechanismSectionResult.AssessmentLayerThree = (RoundedDouble) newValue; // Assert Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs (.../MicrostabilityFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs (.../MicrostabilityFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -35,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new MicrostabilityFailureMechanismSectionResult(section); @@ -56,7 +55,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MicrostabilityFailureMechanismSectionResult(section); // Call @@ -66,13 +65,5 @@ Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultTest.cs (.../PipingStructureFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultTest.cs (.../PipingStructureFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -35,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new PipingStructureFailureMechanismSectionResult(section); @@ -56,7 +55,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingStructureFailureMechanismSectionResult(section); // Call @@ -66,13 +65,5 @@ Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -35,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section); @@ -55,7 +54,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section); // Call @@ -65,13 +64,5 @@ Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResultTest.cs (.../TechnicalInnovationFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResultTest.cs (.../TechnicalInnovationFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -35,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new TechnicalInnovationFailureMechanismSectionResult(section); @@ -55,7 +54,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new TechnicalInnovationFailureMechanismSectionResult(section); // Call @@ -65,13 +64,5 @@ Assert.AreEqual(newValue, failureMechanismSectionResult.AssessmentLayerThree, failureMechanismSectionResult.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowTest.cs (.../GrassCoverSlipOffInwardsSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowTest.cs (.../GrassCoverSlipOffInwardsSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section); // Call @@ -61,7 +60,7 @@ { // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section); var row = new GrassCoverSlipOffInwardsSectionResultRow(result); @@ -78,7 +77,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section); var row = new GrassCoverSlipOffInwardsSectionResultRow(result); @@ -88,13 +87,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffOutwardsSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffOutwardsSectionResultRowTest.cs (.../GrassCoverSlipOffOutwardsSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/GrassCoverSlipOffOutwardsSectionResultRowTest.cs (.../GrassCoverSlipOffOutwardsSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section); // Call @@ -61,7 +60,7 @@ { // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section); var row = new GrassCoverSlipOffOutwardsSectionResultRow(result); @@ -78,7 +77,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(section); var row = new GrassCoverSlipOffOutwardsSectionResultRow(result); @@ -88,13 +87,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacrostabilityOutwardsSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacrostabilityOutwardsSectionResultRowTest.cs (.../MacrostabilityOutwardsSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacrostabilityOutwardsSectionResultRowTest.cs (.../MacrostabilityOutwardsSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section); // Call @@ -68,7 +67,7 @@ public void AssessmentLayerTwoA_ForValidValues_ResultPropertyChanged(double value) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section); var row = new MacrostabilityOutwardsSectionResultRow(result); @@ -88,7 +87,7 @@ public void AssessmentLayerTwoA_ForInvalidValues_ThrowsArgumentException(double value) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section); var row = new MacrostabilityOutwardsSectionResultRow(result); @@ -107,7 +106,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section); var row = new MacrostabilityOutwardsSectionResultRow(result); @@ -117,13 +116,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MicrostabilitySectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MicrostabilitySectionResultRowTest.cs (.../MicrostabilitySectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MicrostabilitySectionResultRowTest.cs (.../MicrostabilitySectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MicrostabilityFailureMechanismSectionResult(section); // Call @@ -60,7 +59,7 @@ { // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MicrostabilityFailureMechanismSectionResult(section); var row = new MicrostabilitySectionResultRow(result); @@ -77,7 +76,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MicrostabilityFailureMechanismSectionResult(section); var row = new MicrostabilitySectionResultRow(result); @@ -87,13 +86,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/PipingStructureSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/PipingStructureSectionResultRowTest.cs (.../PipingStructureSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/PipingStructureSectionResultRowTest.cs (.../PipingStructureSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new PipingStructureFailureMechanismSectionResult(section); // Call @@ -60,7 +59,7 @@ { // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new PipingStructureFailureMechanismSectionResult(section); var row = new PipingStructureSectionResultRow(result); @@ -77,7 +76,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new PipingStructureFailureMechanismSectionResult(section); var row = new PipingStructureSectionResultRow(result); @@ -87,13 +86,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section); // Call @@ -60,7 +59,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section); var row = new StrengthStabilityLengthwiseConstructionSectionResultRow(result); @@ -70,13 +69,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/TechnicalInnovationSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/TechnicalInnovationSectionResultRowTest.cs (.../TechnicalInnovationSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/TechnicalInnovationSectionResultRowTest.cs (.../TechnicalInnovationSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithProperties_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new TechnicalInnovationFailureMechanismSectionResult(section); // Call @@ -60,7 +59,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new TechnicalInnovationFailureMechanismSectionResult(section); var row = new TechnicalInnovationSectionResultRow(result); @@ -70,13 +69,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/WaterPressureAsphaltCoverSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/WaterPressureAsphaltCoverSectionResultRowTest.cs (.../WaterPressureAsphaltCoverSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/WaterPressureAsphaltCoverSectionResultRowTest.cs (.../WaterPressureAsphaltCoverSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new WaterPressureAsphaltCoverFailureMechanismSectionResult(section); // Call @@ -60,7 +59,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new WaterPressureAsphaltCoverFailureMechanismSectionResult(section); var row = new WaterPressureAsphaltCoverSectionResultRow(result); @@ -70,13 +69,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,10 +20,10 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.MacroStabilityInwards.Data.Test { @@ -34,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); @@ -55,15 +55,15 @@ public void AssessmentLayerThree_SetInvalidValue_ThrowsArgumentOutOfRangeException(double invalidValue) { // Setup - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(CreateSection()); + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; // Assert const string expectedMessage = "Kans moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, - expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } [Test] @@ -74,21 +74,14 @@ public void AssessmentLayerThree_SetValidValue_SetsValue(double validValue) { // Setup - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(CreateSection()); + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call sectionResult.AssessmentLayerThree = validValue; // Assert Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("test", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -22,11 +22,11 @@ using System; using System.Linq; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.MacroStabilityInwards.Data; @@ -42,7 +42,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call @@ -63,7 +63,7 @@ public void Constructor_CalculationsNull_ThrowsArgumentNullException() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call @@ -78,7 +78,7 @@ public void AssessmentLayerTwoA_NoScenarios_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call @@ -97,10 +97,12 @@ public void AssessmentLayerTwoA_RelevantScenarioContributionDontAddUpTo1_ReturnNaN(double contributionA, double contributionB) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - MacroStabilityInwardsCalculationScenario scenarioA = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); - MacroStabilityInwardsCalculationScenario scenarioB = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario scenarioA = + MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario scenarioB = + MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); scenarioA.Contribution = (RoundedDouble) contributionA; scenarioB.Contribution = (RoundedDouble) contributionB; @@ -124,11 +126,12 @@ public void AssessmentLayerTwoA_NoRelevantScenariosDone_ReturnNaN(CalculationScenarioStatus status) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - MacroStabilityInwardsCalculationScenario scenario = status.Equals(CalculationScenarioStatus.NotCalculated) - ? MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section) - : MacroStabilityInwardsCalculationScenarioFactory.CreateFailedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario scenario = + status.Equals(CalculationScenarioStatus.NotCalculated) + ? MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section) + : MacroStabilityInwardsCalculationScenarioFactory.CreateFailedMacroStabilityInwardsCalculationScenario(section); var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); var row = new MacroStabilityInwardsFailureMechanismSectionResultRow(result, new[] @@ -147,8 +150,9 @@ public void AssessmentLayerTwoA_RelevantScenariosDone_ResultOfSection() { // Setup - FailureMechanismSection section = CreateSection(); - MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(0.2, section); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + MacroStabilityInwardsCalculationScenario scenario = + MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(0.2, section); scenario.Contribution = (RoundedDouble) 1.0; var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); @@ -175,7 +179,8 @@ var random = new Random(21); double assessmentLayerThree = random.NextDouble(); - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(CreateSection()); + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new MacroStabilityInwardsFailureMechanismSectionResultRow(sectionResult, Enumerable.Empty()); @@ -185,14 +190,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0), - new Point2D(1, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,10 +21,10 @@ using System.Linq; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Data.TestUtil; namespace Ringtoets.Piping.Data.Test @@ -36,7 +36,7 @@ public void GetAssessmentLayerTwoA_MultipleScenarios_ReturnsValueBasedOnRelevantAndDoneScenarios() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); const double contribution1 = 0.2; @@ -79,7 +79,7 @@ public void GetAssessmentLayerTwoA_ScenarioInvalidOutput_ReturnsZero() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); @@ -99,7 +99,7 @@ public void GetAssessmentLayerTwoA_NoScenarios_ReturnsZero() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); // Call @@ -113,7 +113,7 @@ public void GetAssessmentLayerTwoA_NoRelevantScenarios_ReturnsZero() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario calculationScenario1 = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); @@ -136,7 +136,7 @@ public void GetAssessmentLayerTwoA_ScenarioNotCalculated_ReturnsZero() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); @@ -155,7 +155,7 @@ public void GetTotalContribution_Always_ReturnsTotalRelevantScenarioContribution() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); @@ -184,7 +184,7 @@ public void GetCalculationScenarioStatus_ScenarioNotCalculated_ReturnsStatusNotCalculated() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); @@ -203,7 +203,7 @@ public void GetCalculationScenarioStatus_ScenarioInvalidOutput_ReturnsStatusFailed() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); @@ -223,7 +223,7 @@ public void GetCalculationScenarioStatus_ScenarioInvalidOutputAndNotCalculated_ReturnsStatusFailed() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); @@ -249,7 +249,7 @@ public void GetCalculationScenarioStatus_ScenariosCalculated_ReturnsStatusDone() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.1, section); @@ -269,7 +269,7 @@ public void GetCalculationScenarioStatus_NoScenarios_ReturnsStatusDone() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); // Call @@ -278,14 +278,5 @@ // Assert Assert.AreEqual(CalculationScenarioStatus.Done, status); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("test", new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,10 +20,10 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Piping.Data.Test { @@ -34,7 +34,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var sectionResult = new PipingFailureMechanismSectionResult(section); @@ -55,7 +55,7 @@ public void AssessmentLayerThree_SetInvalidValue_ThrowsArgumentOutOfRangeException(double invalidValue) { // Setup - var sectionResult = new PipingFailureMechanismSectionResult(CreateSection()); + var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; @@ -73,21 +73,13 @@ public void AssessmentLayerThree_SetValidValue_SetsValue(double validValue) { // Setup - var sectionResult = new PipingFailureMechanismSectionResult(CreateSection()); + var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call sectionResult.AssessmentLayerThree = validValue; // Assert Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("test", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioFactoryTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioFactoryTest.cs (.../PipingCalculationScenarioFactoryTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioFactoryTest.cs (.../PipingCalculationScenarioFactoryTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,9 +20,9 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Service; namespace Ringtoets.Piping.Data.TestUtil.Test @@ -49,7 +49,7 @@ public void CreatePipingCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(double probability) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call PipingCalculationScenario scenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability, section); @@ -76,7 +76,7 @@ public void CreateFailedPipingCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSetToNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call PipingCalculationScenario scenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); @@ -103,7 +103,7 @@ public void CreateIrrelevantPipingCalculationScenario_WithSection_CreatesIrrelevantCalculation() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call PipingCalculationScenario scenario = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); @@ -127,7 +127,7 @@ public void CreateNotCalculatedPipingCalculationScenario_WithSection_CreatesRelevantCalculationWithoutOutput() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call PipingCalculationScenario scenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); @@ -157,13 +157,5 @@ // Assert Assert.IsTrue(PipingCalculationService.Validate(scenario)); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -22,11 +22,11 @@ using System; using System.Linq; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.Piping.Data; @@ -42,7 +42,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new PipingFailureMechanismSectionResult(section); // Call @@ -63,7 +63,7 @@ public void Constructor_CalculationsNull_ThrowsArgumentNullException() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new PipingFailureMechanismSectionResult(section); // Call @@ -78,7 +78,7 @@ public void AssessmentLayerTwoA_NoScenarios_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new PipingFailureMechanismSectionResult(section); // Call @@ -97,7 +97,7 @@ public void AssessmentLayerTwoA_RelevantScenarioContributionDontAddUpTo1_ReturnNaN(double contributionA, double contributionB) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); PipingCalculationScenario scenarioA = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); PipingCalculationScenario scenarioB = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); @@ -124,7 +124,7 @@ public void AssessmentLayerTwoA_NoRelevantScenariosDone_ReturnNaN(CalculationScenarioStatus status) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); PipingCalculationScenario scenario = status.Equals(CalculationScenarioStatus.NotCalculated) ? PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section) @@ -147,7 +147,7 @@ public void AssessmentLayerTwoA_RelevantScenariosDone_ResultOfSection() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); PipingCalculationScenario scenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.2, section); scenario.Contribution = (RoundedDouble) 1.0; @@ -175,7 +175,8 @@ var random = new Random(21); double assessmentLayerThree = random.NextDouble(); - var sectionResult = new PipingFailureMechanismSectionResult(CreateSection()); + var sectionResult = new PipingFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new PipingFailureMechanismSectionResultRow(sectionResult, Enumerable.Empty()); @@ -185,14 +186,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0), - new Point2D(1, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb28a844780b613e1901fa82328ba3917f485c729 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision b28a844780b613e1901fa82328ba3917f485c729) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; @@ -34,7 +33,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new StabilityPointStructuresFailureMechanismSectionResult(section); @@ -48,7 +47,7 @@ public void AssessmentLayerTwoA_CalculationNull_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityPointStructuresFailureMechanismSectionResult(section) { @@ -66,7 +65,7 @@ public void AssessmentLayerTwoA_FailedCalculation_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityPointStructuresFailureMechanismSectionResult(section) { @@ -87,7 +86,7 @@ public void AssessmentLayerTwoA_SuccessfulCalculation_ReturnProbability() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); const double probability = 0.65; var result = new StabilityPointStructuresFailureMechanismSectionResult(section) @@ -104,13 +103,5 @@ // Assert Assert.AreEqual(probability, twoAValue); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; @@ -41,7 +40,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityPointStructuresFailureMechanismSectionResult(section); // Call @@ -62,7 +61,7 @@ public void AssessmentLayerTwoA_NoCalculationSet_ReturnNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section); // Precondition @@ -89,7 +88,7 @@ calculation.Output = new TestStructuresOutput(double.NaN); } - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section) { Calculation = calculation @@ -114,7 +113,7 @@ Output = new TestStructuresOutput(probability) }; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section) { Calculation = calculation @@ -133,7 +132,7 @@ public void GetSectionResultCalculation_NoCalculationSetOnSectionResult_ReturnNull() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityPointStructuresFailureMechanismSectionResult(section); // Precondition @@ -154,7 +153,7 @@ // Setup var expectedCalculation = new StructuresCalculation(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityPointStructuresFailureMechanismSectionResult(section) { Calculation = expectedCalculation @@ -176,7 +175,7 @@ var random = new Random(21); double assessmentLayerThree = random.NextDouble(); - var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSection()); + var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new StabilityPointStructuresFailureMechanismSectionResultRow(sectionResult); // Call @@ -185,13 +184,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -34,7 +33,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new StabilityStoneCoverFailureMechanismSectionResult(section); @@ -55,7 +54,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityStoneCoverFailureMechanismSectionResult(section); // Call @@ -65,13 +64,5 @@ Assert.AreEqual(newValue, result.AssessmentLayerThree, result.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,7 +21,6 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; @@ -40,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityStoneCoverFailureMechanismSectionResult(section); // Call @@ -60,7 +59,7 @@ { // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityStoneCoverFailureMechanismSectionResult(section); var row = new StabilityStoneCoverSectionResultRow(result); @@ -77,7 +76,7 @@ // Setup var random = new Random(21); double newValue = random.NextDouble(); - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityStoneCoverFailureMechanismSectionResult(section); var row = new StabilityStoneCoverSectionResultRow(result); @@ -87,13 +86,5 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerThree, row.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -34,7 +33,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section); @@ -55,7 +54,7 @@ public void AssessmentLayerThree_SetNewValue_ReturnsNewValue(double newValue) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section); // Call @@ -65,13 +64,5 @@ Assert.AreEqual(newValue, result.AssessmentLayerThree, result.AssessmentLayerThree.GetAccuracy()); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("Section", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -rf4049b9b0967513aeadfddb1fe58efa3b3aa1677 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision f4049b9b0967513aeadfddb1fe58efa3b3aa1677) @@ -21,10 +21,10 @@ using System; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.WaveImpactAsphaltCover.Data; @@ -39,7 +39,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section); // Call @@ -60,7 +60,7 @@ // Setup const AssessmentLayerTwoAResult newValue = AssessmentLayerTwoAResult.Successful; - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section); var row = new WaveImpactAsphaltCoverFailureMechanismSectionResultRow(result); @@ -78,7 +78,8 @@ var random = new Random(21); RoundedDouble assessmentLayerThree = random.NextRoundedDouble(); - var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(CreateSection()); + var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult( + FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); var row = new WaveImpactAsphaltCoverFailureMechanismSectionResultRow(sectionResult); // Call @@ -87,13 +88,5 @@ // Assert Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } - - private static FailureMechanismSection CreateSection() - { - return new FailureMechanismSection("name", new[] - { - new Point2D(0, 0) - }); - } } } \ No newline at end of file