Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs =================================================================== diff -u -r5972 -r5978 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 5972) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 5978) @@ -43,7 +43,7 @@ /// /// /// - public static List ComputeStabilityProject(string projectFilename, string testName, MStabModelType modelType, bool isStabilityInside, + public static List ComputeStabilityProject(string projectFilename, MStabModelType modelType, bool isStabilityInside, int expectedLocations, int maxCores, out List logMessages) { using DamProjectData damProjectData = ProjectLoader.LoadProjectData(projectFilename); @@ -75,19 +75,18 @@ string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); // Enable next line for debugging - DamXmlSerialization.SaveInputAsXmlFile(testName + "Input.xml", input); + // DamXmlSerialization.SaveInputAsXmlFile("InputForDebugging.xml", input); var damEngineInterface = new EngineInterface(inputXml); string validationMessages = damEngineInterface.Validate(); - Assert.That(validationMessages, Is.Null); - + if (string.IsNullOrEmpty(validationMessages)) { // only if validation is ok, then string outputXml = damEngineInterface.Run(); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputXml); // Enable next line for debugging - DamXmlSerialization.SaveOutputAsXmlFile(testName + "Output.xml", output); + // DamXmlSerialization.SaveOutputAsXmlFile("OutputForDebugging.xml", output); FillDamUiFromXmlOutput.AddOutputToDamProjectData(damProjectData, output); } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r5975 -r5978 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5975) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5978) @@ -38,16 +38,11 @@ public void TestStabilityOutsideWith2DStixFiles() { string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\StabilityOutside2DFromStixTest\BishopOutside.damx"); - List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 1, "TestStabilityOutsideWith2DstixFiles", out List logMessages); + List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 1); + Assert.That(allCalculationResults, Has.Count.EqualTo(1)); Assert.Multiple(() => { - 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")); Assert.That(allCalculationResults[0].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.That(allCalculationResults[0].X, Is.EqualTo(99718.000)); @@ -104,15 +99,11 @@ public void TestStabilityOutsideWith1DProfiles() { string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\StabilityOutside1DProfileTest\Actualisatie.damx"); - - List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 59, "TestStabilityOutsideWith1DProfiles", out List logMessages); + List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 59); + + Assert.That(allCalculationResults, Has.Count.EqualTo(36)); Assert.Multiple(() => { - Assert.That(logMessages, Has.Count.EqualTo(2236)); - Assert.That(allCalculationResults, Has.Count.EqualTo(36)); - }); - Assert.Multiple(() => - { Assert.That(allCalculationResults[1].LocationName, Is.EqualTo("RK210-560")); Assert.That(allCalculationResults[1].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); Assert.That(allCalculationResults[1].X, Is.EqualTo(88218.047).Within(tolerance3Decimals)); @@ -180,9 +171,9 @@ /// /// /// - private static List ComputeStabilityOutsideProject(string projectFilename, int expectedLocations, string testName, out List logMessages) + private static List ComputeStabilityOutsideProject(string projectFilename, int expectedLocations) { - return ComputeHelper.ComputeStabilityProject(projectFilename, testName, MStabModelType.Bishop, false, expectedLocations, 1, out logMessages); + return ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, false, expectedLocations, 1, out List _); } } } \ No newline at end of file