Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -242,11 +242,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, (o, c) => - { - Assert.AreEqual(o.Type, c.Type); - Assert.AreEqual(o.Height, c.Height); - }); + CloneAssert.AreClones(original, clone, TestUtil.CloneAssert.AreClones); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -22,11 +22,11 @@ using System; using System.Collections.Generic; using Core.Common.Base.Data; -using Core.Common.Data.TestUtil; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; +using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -22,11 +22,11 @@ using System; using System.Collections.Generic; using Core.Common.Base.Data; -using Core.Common.Data.TestUtil; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; +using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -21,11 +21,11 @@ using System; using Core.Common.Base.Data; -using Core.Common.Data.TestUtil; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; +using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -22,11 +22,11 @@ using System; using System.Collections.Generic; using Core.Common.Base.Data; -using Core.Common.Data.TestUtil; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; +using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -22,11 +22,11 @@ using System; using System.Collections.Generic; using Core.Common.Base.Data; -using Core.Common.Data.TestUtil; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; +using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -21,12 +21,12 @@ using System; using Core.Common.Base; -using Core.Common.Data.TestUtil; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; +using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probability { Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CloneAssert.cs =================================================================== diff -u -rb0d9ce22c72782cce38802f9abb8977ba1973d25 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CloneAssert.cs (.../CloneAssert.cs) (revision b0d9ce22c72782cce38802f9abb8977ba1973d25) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CloneAssert.cs (.../CloneAssert.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -20,64 +20,27 @@ // All rights reserved. using NUnit.Framework; -using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Common.Data.DikeProfiles; namespace Ringtoets.Common.Data.TestUtil { /// - /// Class to assert clones of specific objects. + /// Class that defines methods for asserting whether two objects are clones. /// - public static class CloneAssert + public class CloneAssert { /// - /// Determines if the actual object is a clone of the expected . + /// Method that asserts whether and + /// are clones. /// - /// The expected . - /// The actual object. - /// Thrown when the provided parameters are no clones. - public static void AreClones(NormalDistribution expected, object actualObject) + /// The original object. + /// The cloned object. + /// Thrown when and + /// are not clones. + public static void AreClones(BreakWater original, BreakWater clone) { - Assert.AreNotSame(expected, actualObject); - Assert.IsInstanceOf(actualObject); - - var actual = (NormalDistribution) actualObject; - Assert.AreEqual(expected.Mean, actual.Mean); - Assert.AreEqual(expected.StandardDeviation, actual.StandardDeviation); + Assert.AreEqual(original.Type, clone.Type); + Assert.AreEqual(original.Height, clone.Height); } - - /// - /// Determines if the actual object is a clone of the expected . - /// - /// The expected . - /// The actual object. - /// Thrown when the provided parameters are no clones. - public static void AreClones(LogNormalDistribution expected, object actualObject) - { - Assert.AreNotSame(expected, actualObject); - Assert.IsInstanceOf(actualObject); - - var actual = (LogNormalDistribution) actualObject; - Assert.AreEqual(expected.Mean, actual.Mean); - Assert.AreEqual(expected.StandardDeviation, actual.StandardDeviation); - Assert.AreEqual(expected.Shift, actual.Shift); - } - - /// - /// Determines if the actual object is a clone of the expected . - /// - /// The expected . - /// The actual object. - /// Thrown when the provided parameters are no clones. - public static void AreClones(TruncatedNormalDistribution expected, object actualObject) - { - Assert.AreNotSame(expected, actualObject); - Assert.IsInstanceOf(actualObject); - - var actual = (TruncatedNormalDistribution) actualObject; - Assert.AreEqual(expected.Mean, actual.Mean); - Assert.AreEqual(expected.StandardDeviation, actual.StandardDeviation); - Assert.AreEqual(expected.LowerBoundary, actual.LowerBoundary); - Assert.AreEqual(expected.UpperBoundary, actual.UpperBoundary); - } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj =================================================================== diff -u -rb0d9ce22c72782cce38802f9abb8977ba1973d25 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision b0d9ce22c72782cce38802f9abb8977ba1973d25) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -56,6 +56,7 @@ + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs =================================================================== diff -u -rbdc1d159661a25dba2ffbaefab2f03ce70fc56f7 -rfa4ee67e5a95992fd35d27a557850866d871cfba --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision bdc1d159661a25dba2ffbaefab2f03ce70fc56f7) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) @@ -25,13 +25,14 @@ using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; -using Core.Common.Data.TestUtil; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; +using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CustomCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -401,17 +402,15 @@ Assert.AreSame(o.DikeProfile, c.DikeProfile); Assert.AreEqual(o.Orientation, c.Orientation); Assert.AreEqual(o.DikeHeight, c.DikeHeight); - Assert.AreNotSame(o.CriticalFlowRate, c.CriticalFlowRate); - Assert.AreEqual(o.CriticalFlowRate, c.CriticalFlowRate); + CloneAssert.AreClones(o.CriticalFlowRate, c.CriticalFlowRate, DistributionAssert.AreEqual); Assert.AreSame(o.HydraulicBoundaryLocation, c.HydraulicBoundaryLocation); Assert.AreEqual(o.DikeHeightCalculationType, c.DikeHeightCalculationType); Assert.AreEqual(o.OvertoppingRateCalculationType, c.OvertoppingRateCalculationType); Assert.AreEqual(o.ShouldDikeHeightIllustrationPointsBeCalculated, c.ShouldDikeHeightIllustrationPointsBeCalculated); Assert.AreEqual(o.ShouldOvertoppingRateIllustrationPointsBeCalculated, c.ShouldOvertoppingRateIllustrationPointsBeCalculated); Assert.AreEqual(o.ShouldOvertoppingOutputIllustrationPointsBeCalculated, c.ShouldOvertoppingOutputIllustrationPointsBeCalculated); Assert.AreEqual(o.UseBreakWater, c.UseBreakWater); - Assert.AreNotSame(o.BreakWater, c.BreakWater); - Assert.AreEqual(o.BreakWater, c.BreakWater); + CloneAssert.AreClones(o.BreakWater, c.BreakWater, CustomCloneAssert.AreClones); Assert.AreEqual(o.UseForeshore, c.UseForeshore); }); }