Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/SoilUtilsTests.cs =================================================================== diff -u -r6731 -r6733 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/SoilUtilsTests.cs (.../SoilUtilsTests.cs) (revision 6731) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/SoilUtilsTests.cs (.../SoilUtilsTests.cs) (revision 6733) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using System.Drawing; using Deltares.Geotechnics.Soils; using NUnit.Framework; @@ -35,16 +36,43 @@ var expectedSoil = new Soil { Name = "Sand", - DiameterD70 = 1 + DiameterD70 = 1.1, + Color = Color.Aqua, + Cohesion = 1.3, + AbovePhreaticLevel = 1.4, + BelowPhreaticLevel = 1.5, + FrictionAngle = 1.6, + PermeabKx = 1.7, + POP = 1.8, + RatioCuPc = 1.9, + SoilType = SoilType.Sand, + ShearStrengthModel = ShearStrengthModel.CuMeasured, + StrengthIncreaseExponent = 2.0, + UseDefaultShearStrengthModel = false }; Dictionary nameValuePairs = SoilUtils.GetParametersAsNameValuePairs(expectedSoil); var actualSoil = new Soil(); + actualSoil.UseDefaultShearStrengthModel = false; foreach (KeyValuePair soilDetail in nameValuePairs) { SoilUtils.SetParameterFromNameValuePair(actualSoil, soilDetail.Key, soilDetail.Value); } - Assert.That(actualSoil.DiameterD70, Is.EqualTo(expectedSoil.DiameterD70)); + Assert.Multiple(() => + { + Assert.That(actualSoil.DiameterD70, Is.EqualTo(expectedSoil.DiameterD70)); + Assert.That(actualSoil.Color.ToArgb(), Is.EqualTo(expectedSoil.Color.ToArgb())); + Assert.That(actualSoil.Cohesion, Is.EqualTo(expectedSoil.Cohesion)); + Assert.That(actualSoil.AbovePhreaticLevel, Is.EqualTo(expectedSoil.AbovePhreaticLevel)); + Assert.That(actualSoil.BelowPhreaticLevel, Is.EqualTo(expectedSoil.BelowPhreaticLevel)); + Assert.That(actualSoil.FrictionAngle, Is.EqualTo(expectedSoil.FrictionAngle)); + Assert.That(actualSoil.PermeabKx, Is.EqualTo(expectedSoil.PermeabKx)); + Assert.That(actualSoil.POP, Is.EqualTo(expectedSoil.POP)); + Assert.That(actualSoil.RatioCuPc, Is.EqualTo(expectedSoil.RatioCuPc)); + Assert.That(actualSoil.SoilType, Is.EqualTo(expectedSoil.SoilType)); + Assert.That(actualSoil.ShearStrengthModel, Is.EqualTo(expectedSoil.ShearStrengthModel)); + Assert.That(actualSoil.StrengthIncreaseExponent, Is.EqualTo(expectedSoil.StrengthIncreaseExponent)); + }); expectedSoil.DiameterD70 = 20; nameValuePairs = SoilUtils.GetParametersAsNameValuePairs(expectedSoil);