Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs =================================================================== diff -u -r4e0b333b9e7d89ba6563e1b2f9cb011c92c8015f -r6e13601c60d74ca47c6fa76ed894c03c3aa0cfdf --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs (.../PipingSoilLayerTransformer.cs) (revision 4e0b333b9e7d89ba6563e1b2f9cb011c92c8015f) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs (.../PipingSoilLayerTransformer.cs) (revision 6e13601c60d74ca47c6fa76ed894c03c3aa0cfdf) @@ -160,7 +160,7 @@ || Math.Abs(shift) > 1e-6)) { throw new ImportedDataTransformException(string.Format( - Resources.SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution, + Resources.SoilLayer_Stochastic_parameter_0_has_no_shifted_lognormal_distribution, incorrectDistibutionParameter)); } } @@ -170,7 +170,7 @@ if (distribution.HasValue && distribution != SoilLayerConstants.LogNormalDistributionValue) { throw new ImportedDataTransformException(string.Format( - Resources.SoilLayer_Stochastic_parameter_0_has_no_shifted_lognormal_distribution, + Resources.SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution, incorrectDistibutionParameter)); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs =================================================================== diff -u -rdaa6b36fc2506683c50ba4117790452ae4f45d7f -r6e13601c60d74ca47c6fa76ed894c03c3aa0cfdf --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs (.../PipingSoilLayerTransformerTest.cs) (revision daa6b36fc2506683c50ba4117790452ae4f45d7f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs (.../PipingSoilLayerTransformerTest.cs) (revision 6e13601c60d74ca47c6fa76ed894c03c3aa0cfdf) @@ -112,7 +112,7 @@ } [Test] - public void SoilLayer1DTransform_IncorrectShiftedLogNormalDistribution_ThrowsImportedDataTransformException() + public void SoilLayer1DTransform_IncorrectLogNormalDistribution_ThrowsImportedDataTransformException() { // Setup var layer = new SoilLayer1D(0.0) @@ -125,19 +125,19 @@ // Assert Exception exception = Assert.Throws(test); - Assert.AreEqual("Parameter 'Verzadigd gewicht' is niet verschoven lognormaal verdeeld.", exception.Message); + Assert.AreEqual("Parameter 'Verzadigd gewicht' is niet lognormaal verdeeld.", exception.Message); } [Test] - [TestCaseSource(nameof(IncorrectLogNormalDistributionsSoilLayer1D))] - public void SoilLayer1DTransform_IncorrectLogNormalDistribution_ThrowsImportedDataTransformException(SoilLayer1D layer, string parameter) + [TestCaseSource(nameof(IncorrectShiftedLogNormalDistributionsSoilLayer1D))] + public void SoilLayer1DTransform_IncorrectShiftedLogNormalDistribution_ThrowsImportedDataTransformException(SoilLayer1D layer, string parameter) { // Call TestDelegate test = () => PipingSoilLayerTransformer.Transform(layer); // Assert Exception exception = Assert.Throws(test); - Assert.AreEqual($"Parameter '{parameter}' is niet lognormaal verdeeld.", exception.Message); + Assert.AreEqual($"Parameter '{parameter}' is niet verschoven lognormaal verdeeld.", exception.Message); } [Test] @@ -785,7 +785,7 @@ } [Test] - public void SoilLayer2DTransform_IncorrectShiftedLogNormalDistribution_ThrowsImportedDataTransformException() + public void SoilLayer2DTransform_IncorrectLogNormalDistribution_ThrowsImportedDataTransformException() { // Setup var layer = new SoilLayer2D @@ -800,12 +800,12 @@ // Assert Exception exception = Assert.Throws(test); - Assert.AreEqual("Parameter 'Verzadigd gewicht' is niet verschoven lognormaal verdeeld.", exception.Message); + Assert.AreEqual("Parameter 'Verzadigd gewicht' is niet lognormaal verdeeld.", exception.Message); } [Test] - [TestCaseSource(nameof(IncorrectLogNormalDistributionsSoilLayer2D))] - public void SoilLayer2DTransform_IncorrectLogNormalDistribution_ThrowsImportedDataTransformException(SoilLayer2D layer, string parameter) + [TestCaseSource(nameof(IncorrectShiftedLogNormalDistributionsSoilLayer2D))] + public void SoilLayer2DTransform_IncorrectShiftedLogNormalDistribution_ThrowsImportedDataTransformException(SoilLayer2D layer, string parameter) { // Setup double bottom; @@ -815,20 +815,20 @@ // Assert Exception exception = Assert.Throws(test); - Assert.AreEqual($"Parameter '{parameter}' is niet lognormaal verdeeld.", exception.Message); + Assert.AreEqual($"Parameter '{parameter}' is niet verschoven lognormaal verdeeld.", exception.Message); } - private static IEnumerable IncorrectLogNormalDistributionsSoilLayer1D() + private static IEnumerable IncorrectShiftedLogNormalDistributionsSoilLayer1D() { - return IncorrectLogNormalDistributions(() => new SoilLayer1D(0.0), nameof(SoilLayer1D)); + return IncorrectShiftedLogNormalDistributions(() => new SoilLayer1D(0.0), nameof(SoilLayer1D)); } - private static IEnumerable IncorrectLogNormalDistributionsSoilLayer2D() + private static IEnumerable IncorrectShiftedLogNormalDistributionsSoilLayer2D() { - return IncorrectLogNormalDistributions(() => new SoilLayer2D(), nameof(SoilLayer2D)); + return IncorrectShiftedLogNormalDistributions(() => new SoilLayer2D(), nameof(SoilLayer2D)); } - private static IEnumerable IncorrectLogNormalDistributions(Func soilLayer, string typeName) + private static IEnumerable IncorrectShiftedLogNormalDistributions(Func soilLayer, string typeName) { const string testNameFormat = "{0}Transform_Incorrect{1}{{1}}_ThrowsImportedDataTransformException"; const long validDistribution = SoilLayerConstants.LogNormalDistributionValue;