Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs =================================================================== diff -u -r3822 -r3826 --- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 3822) +++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 3826) @@ -90,28 +90,28 @@ Assert.AreEqual("DWP_1.sti", allCalculationresults[0].ProfileName); Assert.AreEqual(100, allCalculationresults[0].ProfileProbability); Assert.AreEqual(MStabModelType.Bishop, allCalculationresults[0].StabilityModel); - Assert.AreEqual(1.545, allCalculationresults[0].SafetyFactor, diff); - Assert.AreEqual(null, allCalculationresults[0].ShoulderHeight); - Assert.AreEqual(null, allCalculationresults[0].ToeAtPolderX); - Assert.AreEqual(null, allCalculationresults[0].ToeAtPolderZ); + Assert.That(allCalculationresults[0].SafetyFactor, Is.EqualTo(1.545).Within(diff)); + Assert.That(allCalculationresults[0].ShoulderHeight, Is.Null); + Assert.That(allCalculationresults[0].ToeAtPolderX, Is.Null); + Assert.That(allCalculationresults[0].ToeAtPolderZ, Is.Null); Assert.AreEqual(1.170, allCalculationresults[0].RequiredSafetyFactor); Assert.AreEqual(4.4, allCalculationresults[0].RiverLevel); Assert.AreEqual(0.63, allCalculationresults[0].RiverLevelLow); Assert.AreEqual(4.900, allCalculationresults[0].DikeTableHeight); Assert.AreEqual(0.000, allCalculationresults[0].SlopeDampingPiezometricHeightPolderSide); Assert.AreEqual(36.150, allCalculationresults[0].DikeLength); - Assert.AreEqual(1.837, allCalculationresults[0].Pl3MinUplift, diff); + Assert.That(allCalculationresults[0].Pl3MinUplift, Is.EqualTo(1.837).Within(diff)); Assert.AreEqual(1.60, allCalculationresults[0].Pl3HeadAdjusted); - Assert.AreEqual(106, allCalculationresults[0].Pl3LocalLocationXMinUplift, diff); - Assert.AreEqual(114.42, allCalculationresults[0].Pl3LocationXMinUplift, diff); + Assert.That(allCalculationresults[0].Pl3LocalLocationXMinUplift, Is.EqualTo(106).Within(diff)); + Assert.That(allCalculationresults[0].Pl3LocationXMinUplift, Is.EqualTo(114.42).Within(diff)); Assert.AreEqual(0.000, allCalculationresults[0].Pl3LocationYMinUplift); Assert.AreEqual(0.000, allCalculationresults[0].Pl4MinUplift); Assert.AreEqual(0.000, allCalculationresults[0].Pl4HeadAdjusted); Assert.AreEqual(0.000, allCalculationresults[0].Pl4LocalLocationXMinUplift); Assert.AreEqual(8.420, allCalculationresults[0].Pl4LocationXMinUplift); Assert.AreEqual(0.000, allCalculationresults[0].Pl4LocationYMinUplift); - Assert.AreEqual(16.190, allCalculationresults[0].LocalPipingEntryPointX, diff); - Assert.AreEqual(24.610, allCalculationresults[0].PipingEntryPointX, diff); + Assert.That(allCalculationresults[0].LocalPipingEntryPointX, Is.EqualTo(16.190).Within(diff)); + Assert.That(allCalculationresults[0].PipingEntryPointX, Is.EqualTo(24.610).Within(diff)); Assert.AreEqual(0.000, allCalculationresults[0].PipingEntryPointY); Assert.AreEqual(null, allCalculationresults[0].LocalPipingExitPointX); Assert.AreEqual(null, allCalculationresults[0].PipingExitPointX); @@ -148,16 +148,16 @@ Assert.AreEqual("Segment_1_1D2", allCalculationresults[1].ProfileName); Assert.AreEqual(2.43, allCalculationresults[1].ProfileProbability); Assert.AreEqual(MStabModelType.Bishop, allCalculationresults[1].StabilityModel); - Assert.AreEqual(1.079, allCalculationresults[1].SafetyFactor, diff); + Assert.That(allCalculationresults[1].SafetyFactor, Is.EqualTo(1.079).Within(diff)); Assert.AreEqual(null, allCalculationresults[1].ShoulderHeight); Assert.AreEqual(null, allCalculationresults[1].ToeAtPolderX); Assert.AreEqual(null, allCalculationresults[1].ToeAtPolderZ); Assert.AreEqual(0.900, allCalculationresults[1].RequiredSafetyFactor); Assert.AreEqual(-2.090, allCalculationresults[1].RiverLevel); Assert.AreEqual(-2.520, allCalculationresults[1].RiverLevelLow); - Assert.AreEqual(-2.000, allCalculationresults[1].DikeTableHeight, diff); + Assert.That(allCalculationresults[1].DikeTableHeight, Is.EqualTo(-2.000).Within(diff)); Assert.AreEqual(0.000, allCalculationresults[1].SlopeDampingPiezometricHeightPolderSide); - Assert.AreEqual(14.12, allCalculationresults[1].DikeLength, diff * 10); + Assert.That(allCalculationresults[1].DikeLength, Is.EqualTo(14.12).Within(diff * 10)); // * PL3 Min uplift = null Assert.AreEqual(null, allCalculationresults[1].Pl3MinUplift); @@ -181,9 +181,9 @@ Assert.AreEqual(null, allCalculationresults[1].Pl4LocationYMinUplift); - Assert.AreEqual(9.798, allCalculationresults[1].LocalPipingEntryPointX, diff); - Assert.AreEqual(88216.844, allCalculationresults[1].PipingEntryPointX, diff); - Assert.AreEqual(448870.287, allCalculationresults[1].PipingEntryPointY, diff); + Assert.That(allCalculationresults[1].LocalPipingEntryPointX, Is.EqualTo(9.798).Within(diff)); + Assert.That(allCalculationresults[1].PipingEntryPointX, Is.EqualTo(88216.844).Within(diff)); + Assert.That(allCalculationresults[1].PipingEntryPointY, Is.EqualTo(448870.287).Within(diff)); Assert.AreEqual(null, allCalculationresults[1].LocalPipingExitPointX); Assert.AreEqual(null, allCalculationresults[1].PipingExitPointX); Assert.AreEqual(null, allCalculationresults[1].PipingExitPointY);