Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/CommentTest.cs =================================================================== diff -u -r68b52f02bf376697530c1273a75a7ee05ba92483 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/CommentTest.cs (.../CommentTest.cs) (revision 68b52f02bf376697530c1273a75a7ee05ba92483) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/CommentTest.cs (.../CommentTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -42,11 +42,9 @@ public void Clone_Always_ReturnNewInstanceWithCopiedValues() { // Setup - const string body = "Random body"; - var comment = new Comment { - Body = body + Body = "Random body" }; // Call @@ -55,7 +53,9 @@ // Assert Assert.AreNotSame(comment, clone); Assert.IsInstanceOf(clone); - Assert.AreEqual(body, ((Comment) clone).Body); + + var cloneComment = (Comment) clone; + Assert.AreEqual(comment.Body, cloneComment.Body); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs =================================================================== diff -u -r68b52f02bf376697530c1273a75a7ee05ba92483 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision 68b52f02bf376697530c1273a75a7ee05ba92483) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTest.cs (.../BreakWaterTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -235,16 +235,18 @@ { // Setup var random = new Random(21); - var referenceBreakWater = new BreakWater(random.NextEnumValue(), random.NextDouble()); - var breakWater = new BreakWater(referenceBreakWater.Type, referenceBreakWater.Height); + var breakWater = new BreakWater(random.NextEnumValue(), random.NextDouble()); // Call object clone = breakWater.Clone(); // Assert Assert.AreNotSame(breakWater, clone); Assert.IsInstanceOf(clone); - Assert.AreEqual(referenceBreakWater, (BreakWater) clone); + + var clonedBreakWater = (BreakWater) clone; + Assert.AreEqual(breakWater.Type, clonedBreakWater.Type); + Assert.AreEqual(breakWater.Height, clonedBreakWater.Height); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -r68b52f02bf376697530c1273a75a7ee05ba92483 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision 68b52f02bf376697530c1273a75a7ee05ba92483) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -223,24 +223,19 @@ { // Setup var random = new Random(21); - var referenceDistribution = new LogNormalDistribution(random.Next(1, 16)) + var distribution = new LogNormalDistribution(random.Next(1, 16)) { Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() }; - var distribution = new LogNormalDistribution(referenceDistribution.Mean.NumberOfDecimalPlaces) - { - Mean = referenceDistribution.Mean, - StandardDeviation = referenceDistribution.StandardDeviation - }; // Call object clone = distribution.Clone(); // Assert Assert.AreNotSame(distribution, clone); Assert.IsInstanceOf(clone); - DistributionAssert.AreEqual(referenceDistribution, (LogNormalDistribution) clone); + DistributionAssert.AreEqual(distribution, (LogNormalDistribution) clone); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -r68b52f02bf376697530c1273a75a7ee05ba92483 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision 68b52f02bf376697530c1273a75a7ee05ba92483) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -144,24 +144,19 @@ { // Setup var random = new Random(21); - var referenceDistribution = new NormalDistribution(random.Next(1, 16)) + var distribution = new NormalDistribution(random.Next(1, 16)) { Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() }; - var distribution = new NormalDistribution(referenceDistribution.Mean.NumberOfDecimalPlaces) - { - Mean = referenceDistribution.Mean, - StandardDeviation = referenceDistribution.StandardDeviation - }; // Call object clone = distribution.Clone(); // Assert Assert.AreNotSame(distribution, clone); Assert.IsInstanceOf(clone); - DistributionAssert.AreEqual(referenceDistribution, (NormalDistribution) clone); + DistributionAssert.AreEqual(distribution, (NormalDistribution) clone); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs =================================================================== diff -u -r68b52f02bf376697530c1273a75a7ee05ba92483 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision 68b52f02bf376697530c1273a75a7ee05ba92483) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -87,28 +87,21 @@ { // Setup var random = new Random(21); - var referenceDistribution = new TruncatedNormalDistribution(random.Next(1, 16)) + var distribution = new TruncatedNormalDistribution(random.Next(1, 16)) { Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble(), LowerBoundary = random.NextRoundedDouble(), UpperBoundary = random.NextRoundedDouble() }; - var distribution = new TruncatedNormalDistribution(referenceDistribution.Mean.NumberOfDecimalPlaces) - { - Mean = referenceDistribution.Mean, - StandardDeviation = referenceDistribution.StandardDeviation, - LowerBoundary = referenceDistribution.LowerBoundary, - UpperBoundary = referenceDistribution.UpperBoundary - }; // Call object clone = distribution.Clone(); // Assert Assert.IsInstanceOf(clone); Assert.AreNotSame(distribution, clone); - DistributionAssert.AreEqual(referenceDistribution, (TruncatedNormalDistribution) clone); + DistributionAssert.AreEqual(distribution, (TruncatedNormalDistribution) clone); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs =================================================================== diff -u -r68b52f02bf376697530c1273a75a7ee05ba92483 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision 68b52f02bf376697530c1273a75a7ee05ba92483) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -171,24 +171,19 @@ { // Setup var random = new Random(21); - var referenceDistribution = new VariationCoefficientLogNormalDistribution(random.Next(1, 16)) + var distribution = new VariationCoefficientLogNormalDistribution(random.Next(1, 16)) { Mean = random.NextRoundedDouble(), CoefficientOfVariation = random.NextRoundedDouble() }; - var distribution = new VariationCoefficientLogNormalDistribution(referenceDistribution.Mean.NumberOfDecimalPlaces) - { - Mean = referenceDistribution.Mean, - CoefficientOfVariation = referenceDistribution.CoefficientOfVariation - }; // Call object clone = distribution.Clone(); // Assert Assert.AreNotSame(distribution, clone); Assert.IsInstanceOf(clone); - DistributionAssert.AreEqual(referenceDistribution, (VariationCoefficientLogNormalDistribution) clone); + DistributionAssert.AreEqual(distribution, (VariationCoefficientLogNormalDistribution) clone); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs =================================================================== diff -u -r68b52f02bf376697530c1273a75a7ee05ba92483 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision 68b52f02bf376697530c1273a75a7ee05ba92483) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -153,24 +153,19 @@ { // Setup var random = new Random(21); - var referenceDistribution = new VariationCoefficientNormalDistribution(random.Next(1, 16)) + var distribution = new VariationCoefficientNormalDistribution(random.Next(1, 16)) { Mean = random.NextRoundedDouble(), CoefficientOfVariation = random.NextRoundedDouble() }; - var distribution = new VariationCoefficientNormalDistribution(referenceDistribution.Mean.NumberOfDecimalPlaces) - { - Mean = referenceDistribution.Mean, - CoefficientOfVariation = referenceDistribution.CoefficientOfVariation - }; // Call object clone = distribution.Clone(); // Assert Assert.AreNotSame(distribution, clone); Assert.IsInstanceOf(clone); - DistributionAssert.AreEqual(referenceDistribution, (VariationCoefficientNormalDistribution) clone); + DistributionAssert.AreEqual(distribution, (VariationCoefficientNormalDistribution) clone); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs =================================================================== diff -u -r5a0faf50983c0b2b407604d01d34312f12282b19 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision 5a0faf50983c0b2b407604d01d34312f12282b19) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -173,14 +173,12 @@ { // Setup var random = new Random(5); - double requiredProbability = random.NextDouble(); - double requiredReliability = random.NextDouble(); - double probability = random.NextDouble(); - double reliability = random.NextDouble(); - double factorOfSafety = random.NextDouble(); + var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + random.NextDouble()); - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(requiredProbability, requiredReliability, probability, reliability, factorOfSafety); - // Call object clone = probabilityAssessmentOutput.Clone(); @@ -189,11 +187,11 @@ Assert.IsInstanceOf(clone); var clonedProbabilityAssessmentOutput = (ProbabilityAssessmentOutput) clone; - Assert.AreEqual(requiredProbability, clonedProbabilityAssessmentOutput.RequiredProbability); - Assert.AreEqual(requiredReliability, clonedProbabilityAssessmentOutput.RequiredReliability, clonedProbabilityAssessmentOutput.RequiredReliability.GetAccuracy()); - Assert.AreEqual(probability, clonedProbabilityAssessmentOutput.Probability); - Assert.AreEqual(reliability, clonedProbabilityAssessmentOutput.Reliability, clonedProbabilityAssessmentOutput.Reliability.GetAccuracy()); - Assert.AreEqual(factorOfSafety, clonedProbabilityAssessmentOutput.FactorOfSafety, clonedProbabilityAssessmentOutput.FactorOfSafety.GetAccuracy()); + Assert.AreEqual(probabilityAssessmentOutput.RequiredProbability, clonedProbabilityAssessmentOutput.RequiredProbability); + Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability, clonedProbabilityAssessmentOutput.RequiredReliability); + Assert.AreEqual(probabilityAssessmentOutput.Probability, clonedProbabilityAssessmentOutput.Probability); + Assert.AreEqual(probabilityAssessmentOutput.Reliability, clonedProbabilityAssessmentOutput.Reliability); + Assert.AreEqual(probabilityAssessmentOutput.FactorOfSafety, clonedProbabilityAssessmentOutput.FactorOfSafety); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs =================================================================== diff -u -r5a0faf50983c0b2b407604d01d34312f12282b19 -rd05726b5993b52fd1a2cdb6d150e61d6aab88d81 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision 5a0faf50983c0b2b407604d01d34312f12282b19) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision d05726b5993b52fd1a2cdb6d150e61d6aab88d81) @@ -366,43 +366,29 @@ { // Setup var random = new Random(21); - var dikeProfile = new TestDikeProfile(); - RoundedDouble orientation = random.NextRoundedDouble(); - RoundedDouble dikeHeight = random.NextRoundedDouble(); - var criticalFlowRate = new LogNormalDistribution(4) - { - Mean = random.NextRoundedDouble(), - StandardDeviation = random.NextRoundedDouble() - }; - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var dikeHeightCalculationType = random.NextEnumValue(); - var overtoppingRateCalculationType = random.NextEnumValue(); - bool shouldDikeHeightIllustrationPointsBeCalculated = random.NextBoolean(); - bool shouldOvertoppingRateIllustrationPointsBeCalculated = random.NextBoolean(); - bool shouldOvertoppingOutputIllustrationPointsBeCalculated = random.NextBoolean(); - bool useBreakWater = random.NextBoolean(); - var breakWater = new BreakWater(random.NextEnumValue(), random.NextDouble()); - bool useForeshore = random.NextBoolean(); - var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput { - DikeProfile = dikeProfile, - Orientation = orientation, - DikeHeight = dikeHeight, - CriticalFlowRate = criticalFlowRate, - HydraulicBoundaryLocation = hydraulicBoundaryLocation, - DikeHeightCalculationType = dikeHeightCalculationType, - OvertoppingRateCalculationType = overtoppingRateCalculationType, - ShouldDikeHeightIllustrationPointsBeCalculated = shouldDikeHeightIllustrationPointsBeCalculated, - ShouldOvertoppingRateIllustrationPointsBeCalculated = shouldOvertoppingRateIllustrationPointsBeCalculated, - ShouldOvertoppingOutputIllustrationPointsBeCalculated = shouldOvertoppingOutputIllustrationPointsBeCalculated, - UseBreakWater = useBreakWater, + 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(), + ShouldOvertoppingRateIllustrationPointsBeCalculated = random.NextBoolean(), + ShouldOvertoppingOutputIllustrationPointsBeCalculated = random.NextBoolean(), + UseBreakWater = random.NextBoolean(), BreakWater = { - Type = breakWater.Type, - Height = breakWater.Height + Type = random.NextEnumValue(), + Height = random.NextRoundedDouble() }, - UseForeshore = useForeshore + UseForeshore = random.NextBoolean() }; // Call @@ -413,21 +399,21 @@ Assert.IsInstanceOf(clone); var clonedGrassCoverErosionInwardsInput = (GrassCoverErosionInwardsInput) clone; - Assert.AreSame(dikeProfile, clonedGrassCoverErosionInwardsInput.DikeProfile); - Assert.AreEqual(orientation, clonedGrassCoverErosionInwardsInput.Orientation, clonedGrassCoverErosionInwardsInput.Orientation.GetAccuracy()); - Assert.AreEqual(dikeHeight, clonedGrassCoverErosionInwardsInput.DikeHeight, clonedGrassCoverErosionInwardsInput.DikeHeight.GetAccuracy()); + Assert.AreSame(grassCoverErosionInwardsInput.DikeProfile, clonedGrassCoverErosionInwardsInput.DikeProfile); + Assert.AreEqual(grassCoverErosionInwardsInput.Orientation, clonedGrassCoverErosionInwardsInput.Orientation); + Assert.AreEqual(grassCoverErosionInwardsInput.DikeHeight, clonedGrassCoverErosionInwardsInput.DikeHeight); Assert.AreNotSame(grassCoverErosionInwardsInput.CriticalFlowRate, clonedGrassCoverErosionInwardsInput.CriticalFlowRate); - Assert.AreEqual(criticalFlowRate, clonedGrassCoverErosionInwardsInput.CriticalFlowRate); - Assert.AreSame(hydraulicBoundaryLocation, clonedGrassCoverErosionInwardsInput.HydraulicBoundaryLocation); - Assert.AreEqual(dikeHeightCalculationType, clonedGrassCoverErosionInwardsInput.DikeHeightCalculationType); - Assert.AreEqual(overtoppingRateCalculationType, clonedGrassCoverErosionInwardsInput.OvertoppingRateCalculationType); - Assert.AreEqual(shouldDikeHeightIllustrationPointsBeCalculated, clonedGrassCoverErosionInwardsInput.ShouldDikeHeightIllustrationPointsBeCalculated); - Assert.AreEqual(shouldOvertoppingRateIllustrationPointsBeCalculated, clonedGrassCoverErosionInwardsInput.ShouldOvertoppingRateIllustrationPointsBeCalculated); - Assert.AreEqual(shouldOvertoppingOutputIllustrationPointsBeCalculated, clonedGrassCoverErosionInwardsInput.ShouldOvertoppingOutputIllustrationPointsBeCalculated); - Assert.AreEqual(useBreakWater, clonedGrassCoverErosionInwardsInput.UseBreakWater); + Assert.AreEqual(grassCoverErosionInwardsInput.CriticalFlowRate, clonedGrassCoverErosionInwardsInput.CriticalFlowRate); + Assert.AreSame(grassCoverErosionInwardsInput.HydraulicBoundaryLocation, clonedGrassCoverErosionInwardsInput.HydraulicBoundaryLocation); + Assert.AreEqual(grassCoverErosionInwardsInput.DikeHeightCalculationType, clonedGrassCoverErosionInwardsInput.DikeHeightCalculationType); + Assert.AreEqual(grassCoverErosionInwardsInput.OvertoppingRateCalculationType, clonedGrassCoverErosionInwardsInput.OvertoppingRateCalculationType); + Assert.AreEqual(grassCoverErosionInwardsInput.ShouldDikeHeightIllustrationPointsBeCalculated, clonedGrassCoverErosionInwardsInput.ShouldDikeHeightIllustrationPointsBeCalculated); + Assert.AreEqual(grassCoverErosionInwardsInput.ShouldOvertoppingRateIllustrationPointsBeCalculated, clonedGrassCoverErosionInwardsInput.ShouldOvertoppingRateIllustrationPointsBeCalculated); + Assert.AreEqual(grassCoverErosionInwardsInput.ShouldOvertoppingOutputIllustrationPointsBeCalculated, clonedGrassCoverErosionInwardsInput.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + Assert.AreEqual(grassCoverErosionInwardsInput.UseBreakWater, clonedGrassCoverErosionInwardsInput.UseBreakWater); Assert.AreNotSame(grassCoverErosionInwardsInput.BreakWater, clonedGrassCoverErosionInwardsInput.BreakWater); - Assert.AreEqual(breakWater, clonedGrassCoverErosionInwardsInput.BreakWater); - Assert.AreEqual(useForeshore, clonedGrassCoverErosionInwardsInput.UseForeshore); + Assert.AreEqual(grassCoverErosionInwardsInput.BreakWater, clonedGrassCoverErosionInwardsInput.BreakWater); + Assert.AreEqual(grassCoverErosionInwardsInput.UseForeshore, clonedGrassCoverErosionInwardsInput.UseForeshore); } private static void AssertDikeProfileInput(DikeProfile expectedDikeProfile, GrassCoverErosionInwardsInput input)