Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -r7472a3a034f5d43d665980b35727c63d167abb5e -r02096656a864837dcf98505a1ba3145cd1a60608 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs (.../MacroStabilityInwardsOutputCreateExtensionsTest.cs) (revision 7472a3a034f5d43d665980b35727c63d167abb5e) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs (.../MacroStabilityInwardsOutputCreateExtensionsTest.cs) (revision 02096656a864837dcf98505a1ba3145cd1a60608) @@ -24,7 +24,6 @@ using Application.Ringtoets.Storage.Create.MacroStabilityInwards; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -65,8 +64,8 @@ random.NextDouble(), random.NextDouble()); - MacroStabilityInwardsGrid leftGrid = CreateGrid(13); - MacroStabilityInwardsGrid rightGrid = CreateGrid(34); + MacroStabilityInwardsGrid leftGrid = MacroStabilityInwardsGridTestFactory.Create(); + MacroStabilityInwardsGrid rightGrid = MacroStabilityInwardsGridTestFactory.Create(); var tangentLines = new[] { random.NextDouble() @@ -149,28 +148,9 @@ #region Slip Plane Helpers - private static MacroStabilityInwardsGrid CreateGrid(int seed) - { - var random = new Random(seed); - return new MacroStabilityInwardsGrid(random.NextDouble(), - 1 + random.NextDouble(), - 1 + random.NextDouble(), - random.NextDouble()) - { - NumberOfHorizontalPoints = random.Next(1, 100), - NumberOfVerticalPoints = random.Next(1, 100) - }; - } - private static MacroStabilityInwardsGrid CreateGridWithNaNValues() { - return new MacroStabilityInwardsGrid(double.NaN, double.NaN, double.NaN, double.NaN) - { - XLeft = RoundedDouble.NaN, - XRight = RoundedDouble.NaN, - ZTop = RoundedDouble.NaN, - ZBottom = RoundedDouble.NaN - }; + return new MacroStabilityInwardsGrid(double.NaN, double.NaN, double.NaN, double.NaN); } #endregion Index: Core/Common/src/Core.Common.Base/Geometry/Segment2DCollectionExtensions.cs =================================================================== diff -u -r2fd427d95bfd8c000da089fedcf7b2fe2ca592e2 -r02096656a864837dcf98505a1ba3145cd1a60608 --- Core/Common/src/Core.Common.Base/Geometry/Segment2DCollectionExtensions.cs (.../Segment2DCollectionExtensions.cs) (revision 2fd427d95bfd8c000da089fedcf7b2fe2ca592e2) +++ Core/Common/src/Core.Common.Base/Geometry/Segment2DCollectionExtensions.cs (.../Segment2DCollectionExtensions.cs) (revision 02096656a864837dcf98505a1ba3145cd1a60608) @@ -50,13 +50,6 @@ return Interpolate(segment, x); } - /// - /// Interpolates the segment on . - /// - /// The segment to interpolate on. - /// The x value to use for interpolation. - /// The interpolated y value of the or - /// when no interpolation was found. private static double Interpolate(Segment2D segment, double x) { double differenceInX = segment.SecondPoint.X - segment.FirstPoint.X; Index: Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs =================================================================== diff -u -rce5fb67782799e1a30202e917044803e62e7e078 -r02096656a864837dcf98505a1ba3145cd1a60608 --- Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs (.../RandomExtensions.cs) (revision ce5fb67782799e1a30202e917044803e62e7e078) +++ Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs (.../RandomExtensions.cs) (revision 02096656a864837dcf98505a1ba3145cd1a60608) @@ -96,7 +96,7 @@ } /// - /// Returns a random value. + /// Generates a new pseudo-random number between and . /// /// A pseudo-random number generator. /// The lower limit of the new random number. Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridTest.cs =================================================================== diff -u -r6b59d4a1f72c5a1378a3b8d545b60440bb4ac7b4 -r02096656a864837dcf98505a1ba3145cd1a60608 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridTest.cs (.../MacroStabilityInwardsGridTest.cs) (revision 6b59d4a1f72c5a1378a3b8d545b60440bb4ac7b4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridTest.cs (.../MacroStabilityInwardsGridTest.cs) (revision 02096656a864837dcf98505a1ba3145cd1a60608) @@ -107,7 +107,7 @@ } [Test] - public void Constructor_SetProperties_ExpectedValues() + public void Properties_ValidValues_ExpectedValues() { // Setup var random = new Random(21); @@ -118,34 +118,21 @@ int numberOfHorizontalPoints = random.Next(1, 100); int numberOfVerticalPoints = random.Next(1, 100); + var grid = new MacroStabilityInwardsGrid(double.NaN, double.NaN, double.NaN, double.NaN); + // Call - var grid = new MacroStabilityInwardsGrid(double.NaN, double.NaN, double.NaN, double.NaN) - { - XLeft = (RoundedDouble) xLeft, - XRight = (RoundedDouble) xRight, - ZTop = (RoundedDouble) zTop, - ZBottom = (RoundedDouble) zBottom, - NumberOfHorizontalPoints = numberOfHorizontalPoints, - NumberOfVerticalPoints = numberOfVerticalPoints - }; + grid.XLeft = (RoundedDouble) xLeft; + grid.XRight = (RoundedDouble) xRight; + grid.ZTop = (RoundedDouble) zTop; + grid.ZBottom = (RoundedDouble) zBottom; + grid.NumberOfHorizontalPoints = numberOfHorizontalPoints; + grid.NumberOfVerticalPoints = numberOfVerticalPoints; // Assert - Assert.AreEqual(2, grid.XLeft.NumberOfDecimalPlaces); - Assert.AreEqual(xLeft, grid.XLeft, - grid.XLeft.GetAccuracy()); - - Assert.AreEqual(2, grid.XRight.NumberOfDecimalPlaces); - Assert.AreEqual(xRight, grid.XRight, - grid.XRight.GetAccuracy()); - - Assert.AreEqual(2, grid.ZTop.NumberOfDecimalPlaces); - Assert.AreEqual(zTop, grid.ZTop, - grid.ZTop.GetAccuracy()); - - Assert.AreEqual(2, grid.ZBottom.NumberOfDecimalPlaces); - Assert.AreEqual(zBottom, grid.ZBottom, - grid.ZBottom.GetAccuracy()); - + Assert.AreEqual(xLeft, grid.XLeft, grid.XLeft.GetAccuracy()); + Assert.AreEqual(xRight, grid.XRight, grid.XRight.GetAccuracy()); + Assert.AreEqual(zTop, grid.ZTop, grid.ZTop.GetAccuracy()); + Assert.AreEqual(zBottom, grid.ZBottom, grid.ZBottom.GetAccuracy()); Assert.AreEqual(numberOfHorizontalPoints, grid.NumberOfHorizontalPoints); Assert.AreEqual(numberOfVerticalPoints, grid.NumberOfVerticalPoints); }