Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs =================================================================== diff -u -r7b2237f0bdfa03edcf158d24294c4433266ca91f -r53375024cc287410d9c23b78aa2d806a3a381ae0 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs) (revision 7b2237f0bdfa03edcf158d24294c4433266ca91f) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs) (revision 53375024cc287410d9c23b78aa2d806a3a381ae0) @@ -52,7 +52,7 @@ MacroStabilityInwardsGrid leftGrid = ConvertGrid(result.LeftGrid); MacroStabilityInwardsGrid rightGrid = ConvertGrid(result.RightGrid); - return new MacroStabilityInwardsSlipPlaneUpliftVan(leftGrid, rightGrid, result.TangentLines.Select(tangentLine => new RoundedDouble(2, tangentLine))); + return new MacroStabilityInwardsSlipPlaneUpliftVan(leftGrid, rightGrid, result.TangentLines.Select(tangentLine => (RoundedDouble) tangentLine)); } private static MacroStabilityInwardsGrid ConvertGrid(UpliftVanGrid grid) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs =================================================================== diff -u -r7b2237f0bdfa03edcf158d24294c4433266ca91f -r53375024cc287410d9c23b78aa2d806a3a381ae0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs) (revision 7b2237f0bdfa03edcf158d24294c4433266ca91f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs) (revision 53375024cc287410d9c23b78aa2d806a3a381ae0) @@ -85,8 +85,8 @@ MacroStabilityInwardsGrid rightGrid = MacroStabilityInwardsGridTestFactory.Create(); IEnumerable tangentLines = new[] { - (RoundedDouble) 3.4, - (RoundedDouble) 0.1 + (RoundedDouble) 3.4567, + (RoundedDouble) 0.1294 }; // Call @@ -97,13 +97,11 @@ Assert.AreSame(leftGrid, result.LeftGrid); Assert.AreSame(rightGrid, result.RightGrid); - Assert.AreEqual(tangentLines.Count(), result.TangentLines.Count()); - for (var i = 0; i < tangentLines.Count(); i++) + CollectionAssert.AreEqual(new[] { - RoundedDouble tangentLine = result.TangentLines.ElementAt(i); - Assert.AreEqual(2, tangentLine.NumberOfDecimalPlaces); - Assert.AreEqual(tangentLines.ElementAt(i), tangentLine, tangentLine.GetAccuracy()); - } + 2, 2 + }, result.TangentLines.Select(tl => tl.NumberOfDecimalPlaces)); + CollectionAssert.AreEqual(tangentLines.Select(tl => tl.Value), result.TangentLines.Select(tl => tl.Value), new DoubleWithToleranceComparer(1e-2)); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs =================================================================== diff -u -r7b2237f0bdfa03edcf158d24294c4433266ca91f -r53375024cc287410d9c23b78aa2d806a3a381ae0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsChartDataPointsFactoryTest.cs) (revision 7b2237f0bdfa03edcf158d24294c4433266ca91f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsChartDataPointsFactoryTest.cs) (revision 53375024cc287410d9c23b78aa2d806a3a381ae0) @@ -1535,8 +1535,8 @@ IEnumerable lines = MacroStabilityInwardsChartDataPointsFactory.CreateTangentLines( MacroStabilityInwardsGridDeterminationType.Manual, MacroStabilityInwardsTangentLineDeterminationType.Specified, - new RoundedDouble(2, bottom), - new RoundedDouble(2, top), + (RoundedDouble) bottom, + (RoundedDouble) top, 3, GetSurfaceLineWithGeometry()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -r7b2237f0bdfa03edcf158d24294c4433266ca91f -r53375024cc287410d9c23b78aa2d806a3a381ae0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 7b2237f0bdfa03edcf158d24294c4433266ca91f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 53375024cc287410d9c23b78aa2d806a3a381ae0) @@ -760,15 +760,18 @@ SetGridValues(input.LeftGrid); SetGridValues(input.RightGrid); - // Call - calculation.InputParameters.NotifyObservers(); - - // Assert + // Precondition ChartDataCollection chartData = view.Chart.Data; List chartDataList = chartData.Collection.ToList(); var actualLeftGridData = (ChartPointData) chartDataList[leftGridIndex]; var actualRightGridData = (ChartPointData) chartDataList[rightGridIndex]; + CollectionAssert.IsEmpty(actualLeftGridData.Points); + CollectionAssert.IsEmpty(actualRightGridData.Points); + // Call + calculation.InputParameters.NotifyObservers(); + + // Assert MacroStabilityInwardsViewChartDataAssert.AssertGridChartData(input.LeftGrid, actualLeftGridData); MacroStabilityInwardsViewChartDataAssert.AssertGridChartData(input.RightGrid, actualRightGridData); } @@ -798,13 +801,16 @@ input.TangentLineZBottom = (RoundedDouble) 5; input.TangentLineNumber = 2; + // Precondition + ChartDataCollection chartData = view.Chart.Data; + List chartDataList = chartData.Collection.ToList(); + var tangentLinesData = (ChartMultipleLineData) chartDataList[tangentLinesIndex]; + CollectionAssert.IsEmpty(tangentLinesData.Lines); + // Call calculation.InputParameters.NotifyObservers(); // Assert - ChartDataCollection chartData = view.Chart.Data; - List chartDataList = chartData.Collection.ToList(); - var tangentLinesData = (ChartMultipleLineData) chartDataList[tangentLinesIndex]; CollectionAssert.AreEqual(new[] { new[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs =================================================================== diff -u -r7b2237f0bdfa03edcf158d24294c4433266ca91f -r53375024cc287410d9c23b78aa2d806a3a381ae0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs) (revision 7b2237f0bdfa03edcf158d24294c4433266ca91f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs) (revision 53375024cc287410d9c23b78aa2d806a3a381ae0) @@ -20,11 +20,9 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Linq; -using Core.Common.Base.Data; +using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan; using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output; @@ -66,22 +64,11 @@ MacroStabilityInwardsSlipPlaneUpliftVan output = MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(result); // Assert - AssertTangentLines(tangentLines, output.TangentLines); + CollectionAssert.AreEqual(tangentLines, output.TangentLines.Select(tl => tl.Value), new DoubleWithToleranceComparer(1e-2)); AssertGrid(leftGrid, output.LeftGrid); AssertGrid(rightGrid, output.RightGrid); } - private static void AssertTangentLines(IEnumerable expectedTangentLines, IEnumerable actualTangentLines) - { - Assert.AreEqual(expectedTangentLines.Count(), actualTangentLines.Count()); - for (var i = 0; i < expectedTangentLines.Count(); i++) - { - RoundedDouble tangentLine = actualTangentLines.ElementAt(i); - Assert.AreEqual(2, tangentLine.NumberOfDecimalPlaces); - Assert.AreEqual(expectedTangentLines.ElementAt(i), tangentLine, tangentLine.GetAccuracy()); - } - } - private static void AssertGrid(UpliftVanGrid expectedGrid, MacroStabilityInwardsGrid actualGrid) { Assert.AreEqual(expectedGrid.XLeft, actualGrid.XLeft); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r7b2237f0bdfa03edcf158d24294c4433266ca91f -r53375024cc287410d9c23b78aa2d806a3a381ae0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 7b2237f0bdfa03edcf158d24294c4433266ca91f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 53375024cc287410d9c23b78aa2d806a3a381ae0) @@ -22,11 +22,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Core.Common.Base.Data; using Core.Common.TestUtil; using log4net.Core; using NUnit.Framework; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.TestUtil; using Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil; using Ringtoets.MacroStabilityInwards.Data; @@ -699,22 +697,11 @@ private static void AssertSlipPlaneOutput(UpliftVanCalculationGridResult expected, MacroStabilityInwardsSlipPlaneUpliftVan actual) { - AssertTangentLines(expected.TangentLines, actual.TangentLines); + CollectionAssert.AreEqual(expected.TangentLines, actual.TangentLines.Select(tl => tl.Value), new DoubleWithToleranceComparer(1e-2)); AssertGrid(expected.LeftGrid, actual.LeftGrid); AssertGrid(expected.RightGrid, actual.RightGrid); } - private static void AssertTangentLines(IEnumerable expectedTangentLines, IEnumerable actualTangentLines) - { - Assert.AreEqual(expectedTangentLines.Count(), actualTangentLines.Count()); - for (var i = 0; i < expectedTangentLines.Count(); i++) - { - RoundedDouble tangentLine = actualTangentLines.ElementAt(i); - Assert.AreEqual(2, tangentLine.NumberOfDecimalPlaces); - Assert.AreEqual(expectedTangentLines.ElementAt(i), tangentLine, tangentLine.GetAccuracy()); - } - } - private static void AssertGrid(UpliftVanGrid expectedGrid, MacroStabilityInwardsGrid actualGrid) { Assert.AreEqual(expectedGrid.XLeft, actualGrid.XLeft);