Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs =================================================================== diff -u -r4561 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4561) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilTests.cs (.../SoilTests.cs) (revision 4624) @@ -58,28 +58,28 @@ // When targetSoil.Assign(sourceSoil); - // Then - Assert.AreEqual(sourceSoil.Name, targetSoil.Name); - Assert.AreEqual(sourceSoil.BeddingAngle, targetSoil.BeddingAngle); - Assert.AreEqual(sourceSoil.DiameterD70, targetSoil.DiameterD70); - Assert.AreEqual(sourceSoil.PermeabKx, targetSoil.PermeabKx); - Assert.AreEqual(sourceSoil.WhitesConstant, targetSoil.WhitesConstant); - Assert.AreEqual(sourceSoil.DiameterD90, targetSoil.DiameterD90); - Assert.AreEqual(sourceSoil.Cohesion, targetSoil.Cohesion); - Assert.AreEqual(sourceSoil.FrictionAngle, targetSoil.FrictionAngle); - Assert.AreEqual(sourceSoil.PoP, targetSoil.PoP); - Assert.AreEqual(sourceSoil.Ocr, targetSoil.Ocr); - Assert.AreEqual(sourceSoil.RatioCuPc, targetSoil.RatioCuPc); - Assert.AreEqual(sourceSoil.CuTop, targetSoil.CuTop); - Assert.AreEqual(sourceSoil.CuBottom, targetSoil.CuBottom); - Assert.AreEqual(sourceSoil.UsePop, targetSoil.UsePop); - Assert.AreEqual(sourceSoil.StrengthIncreaseExponent, targetSoil.StrengthIncreaseExponent); - Assert.AreEqual(sourceSoil.ShearStrengthModel, targetSoil.ShearStrengthModel); - Assert.AreEqual(sourceSoil.SigmaTauCurve.Points.Count, targetSoil.SigmaTauCurve.Points.Count); + // 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.UsePop, Is.EqualTo(sourceSoil.UsePop)); + 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 (int i = 0; i < sourceSoil.SigmaTauCurve.Points.Count; i++) { - Assert.AreEqual(sourceSoil.SigmaTauCurve.Points[i].Sigma, targetSoil.SigmaTauCurve.Points[i].Sigma); - Assert.AreEqual(sourceSoil.SigmaTauCurve.Points[i].Tau, targetSoil.SigmaTauCurve.Points[i].Tau); + Assert.That(targetSoil.SigmaTauCurve.Points[i].Sigma, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Sigma)); + Assert.That(targetSoil.SigmaTauCurve.Points[i].Tau, Is.EqualTo(sourceSoil.SigmaTauCurve.Points[i].Tau)); } } } \ No newline at end of file