Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs =================================================================== diff -u -r4671 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4671) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 6157) @@ -33,18 +33,13 @@ // Given var sourceSoil = new Soil("Source Soil", 10.0, 20.0) { - BeddingAngle = 30.0, DiameterD70 = 0.5, PermeabKx = 0.01, - WhitesConstant = 1.2, - DiameterD90 = 0.7, Cohesion = 5.0, FrictionAngle = 25.0, PoP = 100.0, Ocr = 1.5, RatioCuPc = 0.8, - CuTop = 2.0, - CuBottom = 3.0, StrengthIncreaseExponent = 0.3, ShearStrengthModel = ShearStrengthModel.SigmaTauCurve, SigmaTauCurve = new SigmaTauCurve() @@ -57,23 +52,21 @@ // When targetSoil.Assign(sourceSoil); - // Then - Assert.That(targetSoil.Name, Is.EqualTo(sourceSoil.Name)); - Assert.That(targetSoil.BeddingAngle, Is.EqualTo(sourceSoil.BeddingAngle)); - Assert.That(targetSoil.DiameterD70, Is.EqualTo(sourceSoil.DiameterD70)); - Assert.That(targetSoil.PermeabKx, Is.EqualTo(sourceSoil.PermeabKx)); - Assert.That(targetSoil.WhitesConstant, Is.EqualTo(sourceSoil.WhitesConstant)); - Assert.That(targetSoil.DiameterD90, Is.EqualTo(sourceSoil.DiameterD90)); - Assert.That(targetSoil.Cohesion, Is.EqualTo(sourceSoil.Cohesion)); - Assert.That(targetSoil.FrictionAngle, Is.EqualTo(sourceSoil.FrictionAngle)); - Assert.That(targetSoil.PoP, Is.EqualTo(sourceSoil.PoP)); - Assert.That(targetSoil.Ocr, Is.EqualTo(sourceSoil.Ocr)); - Assert.That(targetSoil.RatioCuPc, Is.EqualTo(sourceSoil.RatioCuPc)); - Assert.That(targetSoil.CuTop, Is.EqualTo(sourceSoil.CuTop)); - Assert.That(targetSoil.CuBottom, Is.EqualTo(sourceSoil.CuBottom)); - Assert.That(targetSoil.StrengthIncreaseExponent, Is.EqualTo(sourceSoil.StrengthIncreaseExponent)); - Assert.That(targetSoil.ShearStrengthModel, Is.EqualTo(sourceSoil.ShearStrengthModel)); - Assert.That(targetSoil.SigmaTauCurve.Points.Count, Is.EqualTo(sourceSoil.SigmaTauCurve.Points.Count)); + Assert.Multiple(() => + { + // Then + Assert.That(targetSoil.Name, Is.EqualTo(sourceSoil.Name)); + Assert.That(targetSoil.DiameterD70, Is.EqualTo(sourceSoil.DiameterD70)); + Assert.That(targetSoil.PermeabKx, Is.EqualTo(sourceSoil.PermeabKx)); + Assert.That(targetSoil.Cohesion, Is.EqualTo(sourceSoil.Cohesion)); + Assert.That(targetSoil.FrictionAngle, Is.EqualTo(sourceSoil.FrictionAngle)); + Assert.That(targetSoil.PoP, Is.EqualTo(sourceSoil.PoP)); + Assert.That(targetSoil.Ocr, Is.EqualTo(sourceSoil.Ocr)); + Assert.That(targetSoil.RatioCuPc, Is.EqualTo(sourceSoil.RatioCuPc)); + Assert.That(targetSoil.StrengthIncreaseExponent, Is.EqualTo(sourceSoil.StrengthIncreaseExponent)); + Assert.That(targetSoil.ShearStrengthModel, Is.EqualTo(sourceSoil.ShearStrengthModel)); + Assert.That(targetSoil.SigmaTauCurve.Points.Count, Is.EqualTo(sourceSoil.SigmaTauCurve.Points.Count)); + }); for (var i = 0; i < sourceSoil.SigmaTauCurve.Points.Count; i++) { Assert.That(targetSoil.SigmaTauCurve.Points[i].Sigma, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Sigma));