Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r5733 -r5735 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 5733) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 5735) @@ -108,18 +108,19 @@ const string calcBase = "LargeInsideBishopNoAdaptionGridCalculatesCorrect"; const string inputFilename = "LargeInsideBishopNoAdaptionGrid.xml"; const string outputBase = "OutputLargeInsideBishopNoAdaptionGrid"; - TestMultiCoreStability(maxCores, calcBase, inputFilename, outputBase, 724); + TestMultiCoreStability(maxCores, calcBase, inputFilename, outputBase, 724, false, false); } private static void TestMultiCoreStability(int maxCores, string calcBase, string inputFilename, string outputBase, - int expectedResults, bool justOneScenario = false) + int expectedResults, bool justOneScenario = false, bool expectedNoErrors = true) { const string workDir = @"TestMultiCoreDesignStability\"; string calcDir = workDir + calcBase + maxCores; string outputFilename = Path.Combine(calcDir, outputBase + maxCores + ".xml"); if (maxCores > 1) { - Output outputMultiCore = RunDesignMultiCoreWithXmlInputFile(maxCores, calcDir, inputFilename, outputFilename, justOneScenario); + Output outputMultiCore = RunDesignMultiCoreWithXmlInputFile(maxCores, calcDir, inputFilename, outputFilename, + justOneScenario, expectedNoErrors); string calcDir1Core = workDir + calcBase + "1"; string outputFilename1Core = Path.Combine(calcDir1Core, outputBase + "1.xml"); Output output1Core; @@ -131,19 +132,21 @@ } else { - output1Core = RunDesignMultiCoreWithXmlInputFile(1, calcDir1Core, inputFilename, outputFilename1Core, justOneScenario); + output1Core = RunDesignMultiCoreWithXmlInputFile(1, calcDir1Core, inputFilename, outputFilename1Core, + justOneScenario, expectedNoErrors); } GeneralHelper.CompareDesignOutput(output1Core, outputMultiCore); } else { - Output output1Core = RunDesignMultiCoreWithXmlInputFile(maxCores, calcDir, inputFilename, outputFilename, justOneScenario); + Output output1Core = RunDesignMultiCoreWithXmlInputFile(maxCores, calcDir, inputFilename, outputFilename, + justOneScenario, expectedNoErrors); Assert.That(output1Core.Results.CalculationResults, Has.Length.EqualTo(expectedResults)); } } - private static Output RunDesignMultiCoreWithXmlInputFile(int maxCores, string calcDir, string inputFilename, - string outputFilename, bool justOneScenario = false) + private static Output RunDesignMultiCoreWithXmlInputFile(int maxCores, string calcDir, string inputFilename, string outputFilename, + bool justOneScenario = false, bool expectedNoErrors = true) { if (Directory.Exists(calcDir)) { @@ -166,7 +169,10 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputFilename); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); + if (expectedNoErrors) + { + Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); + } return output; }