Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs =================================================================== diff -u -r176a9c36d21b8d164a808e53ff08bf2c2940da89 -r38940fd430501da3c19ac8c90f660b21f8938909 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs (.../MacroStabilityInwardsPreconsolidationStressTransformerTest.cs) (revision 176a9c36d21b8d164a808e53ff08bf2c2940da89) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs (.../MacroStabilityInwardsPreconsolidationStressTransformerTest.cs) (revision 38940fd430501da3c19ac8c90f660b21f8938909) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; @@ -80,21 +79,20 @@ [Test] [TestCaseSource(nameof(GetPreconsolidationStressCombinationWithNaNValues))] public void Transform_PreconsolidationStressValuesNaN_ThrowsImportedDataTransformException( - PreconsolidationStress preconsolidationStress) + PreconsolidationStress preconsolidationStress, + string parameterName) { // Call TestDelegate call = () => MacroStabilityInwardsPreconsolidationStressTransformer.Transform(preconsolidationStress); // Assert var exception = Assert.Throws(call); - - Exception innerException = exception.InnerException; - Assert.IsInstanceOf(innerException); - Assert.AreEqual(innerException.Message, exception.Message); + string expectedMessage = $"De waarde voor parameter '{parameterName}' voor de grensspanning moet een concreet getal zijn."; + Assert.AreEqual(expectedMessage, exception.Message); + Assert.IsInstanceOf(exception.InnerException); } [Test] - [SetCulture("NL-nl")] [TestCaseSource(nameof(GetPreconsolidationStressInvalidDistributionValues))] public void Transform_InvalidPreconsolidationStressDistributionValues_ThrowsImportedDataTransformException(PreconsolidationStress preconsolidationStress) { @@ -103,65 +101,40 @@ // Assert var exception = Assert.Throws(call); - - Exception innerException = exception.InnerException; - Assert.IsInstanceOf(innerException); - var coordinate = new Point2D(preconsolidationStress.XCoordinate, preconsolidationStress.ZCoordinate); - string expectedMessage = CreateExpectedErrorMessage(coordinate, innerException.Message); - Assert.AreEqual(expectedMessage, exception.Message); + Assert.AreEqual("Parameter 'Grensspanning' is niet lognormaal verdeeld.", exception.Message); + Assert.IsInstanceOf(exception.InnerException); } [Test] - public void Transform_InvalidStochasticDistributionType_ThrowsImportedDataTransformException() + [TestCaseSource(nameof(GetInvalidStochastConfiguration))] + public void Transform_InvalidStochasticDistributionProperties_ThrowsImportedDataTransformException( + PreconsolidationStress preconsolidationStress) { - // Setup - var random = new Random(21); - var preconsolidationStress = new PreconsolidationStress - { - StressDistributionType = random.Next(3, int.MaxValue), - StressShift = 0 - }; - // Call TestDelegate call = () => MacroStabilityInwardsPreconsolidationStressTransformer.Transform(preconsolidationStress); // Assert var exception = Assert.Throws(call); - var coordinate = new Point2D(preconsolidationStress.XCoordinate, preconsolidationStress.ZCoordinate); - string expectedMessage = CreateExpectedErrorMessage(coordinate, - "Parameter 'Grensspanning' moet lognormaal verdeeld zijn."); - Assert.AreEqual(expectedMessage, exception.Message); + Assert.AreEqual("Parameter 'Grensspanning' is niet lognormaal verdeeld.", exception.Message); } - [Test] - public void Transform_InvalidStochasticDistributionShift_ThrowsImportedDataTransformException() + private static IEnumerable GetInvalidStochastConfiguration() { - // Setup var random = new Random(21); - var preconsolidationStress = new PreconsolidationStress + + yield return new TestCaseData(new PreconsolidationStress { - StressDistributionType = SoilLayerConstants.LogNormalDistributionValue, - StressShift = random.NextDouble() - }; + StressDistributionType = random.Next(3, int.MaxValue), + StressShift = 0 + }).SetName("Invalid DistributionType"); - // Call - TestDelegate call = () => MacroStabilityInwardsPreconsolidationStressTransformer.Transform(preconsolidationStress); - - // Assert - var exception = Assert.Throws(call); - var coordinate = new Point2D(preconsolidationStress.XCoordinate, preconsolidationStress.ZCoordinate); - string expectedMessage = CreateExpectedErrorMessage(coordinate, - "Parameter 'Grensspanning' moet lognormaal verdeeld zijn met een verschuiving gelijk aan 0."); - Assert.AreEqual(expectedMessage, exception.Message); + yield return new TestCaseData(new PreconsolidationStress + { + StressDistributionType = 3, + StressShift = random.NextDouble() + }).SetName("Invalid Shift"); } - private static string CreateExpectedErrorMessage(Point2D location, string errorMessage) - { - return $"Grensspanning op locatie {location} heeft een ongeldige waarde. {errorMessage}"; - } - - #region Test data - private static IEnumerable GetPreconsolidationStressInvalidDistributionValues() { var random = new Random(21); @@ -197,16 +170,14 @@ ZCoordinate = zCoordinate, StressMean = preconsolidationStressMean, StressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation - }).SetName("XCoordinate NaN"); + }, "X-coördinaat").SetName("XCoordinate NaN"); yield return new TestCaseData(new PreconsolidationStress { XCoordinate = xCoordinate, ZCoordinate = double.NaN, StressMean = preconsolidationStressMean, StressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation - }).SetName("ZCoordinate NaN"); + }, "Z-coördinaat").SetName("ZCoordinate NaN"); } - - #endregion } } \ No newline at end of file