Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs =================================================================== diff -u -r3238 -r3301 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs (.../SoilGeometryProbability.cs) (revision 3238) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs (.../SoilGeometryProbability.cs) (revision 3301) @@ -116,6 +116,11 @@ { return SoilProfile1D.Name; } + + if (SoilProfile2D != null) + { + return SoilProfile2D.Name; + } else { return StiFileName; Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj =================================================================== diff -u -r3091 -r3301 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj (.../Deltares.DamEngine.Data.Tests.csproj) (revision 3091) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj (.../Deltares.DamEngine.Data.Tests.csproj) (revision 3301) @@ -54,6 +54,7 @@ + Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SoilGeometryProbabilityTest.cs =================================================================== diff -u --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SoilGeometryProbabilityTest.cs (revision 0) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SoilGeometryProbabilityTest.cs (revision 3301) @@ -0,0 +1,95 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of the Dam Engine. +// +// The Dam Engine is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Deltares.DamEngine.Data.General; +using Deltares.DamEngine.Data.Geotechnics; +using NUnit.Framework; + +namespace Deltares.DamEngine.Data.Tests.General +{ + [TestFixture] + public class SoilGeometryProbabilityTest + { + [Test] + public void ToString_GeometryWithSoilProfile1D_ReturnsExpectedString() + { + // Setup + var soilProfile1D = new SoilProfile1D + { + Name = "SoilProfile1D" + }; + var soilProfile2D = new SoilProfile2D + { + Name = "Not Relevant" + }; + var scenario = new SoilGeometryProbability + { + SoilProfile1D = soilProfile1D, + SoilProfile2D = soilProfile2D, + StiFileName = "Not Relevant Sti File" + }; + + // Call + string stringRepresentation = scenario.ToString(); + + // Assert + Assert.That(stringRepresentation, Is.EqualTo(soilProfile1D.Name)); + } + + [Test] + public void ToString_GeometryWithSoilProfile2D_ReturnsExpectedString() + { + // Setup + var soilProfile2D = new SoilProfile2D + { + Name = "SoilProfile2D" + }; + var scenario = new SoilGeometryProbability + { + SoilProfile2D = soilProfile2D, + StiFileName = "Not Relevant Sti File" + }; + + // Call + string stringRepresentation = scenario.ToString(); + + // Assert + Assert.That(stringRepresentation, Is.EqualTo(soilProfile2D.Name)); + } + + [Test] + public void ToString_GeometryWithoutAnyProfile_ReturnsExpectedString() + { + // Setup + const string stiFileName = "StiFileName"; + var scenario = new SoilGeometryProbability + { + StiFileName = stiFileName + }; + + // Call + string stringRepresentation = scenario.ToString(); + + // Assert + Assert.That(stringRepresentation, Is.EqualTo(stiFileName)); + } + } +} \ No newline at end of file