Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs =================================================================== diff -u -r4702 -r4734 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 4702) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 4734) @@ -38,11 +38,12 @@ /// - Mohr-Coulomb (c=5, phi=psi=45) leading to a shear stress of Tau = 5 + NormalEffectiveStress /// - SigmaTau table with one segment line (0, 5)-(400, 405) equivalent to Mohr-Coulomb /// - Shansep (m=S=1, POP=5) leading to a shear stress of Tau = 5 + VerticalEffectiveStress - /// Expected is that both shear strength models Mohr-Coulomb and SigmTau return the same result. + /// Expected is that both shear strength models Mohr-Coulomb and SigmaTau return the same result. /// But Shansep should return a higher safety factor because the VerticalEffectiveStress is higher than the NormalEffectiveStress. /// [Test] [Category("Work_In_Progress")] + //[Ignore("unexpected error message occurs, will be solved in MWDAM-2123")] public void GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned() { var projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShearStrengthModelsTests\ShearStrengthModelsComparison.damx"); @@ -78,13 +79,17 @@ /// [Test] [Category("Work_In_Progress")] - [Ignore("unexpected error message occurs, will be solved in MWDAM-2123")] + //[Ignore("unexpected error message occurs, will be solved in MWDAM-2123")] public void GivenInvalidSigmaTauCurveNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage() { var projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShearStrengthModelsTests\InvalidSigmaTauCurveNotStartingAt0.damx"); List allCalculationResults = ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, true, 1); Assert.That(allCalculationResults, Has.Count.EqualTo(2)); - Assert.That(allCalculationResults[1].CalculationResult, Is.EqualTo(CalculationResult.RunFailed)); + Assert.Multiple(() => + { + Assert.That(allCalculationResults[1].CalculationResult, Is.EqualTo(CalculationResult.RunFailed)); + Assert.That(allCalculationResults[1].ResultMessage, Does.Contain("The first sigma value must be 0 for sigma/tau table")); + }); } } } \ No newline at end of file