Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/CommentTest.cs =================================================================== diff -u -r4909d5c5d2883b3c6974f2f3840bd55797e8b0bd -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/CommentTest.cs (.../CommentTest.cs) (revision 4909d5c5d2883b3c6974f2f3840bd55797e8b0bd) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/CommentTest.cs (.../CommentTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -21,8 +21,8 @@ using System; using NUnit.Framework; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CommonCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test { @@ -53,7 +53,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, CommonCloneAssert.AreClones); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs =================================================================== diff -u -r4909d5c5d2883b3c6974f2f3840bd55797e8b0bd -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision 4909d5c5d2883b3c6974f2f3840bd55797e8b0bd) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -24,8 +24,8 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.DikeProfiles; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CommonCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.DikeProfiles { @@ -243,7 +243,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, CommonCloneAssert.AreClones); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -rfa4ee67e5a95992fd35d27a557850866d871cfba -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,7 +26,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { @@ -234,7 +234,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); + CoreCloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -rfa4ee67e5a95992fd35d27a557850866d871cfba -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,7 +26,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { @@ -155,7 +155,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); + CoreCloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs =================================================================== diff -u -rfa4ee67e5a95992fd35d27a557850866d871cfba -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -25,7 +25,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { @@ -100,7 +100,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); + CoreCloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs =================================================================== diff -u -rfa4ee67e5a95992fd35d27a557850866d871cfba -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,7 +26,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { @@ -182,7 +182,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); + CoreCloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs =================================================================== diff -u -rfa4ee67e5a95992fd35d27a557850866d871cfba -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision fa4ee67e5a95992fd35d27a557850866d871cfba) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,7 +26,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probabilistics { @@ -164,7 +164,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); + CoreCloneAssert.AreClones(original, clone, DistributionAssert.AreEqual); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs =================================================================== diff -u -rac1f0a30b87d9fa5dccb288115189b032035acde -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision ac1f0a30b87d9fa5dccb288115189b032035acde) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,8 +26,8 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CommonCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.Common.Data.Test.Probability { @@ -185,7 +185,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, CommonCloneAssert.AreClones); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs =================================================================== diff -u -r4909d5c5d2883b3c6974f2f3840bd55797e8b0bd -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision 4909d5c5d2883b3c6974f2f3840bd55797e8b0bd) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -84,8 +84,12 @@ clone.Comments = (Comment) Comments.Clone(); clone.InputParameters = (GrassCoverErosionInwardsInput) InputParameters.Clone(); - clone.Output = (GrassCoverErosionInwardsOutput) Output.Clone(); + if (clone.Output != null) + { + clone.Output = (GrassCoverErosionInwardsOutput) Output.Clone(); + } + return clone; } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs =================================================================== diff -u -re7f6578ada32ed199d2b028ebb5eaeb691344592 -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs (.../GrassCoverErosionInwardsOutput.cs) (revision e7f6578ada32ed199d2b028ebb5eaeb691344592) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs (.../GrassCoverErosionInwardsOutput.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -71,9 +71,17 @@ var clone = (GrassCoverErosionInwardsOutput) MemberwiseClone(); clone.OvertoppingOutput = (OvertoppingOutput) OvertoppingOutput.Clone(); - clone.DikeHeightOutput = (DikeHeightOutput) DikeHeightOutput.Clone(); - clone.OvertoppingRateOutput = (OvertoppingRateOutput) OvertoppingRateOutput.Clone(); + if (clone.DikeHeightOutput != null) + { + clone.DikeHeightOutput = (DikeHeightOutput) DikeHeightOutput.Clone(); + } + + if (clone.OvertoppingRateOutput != null) + { + clone.OvertoppingRateOutput = (OvertoppingRateOutput) OvertoppingRateOutput.Clone(); + } + return clone; } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightOutputTest.cs =================================================================== diff -u -re7f6578ada32ed199d2b028ebb5eaeb691344592 -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightOutputTest.cs (.../DikeHeightOutputTest.cs) (revision e7f6578ada32ed199d2b028ebb5eaeb691344592) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightOutputTest.cs (.../DikeHeightOutputTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -25,8 +25,8 @@ using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using GrassCoverErosionInwardsCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -101,7 +101,7 @@ } [Test] - public void Clone_Always_ReturnNewInstanceWithCopiedValues() + public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup var random = new Random(21); @@ -117,7 +117,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs =================================================================== diff -u -r4909d5c5d2883b3c6974f2f3840bd55797e8b0bd -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs (.../GrassCoverErosionInwardsCalculationTest.cs) (revision 4909d5c5d2883b3c6974f2f3840bd55797e8b0bd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs (.../GrassCoverErosionInwardsCalculationTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -28,9 +28,9 @@ using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; using CommonCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; +using GrassCoverErosionInwardsCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -137,11 +137,38 @@ } [Test] - public void Clone_Always_ReturnNewInstanceWithCopiedValues() + public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup + GrassCoverErosionInwardsCalculation original = CreateRandomCalculationWithoutOutput(); + + original.Output = new TestGrassCoverErosionInwardsOutput(); + + // Call + object clone = original.Clone(); + + // Assert + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); + } + + [Test] + public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() + { + // Setup + GrassCoverErosionInwardsCalculation original = CreateRandomCalculationWithoutOutput(); + + // Call + object clone = original.Clone(); + + // Assert + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); + } + + private static GrassCoverErosionInwardsCalculation CreateRandomCalculationWithoutOutput() + { var random = new Random(21); - var original = new GrassCoverErosionInwardsCalculation + + return new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -170,21 +197,8 @@ Comments = { Body = "Random body" - }, - Output = new TestGrassCoverErosionInwardsOutput() + } }; - - // Call - object clone = original.Clone(); - - // Assert - CloneAssert.AreClones(original, clone, (o, c) => - { - Assert.AreEqual(o.Name, c.Name); - CloneAssert.AreClones(o.Comments, c.Comments, CommonCloneAssert.AreClones); - CloneAssert.AreClones(o.InputParameters, c.InputParameters, CustomCloneAssert.AreClones); - CloneAssert.AreClones(o.Output, c.Output, CustomCloneAssert.AreClones); - }); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs =================================================================== diff -u -r4909d5c5d2883b3c6974f2f3840bd55797e8b0bd -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision 4909d5c5d2883b3c6974f2f3840bd55797e8b0bd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -31,8 +31,8 @@ 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.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using GrassCoverErosionInwardsCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -364,21 +364,47 @@ } [Test] - public void Clone_Always_ReturnNewInstanceWithCopiedValues() + public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup + GrassCoverErosionInwardsInput original = CreateRandomInputWithoutProfileAndLocation(); + + original.DikeProfile = new TestDikeProfile(); + original.HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + + // Call + object clone = original.Clone(); + + // Assert + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); + } + + [Test] + public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() + { + // Setup + GrassCoverErosionInwardsInput original = CreateRandomInputWithoutProfileAndLocation(); + + // Call + object clone = original.Clone(); + + // Assert + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); + } + + private static GrassCoverErosionInwardsInput CreateRandomInputWithoutProfileAndLocation() + { var random = new Random(21); - var original = new GrassCoverErosionInwardsInput + + return new GrassCoverErosionInwardsInput { - DikeProfile = new TestDikeProfile(), Orientation = random.NextRoundedDouble(), DikeHeight = random.NextRoundedDouble(), CriticalFlowRate = new LogNormalDistribution { Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() }, - HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), DikeHeightCalculationType = random.NextEnumValue(), OvertoppingRateCalculationType = random.NextEnumValue(), ShouldDikeHeightIllustrationPointsBeCalculated = random.NextBoolean(), @@ -392,12 +418,6 @@ }, UseForeshore = random.NextBoolean() }; - - // Call - object clone = original.Clone(); - - // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); } private static void AssertDikeProfileInput(DikeProfile expectedDikeProfile, GrassCoverErosionInwardsInput input) Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -r4909d5c5d2883b3c6974f2f3840bd55797e8b0bd -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision 4909d5c5d2883b3c6974f2f3840bd55797e8b0bd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -24,8 +24,8 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using GrassCoverErosionInwardsCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -67,7 +67,7 @@ } [Test] - public void Clone_Always_ReturnNewInstanceWithCopiedValues() + public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup var random = new Random(21); @@ -79,7 +79,23 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); } + + [Test] + public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() + { + // Setup + var random = new Random(21); + var original = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(random.NextDouble()), + null, + null); + + // Call + object clone = original.Clone(); + + // Assert + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); + } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs =================================================================== diff -u -r129a499de1e263e11a64ce31b0da70431120e264 -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs (.../HydraulicLoadsOutputTest.cs) (revision 129a499de1e263e11a64ce31b0da70431120e264) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs (.../HydraulicLoadsOutputTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,8 +26,8 @@ using Ringtoets.Common.Data.IllustrationPoints; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using GrassCoverErosionInwardsCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -152,7 +152,7 @@ } [Test] - public void Clone_Always_ReturnNewInstanceWithCopiedValues() + public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup var random = new Random(21); @@ -167,7 +167,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); } private class TestHydraulicLoadsOutput : HydraulicLoadsOutput Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingOutputTest.cs =================================================================== diff -u -re7f6578ada32ed199d2b028ebb5eaeb691344592 -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingOutputTest.cs (.../OvertoppingOutputTest.cs) (revision e7f6578ada32ed199d2b028ebb5eaeb691344592) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingOutputTest.cs (.../OvertoppingOutputTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,8 +26,8 @@ using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using GrassCoverErosionInwardsCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -101,17 +101,20 @@ } [Test] - public void Clone_Always_ReturnNewInstanceWithCopiedValues() + public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup var random = new Random(21); - var original = new OvertoppingOutput(random.NextDouble(), random.NextBoolean(), new TestProbabilityAssessmentOutput(), null); + var original = new OvertoppingOutput(random.NextDouble(), + random.NextBoolean(), + new TestProbabilityAssessmentOutput(), + null); // Call object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs =================================================================== diff -u -re7f6578ada32ed199d2b028ebb5eaeb691344592 -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs (.../OvertoppingRateOutputTest.cs) (revision e7f6578ada32ed199d2b028ebb5eaeb691344592) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs (.../OvertoppingRateOutputTest.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -26,8 +26,8 @@ using Ringtoets.Common.Data.IllustrationPoints; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; -using CloneAssert = Core.Common.Data.TestUtil.CloneAssert; -using CustomCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using GrassCoverErosionInwardsCloneAssert = Ringtoets.GrassCoverErosionInwards.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -105,7 +105,7 @@ } [Test] - public void Clone_Always_ReturnNewInstanceWithCopiedValues() + public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup var random = new Random(21); @@ -121,7 +121,7 @@ object clone = original.Clone(); // Assert - CloneAssert.AreClones(original, clone, CustomCloneAssert.AreClones); + CoreCloneAssert.AreClones(original, clone, GrassCoverErosionInwardsCloneAssert.AreClones); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/CloneAssert.cs =================================================================== diff -u -r4909d5c5d2883b3c6974f2f3840bd55797e8b0bd -ra894ca6401da7f18b092ba73e48d1995e87d6d8f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/CloneAssert.cs (.../CloneAssert.cs) (revision 4909d5c5d2883b3c6974f2f3840bd55797e8b0bd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/CloneAssert.cs (.../CloneAssert.cs) (revision a894ca6401da7f18b092ba73e48d1995e87d6d8f) @@ -21,7 +21,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; -using BaseCloneAssert = Core.Common.Data.TestUtil.CloneAssert; +using CoreCloneAssert = Core.Common.Data.TestUtil.CloneAssert; using CommonCloneAssert = Ringtoets.Common.Data.TestUtil.CloneAssert; namespace Ringtoets.GrassCoverErosionInwards.Data.TestUtil @@ -43,7 +43,7 @@ { Assert.AreEqual(original.WaveHeight, clone.WaveHeight); Assert.AreEqual(original.IsOvertoppingDominant, clone.IsOvertoppingDominant); - BaseCloneAssert.AreClones(original.ProbabilityAssessmentOutput, clone.ProbabilityAssessmentOutput, CommonCloneAssert.AreClones); + CoreCloneAssert.AreClones(original.ProbabilityAssessmentOutput, clone.ProbabilityAssessmentOutput, CommonCloneAssert.AreClones); } /// @@ -96,23 +96,31 @@ Assert.AreSame(original.DikeProfile, clone.DikeProfile); Assert.AreEqual(original.Orientation, clone.Orientation); Assert.AreEqual(original.DikeHeight, clone.DikeHeight); - BaseCloneAssert.AreClones(original.CriticalFlowRate, clone.CriticalFlowRate, DistributionAssert.AreEqual); + CoreCloneAssert.AreClones(original.CriticalFlowRate, clone.CriticalFlowRate, DistributionAssert.AreEqual); Assert.AreSame(original.HydraulicBoundaryLocation, clone.HydraulicBoundaryLocation); Assert.AreEqual(original.DikeHeightCalculationType, clone.DikeHeightCalculationType); Assert.AreEqual(original.OvertoppingRateCalculationType, clone.OvertoppingRateCalculationType); Assert.AreEqual(original.ShouldDikeHeightIllustrationPointsBeCalculated, clone.ShouldDikeHeightIllustrationPointsBeCalculated); Assert.AreEqual(original.ShouldOvertoppingRateIllustrationPointsBeCalculated, clone.ShouldOvertoppingRateIllustrationPointsBeCalculated); Assert.AreEqual(original.ShouldOvertoppingOutputIllustrationPointsBeCalculated, clone.ShouldOvertoppingOutputIllustrationPointsBeCalculated); Assert.AreEqual(original.UseBreakWater, clone.UseBreakWater); - BaseCloneAssert.AreClones(original.BreakWater, clone.BreakWater, CommonCloneAssert.AreClones); + CoreCloneAssert.AreClones(original.BreakWater, clone.BreakWater, CommonCloneAssert.AreClones); Assert.AreEqual(original.UseForeshore, clone.UseForeshore); } - public static void AreClones(GrassCoverErosionInwardsOutput o, GrassCoverErosionInwardsOutput c) + public static void AreClones(GrassCoverErosionInwardsOutput original, GrassCoverErosionInwardsOutput clone) { - BaseCloneAssert.AreClones(o.OvertoppingOutput, c.OvertoppingOutput, AreClones); - BaseCloneAssert.AreClones(o.DikeHeightOutput, c.DikeHeightOutput, AreClones); - BaseCloneAssert.AreClones(o.OvertoppingRateOutput, c.OvertoppingRateOutput, AreClones); + CoreCloneAssert.AreClones(original.OvertoppingOutput, clone.OvertoppingOutput, AreClones); + CoreCloneAssert.AreClones(original.DikeHeightOutput, clone.DikeHeightOutput, AreClones); + CoreCloneAssert.AreClones(original.OvertoppingRateOutput, clone.OvertoppingRateOutput, AreClones); } + + public static void AreClones(GrassCoverErosionInwardsCalculation original, GrassCoverErosionInwardsCalculation clone) + { + Assert.AreEqual(original.Name, clone.Name); + CoreCloneAssert.AreClones(original.Comments, clone.Comments, CommonCloneAssert.AreClones); + CoreCloneAssert.AreClones(original.InputParameters, clone.InputParameters, AreClones); + CoreCloneAssert.AreClones(original.Output, clone.Output, AreClones); + } } } \ No newline at end of file