Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -r50051daeae0e7195d2cc72d704e8efd81e442f39 -rc1bb09f8fce943d069316e4d9bac7c85aca50c58 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 50051daeae0e7195d2cc72d704e8efd81e442f39) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision c1bb09f8fce943d069316e4d9bac7c85aca50c58) @@ -327,7 +327,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.InsideWaterLevel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.InsideWaterLevel, distributionToSet, expectedDistribution); } [Test] @@ -398,7 +398,7 @@ input.DrainCoefficient = distributionToSet; // Assert - AssertDistributionCorrectlySet(input.DrainCoefficient, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.DrainCoefficient, distributionToSet, expectedDistribution); } [Test] @@ -444,7 +444,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.ThresholdHeightOpenWeir, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.ThresholdHeightOpenWeir, distributionToSet, expectedDistribution); } [Test] @@ -470,7 +470,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.AreaFlowApertures, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.AreaFlowApertures, distributionToSet, expectedDistribution); } [Test] @@ -562,7 +562,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.LevelCrestStructureNotClosing, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.LevelCrestStructureNotClosing, distributionToSet, expectedDistribution); } [Test] @@ -651,12 +651,6 @@ Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); } - private static void AssertDistributionCorrectlySet(IDistribution distributionToAssert, IDistribution setDistribution, IDistribution expectedDistribution) - { - Assert.AreNotSame(setDistribution, distributionToAssert); - DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); - } - #endregion } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs =================================================================== diff -u -r50051daeae0e7195d2cc72d704e8efd81e442f39 -rc1bb09f8fce943d069316e4d9bac7c85aca50c58 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision 50051daeae0e7195d2cc72d704e8efd81e442f39) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision c1bb09f8fce943d069316e4d9bac7c85aca50c58) @@ -246,7 +246,7 @@ input.ModelFactorSuperCriticalFlow = distributionToSet; // Assert - AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution); } #endregion @@ -275,7 +275,7 @@ input.StormDuration = distributionToSet; // Assert - AssertDistributionCorrectlySet(input.StormDuration, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.StormDuration, distributionToSet, expectedDistribution); } #endregion @@ -380,7 +380,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.AllowedLevelIncreaseStorage, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.AllowedLevelIncreaseStorage, distributionToSet, expectedDistribution); } [Test] @@ -406,7 +406,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.StorageStructureArea, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.StorageStructureArea, distributionToSet, expectedDistribution); } [Test] @@ -432,7 +432,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.FlowWidthAtBottomProtection, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.FlowWidthAtBottomProtection, distributionToSet, expectedDistribution); } [Test] @@ -458,7 +458,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.CriticalOvertoppingDischarge, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.CriticalOvertoppingDischarge, distributionToSet, expectedDistribution); } [Test] @@ -517,7 +517,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.WidthFlowApertures, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.WidthFlowApertures, distributionToSet, expectedDistribution); } #endregion @@ -760,18 +760,6 @@ Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); } - 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); - } - #endregion } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs =================================================================== diff -u -r50051daeae0e7195d2cc72d704e8efd81e442f39 -rc1bb09f8fce943d069316e4d9bac7c85aca50c58 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision 50051daeae0e7195d2cc72d704e8efd81e442f39) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision c1bb09f8fce943d069316e4d9bac7c85aca50c58) @@ -235,7 +235,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); } #endregion @@ -339,12 +339,6 @@ Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); } - private static void AssertDistributionCorrectlySet(IDistribution distributionToAssert, IDistribution setDistribution, IDistribution expectedDistribution) - { - Assert.AreNotSame(setDistribution, distributionToAssert); - DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); - } - #endregion } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerDataTest.cs =================================================================== diff -u -r686466dda6406ee2c7fb1f33faa60494878b1fc8 -rc1bb09f8fce943d069316e4d9bac7c85aca50c58 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerDataTest.cs (.../MacroStabilityInwardsSoilLayerDataTest.cs) (revision 686466dda6406ee2c7fb1f33faa60494878b1fc8) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerDataTest.cs (.../MacroStabilityInwardsSoilLayerDataTest.cs) (revision c1bb09f8fce943d069316e4d9bac7c85aca50c58) @@ -146,7 +146,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = distributionToSet.Shift }; - AssertDistributionCorrectlySet(data.AbovePhreaticLevel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(data.AbovePhreaticLevel, distributionToSet, expectedDistribution); } [Test] @@ -173,7 +173,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = distributionToSet.Shift }; - AssertDistributionCorrectlySet(data.BelowPhreaticLevel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(data.BelowPhreaticLevel, distributionToSet, expectedDistribution); } [Test] @@ -200,7 +200,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = data.Cohesion.Shift }; - AssertDistributionCorrectlySet(data.Cohesion, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(data.Cohesion, distributionToSet, expectedDistribution); } [Test] @@ -227,7 +227,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = data.FrictionAngle.Shift }; - AssertDistributionCorrectlySet(data.FrictionAngle, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(data.FrictionAngle, distributionToSet, expectedDistribution); } [Test] @@ -254,7 +254,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = data.StrengthIncreaseExponent.Shift }; - AssertDistributionCorrectlySet(data.StrengthIncreaseExponent, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(data.StrengthIncreaseExponent, distributionToSet, expectedDistribution); } [Test] @@ -281,7 +281,7 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = data.StrengthIncreaseExponent.Shift }; - AssertDistributionCorrectlySet(data.ShearStrengthRatio, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(data.ShearStrengthRatio, distributionToSet, expectedDistribution); } [Test] @@ -308,17 +308,9 @@ CoefficientOfVariation = distributionToSet.CoefficientOfVariation, Shift = data.Pop.Shift }; - AssertDistributionCorrectlySet(data.Pop, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(data.Pop, distributionToSet, expectedDistribution); } - private static void AssertDistributionCorrectlySet(IVariationCoefficientDistribution distributionToAssert, - IVariationCoefficientDistribution setDistribution, - IVariationCoefficientDistribution expectedDistribution) - { - Assert.AreNotSame(setDistribution, distributionToAssert); - DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); - } - [TestFixture] private class MacroStabilityInwardsSoilLayerDataEqualsTest : EqualsTestFixture Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -r817593259f188dfd979b6fa7a266ca87093b652f -rc1bb09f8fce943d069316e4d9bac7c85aca50c58 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 817593259f188dfd979b6fa7a266ca87093b652f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision c1bb09f8fce943d069316e4d9bac7c85aca50c58) @@ -618,7 +618,7 @@ input.PhreaticLevelExit = distributionToSet; // Assert - AssertDistributionCorrectlySet(input.PhreaticLevelExit, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.PhreaticLevelExit, distributionToSet, expectedDistribution); } [Test] @@ -644,7 +644,7 @@ input.DampingFactorExit = distributionToSet; // Assert - AssertDistributionCorrectlySet(input.DampingFactorExit, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.DampingFactorExit, distributionToSet, expectedDistribution); } [Test] @@ -1312,11 +1312,5 @@ return surfaceLine; } - - private static void AssertDistributionCorrectlySet(IDistribution distributionToAssert, IDistribution setDistribution, IDistribution expectedDistribution) - { - Assert.AreNotSame(setDistribution, distributionToAssert); - DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); - } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs =================================================================== diff -u -r50051daeae0e7195d2cc72d704e8efd81e442f39 -rc1bb09f8fce943d069316e4d9bac7c85aca50c58 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 50051daeae0e7195d2cc72d704e8efd81e442f39) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision c1bb09f8fce943d069316e4d9bac7c85aca50c58) @@ -487,7 +487,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.InsideWaterLevelFailureConstruction, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.InsideWaterLevelFailureConstruction, distributionToSet, expectedDistribution); } [Test] @@ -513,7 +513,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.InsideWaterLevel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.InsideWaterLevel, distributionToSet, expectedDistribution); } #endregion @@ -559,7 +559,7 @@ input.DrainCoefficient = distributionToSet; // Assert - AssertDistributionCorrectlySet(input.DrainCoefficient, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.DrainCoefficient, distributionToSet, expectedDistribution); } [Test] @@ -585,7 +585,7 @@ input.FlowVelocityStructureClosable = distributionToSet; // Assert - AssertDistributionCorrectlySet(input.FlowVelocityStructureClosable, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.FlowVelocityStructureClosable, distributionToSet, expectedDistribution); } #endregion @@ -615,7 +615,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); } [Test] @@ -641,7 +641,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.ThresholdHeightOpenWeir, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.ThresholdHeightOpenWeir, distributionToSet, expectedDistribution); } [Test] @@ -667,7 +667,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.AreaFlowApertures, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.AreaFlowApertures, distributionToSet, expectedDistribution); } [Test] @@ -693,7 +693,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.ConstructiveStrengthLinearLoadModel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.ConstructiveStrengthLinearLoadModel, distributionToSet, expectedDistribution); } [Test] @@ -719,7 +719,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.ConstructiveStrengthQuadraticLoadModel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.ConstructiveStrengthQuadraticLoadModel, distributionToSet, expectedDistribution); } [Test] @@ -745,7 +745,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.StabilityLinearLoadModel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.StabilityLinearLoadModel, distributionToSet, expectedDistribution); } [Test] @@ -771,7 +771,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.StabilityQuadraticLoadModel, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.StabilityQuadraticLoadModel, distributionToSet, expectedDistribution); } [Test] @@ -830,7 +830,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.FailureCollisionEnergy, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.FailureCollisionEnergy, distributionToSet, expectedDistribution); } [Test] @@ -856,7 +856,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.ShipMass, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.ShipMass, distributionToSet, expectedDistribution); } [Test] @@ -882,7 +882,7 @@ Mean = mean, CoefficientOfVariation = variation }; - AssertDistributionCorrectlySet(input.ShipVelocity, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.ShipVelocity, distributionToSet, expectedDistribution); } [Test] @@ -941,7 +941,7 @@ Mean = mean, StandardDeviation = standardDeviation }; - AssertDistributionCorrectlySet(input.BankWidth, distributionToSet, expectedDistribution); + DistributionTestHelper.AssertDistributionCorrectlySet(input.BankWidth, distributionToSet, expectedDistribution); } [Test] @@ -1051,18 +1051,6 @@ Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); } - 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); - } - #endregion } } \ No newline at end of file