Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r4645 -r4670 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4645) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4670) @@ -677,26 +677,24 @@ foreach (Soil actualSoil in actualSoilList.Soils) { Soil expectedSoil = expectedSoilList.GetSoilByName(actualSoil.Name); - Assert.That(actualSoil.AbovePhreaticLevel.Equals(expectedSoil.AbovePhreaticLevel), Is.True, string.Format(errorMessage, "AbovePhreaticLevel")); - Assert.That(actualSoil.BelowPhreaticLevel.Equals(expectedSoil.BelowPhreaticLevel), Is.True, string.Format(errorMessage, "BelowPhreaticLevel")); - Assert.That(actualSoil.DryUnitWeight.Equals(expectedSoil.DryUnitWeight), Is.True, string.Format(errorMessage, "DryUnitWeight")); - Assert.That(actualSoil.BeddingAngle.Equals(expectedSoil.BeddingAngle), Is.True, string.Format(errorMessage, "BeddingAngle")); - Assert.That(actualSoil.DiameterD70.Equals(expectedSoil.DiameterD70), Is.True, string.Format(errorMessage, "DiameterD70")); - Assert.That(actualSoil.DiameterD70.Equals(expectedSoil.DiameterD70), Is.True, string.Format(errorMessage, "DiameterD70")); - Assert.That(actualSoil.DiameterD90.Equals(expectedSoil.DiameterD90), Is.True, string.Format(errorMessage, "DiameterD90")); - Assert.That(actualSoil.DiameterD90.Equals(expectedSoil.DiameterD90), Is.True, string.Format(errorMessage, "DiameterD90")); - Assert.That(actualSoil.PermeabKx.Equals(expectedSoil.PermeabKx), Is.True, string.Format(errorMessage, "PermeabKx")); - Assert.That(actualSoil.WhitesConstant.Equals(expectedSoil.WhitesConstant), Is.True, string.Format(errorMessage, "WhitesConstant")); - Assert.That(actualSoil.ShearStrengthModel.Equals(expectedSoil.ShearStrengthModel), Is.True, string.Format(errorMessage, "ShearStrengthModel")); - Assert.That(actualSoil.UseDefaultShearStrengthModel.Equals(expectedSoil.UseDefaultShearStrengthModel), Is.True, string.Format(errorMessage, "UseDefaultShearStrengthModel")); - Assert.That(actualSoil.Cohesion.Equals(expectedSoil.Cohesion), string.Format(errorMessage, "Cohesion")); - Assert.That(actualSoil.FrictionAngle.Equals(expectedSoil.FrictionAngle), Is.True, string.Format(errorMessage, "FrictionAngle")); - Assert.That(actualSoil.OCR.Equals(expectedSoil.OCR), Is.True, string.Format(errorMessage, "OCR")); - Assert.That(actualSoil.RestSlope.Equals(expectedSoil.RestSlope), Is.True, string.Format(errorMessage, "RestSlope")); - Assert.That(actualSoil.DilatancyType.Equals(expectedSoil.DilatancyType), Is.True, string.Format(errorMessage, "DilatancyType")); - Assert.That(actualSoil.StrengthIncreaseExponent.Equals(expectedSoil.StrengthIncreaseExponent), Is.True, string.Format(errorMessage, "StrengthIncreaseExponent")); - Assert.That(actualSoil.RRatio.Equals(expectedSoil.RRatio), Is.True, string.Format(errorMessage, "RRatio")); - Assert.That(actualSoil.RatioCuPc.Equals(expectedSoil.RatioCuPc), Is.True, string.Format(errorMessage, "RatioCuPc")); + Assert.That(actualSoil.AbovePhreaticLevel, Is.EqualTo(expectedSoil.AbovePhreaticLevel), string.Format(errorMessage, "AbovePhreaticLevel")); + Assert.That(actualSoil.BelowPhreaticLevel, Is.EqualTo(expectedSoil.BelowPhreaticLevel), string.Format(errorMessage, "BelowPhreaticLevel")); + Assert.That(actualSoil.DryUnitWeight, Is.EqualTo(expectedSoil.DryUnitWeight), string.Format(errorMessage, "DryUnitWeight")); + Assert.That(actualSoil.BeddingAngle, Is.EqualTo(expectedSoil.BeddingAngle), string.Format(errorMessage, "BeddingAngle")); + Assert.That(actualSoil.DiameterD70, Is.EqualTo(expectedSoil.DiameterD70), string.Format(errorMessage, "DiameterD70")); + Assert.That(actualSoil.DiameterD90, Is.EqualTo(expectedSoil.DiameterD90), string.Format(errorMessage, "DiameterD90")); + Assert.That(actualSoil.PermeabKx, Is.EqualTo(expectedSoil.PermeabKx), string.Format(errorMessage, "PermeabKx")); + Assert.That(actualSoil.WhitesConstant, Is.EqualTo(expectedSoil.WhitesConstant), string.Format(errorMessage, "WhitesConstant")); + Assert.That(actualSoil.ShearStrengthModel, Is.EqualTo(expectedSoil.ShearStrengthModel), string.Format(errorMessage, "ShearStrengthModel")); + Assert.That(actualSoil.UseDefaultShearStrengthModel, Is.EqualTo(expectedSoil.UseDefaultShearStrengthModel), string.Format(errorMessage, "UseDefaultShearStrengthModel")); + Assert.That(actualSoil.Cohesion, Is.EqualTo(expectedSoil.Cohesion), string.Format(errorMessage, "Cohesion")); + Assert.That(actualSoil.FrictionAngle, Is.EqualTo(expectedSoil.FrictionAngle), string.Format(errorMessage, "FrictionAngle")); + Assert.That(actualSoil.OCR, Is.EqualTo(expectedSoil.OCR), string.Format(errorMessage, "OCR")); + Assert.That(actualSoil.RestSlope, Is.EqualTo(expectedSoil.RestSlope), string.Format(errorMessage, "RestSlope")); + Assert.That(actualSoil.DilatancyType, Is.EqualTo(expectedSoil.DilatancyType), string.Format(errorMessage, "DilatancyType")); + Assert.That(actualSoil.StrengthIncreaseExponent, Is.EqualTo(expectedSoil.StrengthIncreaseExponent), string.Format(errorMessage, "StrengthIncreaseExponent")); + Assert.That(actualSoil.RRatio, Is.EqualTo(expectedSoil.RRatio), string.Format(errorMessage, "RRatio")); + Assert.That(actualSoil.RatioCuPc, Is.EqualTo(expectedSoil.RatioCuPc), string.Format(errorMessage, "RatioCuPc")); } }