Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs =================================================================== diff -u -rbe96823492563605254378dd0a11d77ab5fb2004 -r2947e0c629f21f58380b39ac8ac51a2082a1a40c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs (.../MacroStabilityInwardsPreconsolidationStressTransformerTest.cs) (revision be96823492563605254378dd0a11d77ab5fb2004) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs (.../MacroStabilityInwardsPreconsolidationStressTransformerTest.cs) (revision 2947e0c629f21f58380b39ac8ac51a2082a1a40c) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; @@ -79,20 +80,21 @@ [Test] [TestCaseSource(nameof(GetPreconsolidationStressCombinationWithNaNValues))] public void Transform_PreconsolidationStressValuesNaN_ThrowsImportedDataTransformException( - PreconsolidationStress preconsolidationStress, - string parameterName) + PreconsolidationStress preconsolidationStress) { // Call TestDelegate call = () => MacroStabilityInwardsPreconsolidationStressTransformer.Transform(preconsolidationStress); // Assert var exception = Assert.Throws(call); - string expectedMessage = $"De waarde voor parameter '{parameterName}' voor de grensspanning moet een concreet getal zijn."; - Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsInstanceOf(exception.InnerException); + + Exception innerException = exception.InnerException; + Assert.IsInstanceOf(innerException); + Assert.AreEqual(innerException.Message, exception.Message); } [Test] + [SetCulture("NL-nl")] [TestCaseSource(nameof(GetPreconsolidationStressInvalidDistributionValues))] public void Transform_InvalidPreconsolidationStressDistributionValues_ThrowsImportedDataTransformException(PreconsolidationStress preconsolidationStress) { @@ -101,8 +103,12 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("Parameter 'Grensspanning' moet lognormaal verdeeld zijn met een verschuiving gelijk aan 0.", exception.Message); - Assert.IsInstanceOf(exception.InnerException); + + 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); } [Test] @@ -121,7 +127,10 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("Parameter 'Grensspanning' moet lognormaal verdeeld zijn.", exception.Message); + var coordinate = new Point2D(preconsolidationStress.XCoordinate, preconsolidationStress.ZCoordinate); + string expectedMessage = CreateExpectedErrorMessage(coordinate, + "Parameter 'Grensspanning' moet lognormaal verdeeld zijn."); + Assert.AreEqual(expectedMessage, exception.Message); } [Test] @@ -131,7 +140,7 @@ var random = new Random(21); var preconsolidationStress = new PreconsolidationStress { - StressDistributionType = 3, + StressDistributionType = SoilLayerConstants.LogNormalDistributionValue, StressShift = random.NextDouble() }; @@ -140,9 +149,19 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("Parameter 'Grensspanning' moet lognormaal verdeeld zijn met een verschuiving gelijk aan 0.", exception.Message); + 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); } + private static string CreateExpectedErrorMessage(Point2D location, string errorMessage) + { + return $"Grensspanning op locatie {location} heeft een ongeldige configuratie. {errorMessage}"; + } + + #region Test data + private static IEnumerable GetPreconsolidationStressInvalidDistributionValues() { var random = new Random(21); @@ -178,14 +197,16 @@ ZCoordinate = zCoordinate, StressMean = preconsolidationStressMean, StressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation - }, "X-coördinaat").SetName("XCoordinate NaN"); + }).SetName("XCoordinate NaN"); yield return new TestCaseData(new PreconsolidationStress { XCoordinate = xCoordinate, ZCoordinate = double.NaN, StressMean = preconsolidationStressMean, StressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation - }, "Z-coördinaat").SetName("ZCoordinate NaN"); + }).SetName("ZCoordinate NaN"); } + + #endregion } } \ No newline at end of file