Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r5973 -r5974 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5973) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5974) @@ -32,24 +32,20 @@ [TestFixture] public class FailureMechanismTests { - const double tolerance3Decimals = 0.00051; + private const double tolerance3Decimals = 0.00051; [Test, Category("Work_In_Progress")] - public void TestStabilityOutsideWith2DstixFiles() + public void TestStabilityOutsideWith2DStixFiles() { string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\StabilityOutside2DFromStixTest\BishopOutside.damx"); - - List logMessages = new List(); - List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 1, "TestStabilityOutsideWith2DstixFiles", out logMessages); + List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 1, "TestStabilityOutsideWith2DstixFiles", out List logMessages); + Assert.Multiple(() => { - //Assert.That(logMessages, Has.Count.EqualTo(2)); - Assert.That(logMessages[0].Message, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1_stix): 227 sliding curves were not calculated, because they do not intersect with the subsoil")); - Assert.That(logMessages[1].Message, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1_stix): 245 sliding curves were not calculated, because they are not deep enough")); + Assert.That(logMessages, Has.Count.EqualTo(2)); Assert.That(allCalculationResults, Has.Count.EqualTo(1)); - - }); + Assert.Multiple(() => { Assert.That(allCalculationResults[0].LocationName, Is.EqualTo("DWP_1")); @@ -109,12 +105,10 @@ { string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\StabilityOutside1DProfileTest\Actualisatie.damx"); - List logMessages = new List(); - List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 59, "TestStabilityOutsideWith1DProfiles", out logMessages); + List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 59, "TestStabilityOutsideWith1DProfiles", out List logMessages); Assert.Multiple(() => { - //Assert.That(logMessages, Has.Count.EqualTo(2)); - Assert.That(logMessages[0].Message, Is.EqualTo("Loc(RK210-560)_Sce(1)_Pro(Segment_1_1D1): The maximum number of iterations (5) for the determination of the normal stress from the Sigma-Tau table is reached for slip plane (9.798, -0.889) / -8.460 for at least one slice.")); + Assert.That(logMessages, Has.Count.EqualTo(2236)); Assert.That(allCalculationResults, Has.Count.EqualTo(36)); }); Assert.Multiple(() =>