Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs =================================================================== diff -u -r6673 -r6703 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs (.../MultiCoreMacroStabilityInwardsTests.cs) (revision 6673) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs (.../MultiCoreMacroStabilityInwardsTests.cs) (revision 6703) @@ -44,14 +44,14 @@ [Test, Category(Categories.MultiCore)] [TestCase(4, InputStabilityModelType.Bishop, "SlopeAdaptionBeforeShoulderAdaption", 18, 9)] [TestCase(8, InputStabilityModelType.Bishop, "SlopeAdaptionBeforeShoulderAdaption", 18, 9)] - [TestCase(4, InputStabilityModelType.UpliftVan, "SlopeAdaptionBeforeShoulderAdaption", 8, 18)] - [TestCase(8, InputStabilityModelType.UpliftVan, "SlopeAdaptionBeforeShoulderAdaption", 8, 18)] + [TestCase(4, InputStabilityModelType.UpliftVan, "SlopeAdaptionBeforeShoulderAdaption", 8, 18, 1)] + [TestCase(8, InputStabilityModelType.UpliftVan, "SlopeAdaptionBeforeShoulderAdaption", 8, 18, 1)] [TestCase(4, InputStabilityModelType.Bishop, "OptimizedSlopeAndShoulderAdaption", 9, 18)] [TestCase(8, InputStabilityModelType.Bishop, "OptimizedSlopeAndShoulderAdaption", 9, 18)] - [TestCase(4, InputStabilityModelType.UpliftVan, "OptimizedSlopeAndShoulderAdaption", 6, 20)] - [TestCase(8, InputStabilityModelType.UpliftVan, "OptimizedSlopeAndShoulderAdaption", 6, 20)] + [TestCase(4, InputStabilityModelType.UpliftVan, "OptimizedSlopeAndShoulderAdaption", 6, 20, 1)] + [TestCase(8, InputStabilityModelType.UpliftVan, "OptimizedSlopeAndShoulderAdaption", 6, 20, 1)] public void GivenTutorialDesign_WhenCalculateAllWithGeometryAdaption_ThenGivesExpectedResults(int maxCores, InputStabilityModelType stabilityModelType, string designMethod, - int expectedSucceeded = 21, int expectedFailed = 6) + int expectedSucceeded = 21, int expectedFailed = 6, int expectedNoRun = 0) { int processorCount = Environment.ProcessorCount; if (maxCores > processorCount) @@ -83,11 +83,13 @@ DamXmlSerialization.SaveOutputAsXmlFile(calcDir + "_OutputFile.xml", output); Assert.Multiple(() => { - Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(expectedSucceeded + expectedFailed)); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(expectedSucceeded + expectedFailed + expectedNoRun)); int actualSucceeded = output.Results.CalculationResults.Count(result => ConversionHelper.ConvertToCalculationResult(result.CalculationResult) == CalculationResult.Succeeded); Assert.That(actualSucceeded, Is.EqualTo(expectedSucceeded), "Succeeded calculations"); int actualFailed = output.Results.CalculationResults.Count(result => ConversionHelper.ConvertToCalculationResult(result.CalculationResult) == CalculationResult.RunFailed); Assert.That(actualFailed, Is.EqualTo(expectedFailed), "Failed calculations"); + int actualNoRun = output.Results.CalculationResults.Count(result => ConversionHelper.ConvertToCalculationResult(result.CalculationResult) == CalculationResult.NoRun); + Assert.That(actualNoRun, Is.EqualTo(expectedNoRun), "calculations not run"); }); }