Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -1684,7 +1684,7 @@ gridTester.FireEvent("Leave", EventArgs.Empty); // Assert - Assert.AreEqual(new RoundedDouble(2, Convert.ToDouble(newValue)), new RoundedDouble(2, Convert.ToDouble(dataGridViewCell.FormattedValue))); + Assert.AreEqual(Convert.ToDouble(newValue), Convert.ToDouble(dataGridViewCell.FormattedValue)); } } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/RoughnessPointTest.cs =================================================================== diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/RoughnessPointTest.cs (.../RoughnessPointTest.cs) (revision a1abe798a3991d9fff01eae522ccae2a43d0a931) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/RoughnessPointTest.cs (.../RoughnessPointTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -26,6 +26,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.DikeProfiles; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Common.Data.Test.DikeProfiles { @@ -45,7 +46,7 @@ // Assert Assert.AreEqual(new Point2D(1.18, 2.27), roughnessPoint.Point); Assert.AreEqual(2, roughnessPoint.Roughness.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(2, roughness), roughnessPoint.Roughness); + Assert.AreEqual(roughness, roughnessPoint.Roughness, roughnessPoint.Roughness.GetAccuracy()); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision a1abe798a3991d9fff01eae522ccae2a43d0a931) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -99,7 +99,7 @@ // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(numberOfDecimalPlaces, value), distribution.Mean); + Assert.AreEqual(value, distribution.Mean, distribution.Mean.GetAccuracy()); } [Test] @@ -151,7 +151,7 @@ // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.StandardDeviation.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(numberOfDecimalPlaces, standardDeviation), distribution.StandardDeviation); + Assert.AreEqual(standardDeviation, distribution.StandardDeviation, distribution.StandardDeviation.GetAccuracy()); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision a1abe798a3991d9fff01eae522ccae2a43d0a931) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -81,7 +81,7 @@ // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(numberOfDecimalPlaces, value), distribution.Mean); + Assert.AreEqual(value, distribution.Mean, distribution.Mean.GetAccuracy()); } [Test] @@ -98,7 +98,7 @@ // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.StandardDeviation.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(numberOfDecimalPlaces, standardDeviation), distribution.StandardDeviation); + Assert.AreEqual(standardDeviation, distribution.StandardDeviation, distribution.StandardDeviation.GetAccuracy()); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs =================================================================== diff -u -rb286d241c3bfefe14166cc01382e806c98b54b5a -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision b286d241c3bfefe14166cc01382e806c98b54b5a) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -65,7 +65,7 @@ // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.LowerBoundary.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(numberOfDecimalPlaces, value), distribution.LowerBoundary); + Assert.AreEqual(value, distribution.LowerBoundary, distribution.LowerBoundary.GetAccuracy()); } [Test] @@ -80,7 +80,7 @@ // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.UpperBoundary.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(numberOfDecimalPlaces, value), distribution.UpperBoundary); + Assert.AreEqual(value, distribution.UpperBoundary, distribution.UpperBoundary.GetAccuracy()); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs =================================================================== diff -u -r50051daeae0e7195d2cc72d704e8efd81e442f39 -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 50051daeae0e7195d2cc72d704e8efd81e442f39) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -23,14 +23,14 @@ using System.Collections.Generic; using System.IO; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Exceptions; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.IO.FileImporters; using Ringtoets.Common.IO.FileImporters.MessageProviders; using Ringtoets.Common.IO.TestUtil; @@ -328,17 +328,17 @@ Assert.AreEqual("profiel004", dikeProfile4.Id); Assert.AreEqual("Valide naam", dikeProfile4.Name); Assert.AreEqual(-17.93475471, dikeProfile4.X0); - Assert.AreEqual(new RoundedDouble(2, 330.0), dikeProfile4.Orientation); + Assert.AreEqual(330.0, dikeProfile4.Orientation, dikeProfile4.Orientation.GetAccuracy()); Assert.IsFalse(dikeProfile4.HasBreakWater); DikeProfile dikeProfile5 = dikeProfiles[4]; Assert.AreEqual(new Point2D(136039.49100000039, 533920.28050000477), dikeProfile5.WorldReferencePoint); Assert.AreEqual("profiel005", dikeProfile5.Id); Assert.AreEqual("Heeeeeeeeeeeeeeeeeeeeeeeele laaaaaaaaaaaaaaaaaaaange naaaaaaaaaaam", dikeProfile5.Name); Assert.AreEqual(15.56165507, dikeProfile5.X0); - Assert.AreEqual(new RoundedDouble(2, 330.0), dikeProfile5.Orientation); + Assert.AreEqual(330.0, dikeProfile5.Orientation, dikeProfile5.Orientation.GetAccuracy()); Assert.IsTrue(dikeProfile5.HasBreakWater); - Assert.AreEqual(new RoundedDouble(2, 6.0), dikeProfile5.DikeHeight); + Assert.AreEqual(6.0, dikeProfile5.DikeHeight, dikeProfile5.DikeHeight.GetAccuracy()); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs =================================================================== diff -u -r31f4ca2b08257cf05459f63e0d715239e3d90c55 -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision 31f4ca2b08257cf05459f63e0d715239e3d90c55) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -24,7 +24,6 @@ using System.IO; using System.Linq; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -33,6 +32,7 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.IO.FileImporters; using Ringtoets.Common.IO.FileImporters.MessageProviders; @@ -369,15 +369,15 @@ Assert.AreEqual("profiel004", foreshoreProfile4.Id); Assert.AreEqual("Valide naam", foreshoreProfile4.Name); Assert.AreEqual(-17.93475471, foreshoreProfile4.X0); - Assert.AreEqual(new RoundedDouble(2, 330.0), foreshoreProfile4.Orientation); + Assert.AreEqual(330.0, foreshoreProfile4.Orientation, foreshoreProfile4.Orientation.GetAccuracy()); Assert.IsFalse(foreshoreProfile4.HasBreakWater); ForeshoreProfile foreshoreProfile5 = readForeshoreProfilesArray[4]; Assert.AreEqual(new Point2D(136039.49100000039, 533920.28050000477), foreshoreProfile5.WorldReferencePoint); Assert.AreEqual("profiel005", foreshoreProfile5.Id); Assert.AreEqual("Heeeeeeeeeeeeeeeeeeeeeeeele laaaaaaaaaaaaaaaaaaaange naaaaaaaaaaam", foreshoreProfile5.Name); Assert.AreEqual(15.56165507, foreshoreProfile5.X0); - Assert.AreEqual(new RoundedDouble(2, 330.0), foreshoreProfile5.Orientation); + Assert.AreEqual(330.0, foreshoreProfile5.Orientation, foreshoreProfile5.Orientation.GetAccuracy()); Assert.IsTrue(foreshoreProfile5.HasBreakWater); }); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -r7927641f2d9d74e77740f88c794fbcfd03a250dc -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 7927641f2d9d74e77740f88c794fbcfd03a250dc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -187,7 +187,7 @@ // Assert Assert.AreEqual(originalNumberOfDecimalPlaces, input.ExitPointL.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(originalNumberOfDecimalPlaces, exitPointValue), input.ExitPointL); + Assert.AreEqual(exitPointValue, input.ExitPointL, input.ExitPointL.GetAccuracy()); } [Test] @@ -261,7 +261,7 @@ // Assert Assert.AreEqual(originalNumberOfDecimalPlaces, input.EntryPointL.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(originalNumberOfDecimalPlaces, entryPointValue), input.EntryPointL); + Assert.AreEqual(entryPointValue, input.EntryPointL, input.EntryPointL.GetAccuracy()); } [Test] @@ -284,8 +284,8 @@ input.SurfaceLine = surfaceLine; // Assert - Assert.AreEqual(new RoundedDouble(2, 1), input.EntryPointL); - Assert.AreEqual(new RoundedDouble(2, 2), input.ExitPointL); + Assert.AreEqual(2, input.EntryPointL, input.EntryPointL.GetAccuracy()); + Assert.AreEqual(3, input.ExitPointL, input.ExitPointL.GetAccuracy()); } [Test] @@ -315,8 +315,8 @@ input.SurfaceLine = surfaceLine; // Assert - Assert.AreEqual(new RoundedDouble(2, 2), input.EntryPointL); - Assert.AreEqual(new RoundedDouble(3, 3), input.ExitPointL); + Assert.AreEqual(2, input.EntryPointL, input.EntryPointL.GetAccuracy()); + Assert.AreEqual(3, input.ExitPointL, input.ExitPointL.GetAccuracy()); } [Test] @@ -346,8 +346,8 @@ input.SurfaceLine = surfaceLine; // Assert - Assert.AreEqual(new RoundedDouble(2, 2), input.EntryPointL); - Assert.AreEqual(new RoundedDouble(2, 3), input.ExitPointL); + Assert.AreEqual(2, input.EntryPointL, input.EntryPointL.GetAccuracy()); + Assert.AreEqual(3, input.ExitPointL, input.ExitPointL.GetAccuracy()); } [Test] @@ -395,8 +395,8 @@ input.SynchronizeEntryAndExitPointInput(); // Assert - Assert.AreEqual(new RoundedDouble(2, 2), input.EntryPointL); - Assert.AreEqual(new RoundedDouble(3, 3), input.ExitPointL); + Assert.AreEqual(2, input.EntryPointL, input.EntryPointL.GetAccuracy()); + Assert.AreEqual(3, input.ExitPointL, input.ExitPointL.GetAccuracy()); } [Test] @@ -426,8 +426,8 @@ input.SynchronizeEntryAndExitPointInput(); // Assert - Assert.AreEqual(new RoundedDouble(2, 2), input.EntryPointL); - Assert.AreEqual(new RoundedDouble(2, 3), input.ExitPointL); + Assert.AreEqual(2, input.EntryPointL, input.EntryPointL.GetAccuracy()); + Assert.AreEqual(3, input.ExitPointL, input.ExitPointL.GetAccuracy()); } [Test] @@ -599,7 +599,7 @@ // Assert Assert.AreEqual(originalNumberOfDecimalPlaces, input.AssessmentLevel.NumberOfDecimalPlaces); - Assert.AreEqual(new RoundedDouble(originalNumberOfDecimalPlaces, assessmentLevel), input.AssessmentLevel); + Assert.AreEqual(assessmentLevel, input.AssessmentLevel, input.AssessmentLevel.GetAccuracy()); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs =================================================================== diff -u -r8b37c0f11e7d78b71c298763124973e94845c87b -r2a61453b3c465ad734985fb9f42352b76a6ab5bc --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision 8b37c0f11e7d78b71c298763124973e94845c87b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision 2a61453b3c465ad734985fb9f42352b76a6ab5bc) @@ -188,7 +188,7 @@ row.Contribution = (RoundedDouble) newValue; // Assert - Assert.AreEqual(new RoundedDouble(2, newValue), calculation.Contribution * 100); + Assert.AreEqual(newValue, calculation.Contribution * 100, calculation.Contribution.GetAccuracy()); mocks.VerifyAll(); }