Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs =================================================================== diff -u -r686466dda6406ee2c7fb1f33faa60494878b1fc8 -rfba90aff5df30d1a8575d0730aba71ceac649865 --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision 686466dda6406ee2c7fb1f33faa60494878b1fc8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision fba90aff5df30d1a8575d0730aba71ceac649865) @@ -94,7 +94,7 @@ StandardDeviation = distributionToSet.StandardDeviation, Shift = distributionToSet.Shift }; - AssertDistributionCorrectlySet(layer.BelowPhreaticLevel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(layer.BelowPhreaticLevel, distributionToSet, expectedDistribution); } [Test] @@ -121,7 +121,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = layer.DiameterD70.Shift }; - AssertDistributionCorrectlySet(layer.DiameterD70, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(layer.DiameterD70, distributionToSet, expectedDistribution); } [Test] @@ -148,7 +148,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = layer.DiameterD70.Shift }; - AssertDistributionCorrectlySet(layer.Permeability, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(layer.Permeability, distributionToSet, expectedDistribution); } [Test] @@ -182,22 +182,6 @@ Assert.AreEqual(materialName, layer.MaterialName); } - private static void AssertDistributionCorrectlySet(IDistribution distributionToAssert, - IDistribution setDistribution, - IDistribution expectedDistribution) - { - Assert.AreNotSame(setDistribution, distributionToAssert); - DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); - } - - private static void AssertDistributionCorrectlySet(IVariationCoefficientDistribution distributionToAssert, - IVariationCoefficientDistribution setDistribution, - IVariationCoefficientDistribution expectedDistribution) - { - Assert.AreNotSame(setDistribution, distributionToAssert); - DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); - } - [TestFixture] private class PipingSoilLayerEqualsTest : EqualsTestFixture { @@ -219,8 +203,6 @@ PipingSoilLayer baseLayer = CreateRandomLayer(seed); var random = new Random(seed); - double offset = random.NextDouble(); - yield return new TestCaseData(new PipingSoilLayer(double.NaN) { MaterialName = "Different Name",