Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs =================================================================== diff -u -r5410 -r5415 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs (.../SoilProfileValidator.cs) (revision 5410) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs (.../SoilProfileValidator.cs) (revision 5415) @@ -118,9 +118,9 @@ /// private void ThrowIfInsufficientSoilGeometryData() { - bool hasNoGeometry1DData = (SoilProfileType == SoilProfileType.ProfileType1D) && SoilProfile1D == null; - bool hasNoGeometry2DData = ((SoilProfileType == SoilProfileType.ProfileTypeStiFile) && (SoilGeometry2DName == null || DikeEmbankmentMaterial == null)) || - ((SoilProfileType == SoilProfileType.ProfileType2D) && (SoilProfile2D == null || DikeEmbankmentMaterial == null)); + bool hasNoGeometry1DData = (SoilProfileType == SoilProfileType.ProfileType1D) && (SoilProfile1D == null || DikeEmbankmentMaterial == null); + bool hasNoGeometry2DData = ((SoilProfileType == SoilProfileType.ProfileTypeStiFile) && (SoilGeometry2DName == null)) || + ((SoilProfileType == SoilProfileType.ProfileType2D) && (SoilProfile2D == null)); if (hasNoGeometry1DData || hasNoGeometry2DData) { throw new PlLinesCreatorException(Resources.SoilProfileValidator_General Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs =================================================================== diff -u -r5409 -r5415 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs (.../SoilProfileValidatorTests.cs) (revision 5409) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs (.../SoilProfileValidatorTests.cs) (revision 5415) @@ -112,6 +112,23 @@ [Test] [SetUICulture("nl-NL")] + public void GivenSoilProfile1DWithoutDikeEmbankmentMaterial_WhenValidating_ThenLanguageNLThrowsException() + { + var soilProfileValidator = new SoilProfileValidator + { + SurfaceLine = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(), + SoilProfileType = SoilProfileType.ProfileType1D, + SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfile(), + DikeEmbankmentMaterial = null + }; + Assert.That(() => soilProfileValidator.ValidateSoilProfileForPlLinesCreator(), + Throws.InstanceOf().With.Message.EqualTo + (generalMessage + + "Er is niet voldoende informatie over het ondergrondprofiel (Profiel 1D, Profiel 2D of Ophoogmateriaal dijk) beschikbaar voor de PL-lijnen te maken.")); + } + + [Test] + [SetUICulture("nl-NL")] public void GivenSoilProfile2DIsNull_WhenValidating_ThenLanguageNLThrowsException() { var soilProfileValidator = new SoilProfileValidator