Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs =================================================================== diff -u -r4888 -r4889 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 4888) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 4889) @@ -24,6 +24,7 @@ using Deltares.Dam.Data; using Deltares.Dam.TestHelper; using Deltares.Standard; +using Deltares.Standard.Logging; using NUnit.Framework; namespace Deltares.Dam.IntegrationTests @@ -46,8 +47,8 @@ [Test] public void GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned() { - var projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShearStrengthModelsTests\ShearStrengthModelsComparison.damx"); - List allCalculationResults = ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, true, 1); + string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShearStrengthModelsTests\ShearStrengthModelsComparison.damx"); + List allCalculationResults = ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, true, 1, 1, out List _); Assert.That(allCalculationResults, Has.Count.EqualTo(3)); for (int i = 0; i < 3; i++) @@ -78,18 +79,29 @@ /// Expected is that the soil profile SigmaTauMaterial returns no result and that a clear calculation error message is displayed. /// [Test] - [Category("Work_In_Progress")] - //[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); + string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShearStrengthModelsTests\InvalidSigmaTauCurveNotStartingAt0.damx"); + List allCalculationResults = ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, true, 1, 1, out List logMessages); Assert.That(allCalculationResults, Has.Count.EqualTo(2)); 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")); + Assert.That(allCalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombMaterial")); + Assert.That(allCalculationResults[0].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); + + Assert.That(allCalculationResults[1].ProfileName, Is.EqualTo("ShansepMaterial")); + Assert.That(allCalculationResults[1].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); }); + Assert.That(logMessages, Has.Count.EqualTo(14)); + Assert.Multiple(() => + { + Assert.That(logMessages[6].MessageType, Is.EqualTo(LogMessageType.Error)); + Assert.That(logMessages[6].Message, Is.EqualTo("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'")); + Assert.That(logMessages[7].MessageType, Is.EqualTo(LogMessageType.Error)); + Assert.That(logMessages[7].Message, Is.EqualTo("The first sigma value must be 0 for sigma/tau table ")); + Assert.That(logMessages[8].MessageType, Is.EqualTo(LogMessageType.Error)); + Assert.That(logMessages[8].Message, Is.EqualTo("The first sigma value must be 0 for sigma/tau table ")); + }); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs =================================================================== diff -u -r4648 -r4889 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 4648) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 4889) @@ -23,6 +23,7 @@ using System.IO; using Deltares.Dam.Data; using Deltares.Dam.TestHelper; +using Deltares.Standard.Logging; using NUnit.Framework; namespace Deltares.Dam.BenchmarkTests; @@ -45,7 +46,7 @@ private static List ComputeStabilityInsideProject(string projectFilename, MStabModelType modelType, int expectedLocations, int maxCores = 1) { - return ComputeHelper.ComputeStabilityProject(projectFilename, modelType, true, expectedLocations, maxCores); + return ComputeHelper.ComputeStabilityProject(projectFilename, modelType, true, expectedLocations, maxCores, out List _); } private void RemoveCalculationDirectoriesForProject(string aProjectName) Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs =================================================================== diff -u -r4648 -r4889 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 4648) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 4889) @@ -26,6 +26,7 @@ using Deltares.DamEngine.Io; using Deltares.DamEngine.Io.XmlInput; using Deltares.DamEngine.Io.XmlOutput; +using Deltares.Standard.Logging; using NUnit.Framework; namespace Deltares.Dam.TestHelper @@ -39,10 +40,11 @@ /// /// /// + /// /// /// public static List ComputeStabilityProject(string projectFilename, MStabModelType modelType, bool isStabilityInside, - int expectedLocations, int maxCores = 1) + int expectedLocations, int maxCores, out List logMessages) { using DamProjectData damProjectData = ProjectLoader.LoadProjectData(projectFilename); Assert.That(damProjectData.WaterBoard.Dikes.Count, Is.EqualTo(1)); @@ -89,6 +91,7 @@ } List allCalculationResults = damProjectData.DesignCalculations; + logMessages = damProjectData.CalculationMessages; return allCalculationResults; } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r4886 -r4889 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 4886) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 4889) @@ -24,6 +24,7 @@ using Deltares.Dam.Data; using Deltares.Dam.TestHelper; using Deltares.Standard; +using Deltares.Standard.Logging; using NUnit.Framework; namespace Deltares.Dam.IntegrationTests @@ -169,7 +170,7 @@ /// private static List ComputeStabilityOutsideProject(string projectFilename, int expectedLocations) { - return ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, false, expectedLocations); + return ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, false, expectedLocations, 1, out List _); } } } \ No newline at end of file