Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r6673 -r6675 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6673) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6675) @@ -48,10 +48,7 @@ [Test, Category(Categories.Slow)] public void TestRunMacroStabilityTutorialDesignUpliftVan() { - // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx" - // with Dam Classic rev.1059 - // Select 1st location (DWP_1) - // with Dam Classic rev.833 + // Based on DAM UI tutorial for stability, for location DWP_1 const string calcDir = "TestStabInwardsUpliftVan"; if (Directory.Exists(calcDir)) { @@ -68,6 +65,11 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used Output output = GeneralHelper.RunAfterInputValidation(inputString); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(1)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(0)); + }); Assert.Multiple(() => { @@ -104,12 +106,36 @@ } [Test, Category(Categories.Slow)] + public void TestRunMacroStabilityTutorialDesignUpliftVan_NoUplift() + { + // Based on DAM UI tutorial for stability, for location DWP_18 + const string calcDir = "TestStabInwardsUpliftVan_NoUplift"; + if (Directory.Exists(calcDir)) + { + Directory.Delete(calcDir, true); // delete previous results + } + + string inputString = File.ReadAllText(tutorialStability2D); + string[] locations = ["DWP_18"]; + inputString = XmlAdapter.SelectLocations(inputString, locations); + + inputString = XmlAdapter.ChangeStabilityInputModel(inputString, InputStabilityModelType.UpliftVan); + inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "CalculationGrid"); + inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used + inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used + + Output output = GeneralHelper.RunAfterInputValidation(inputString, false); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationResults, Is.Null); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1)); + }); + } + + [Test, Category(Categories.Slow)] public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest() { - // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx" - // with Dam Classic rev.1059 - // Select 1st location (DWP_1) - // with Dam Classic rev.833 + // Based on DAM UI tutorial for stability, for location DWP_1 const string calcDir = "TestStabInwardsBishopUpliftVan_UpliftVanLowest"; if (Directory.Exists(calcDir)) { @@ -126,6 +152,11 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used Output output = GeneralHelper.RunAfterInputValidation(inputString); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(0)); + }); // Bishop DesignResult result = output.Results.CalculationResults[0]; @@ -187,6 +218,11 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "BeeSwarm"); Output output = GeneralHelper.RunAfterInputValidation(inputString); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(0)); + }); // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; @@ -228,10 +264,7 @@ [Test, Category(Categories.Slow)] public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift() { - // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx" - // with Dam Classic rev.1059 - // Select 10th location (DWP_18) - // with Dam Classic rev.833 + // Based on DAM UI tutorial for stability, for location DWP_18 const string calcDir = "TestStabInwardsBishopUpliftVan_NoUplift"; if (Directory.Exists(calcDir)) { @@ -247,6 +280,11 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used Output output = GeneralHelper.RunAfterInputValidation(inputString); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(0)); + }); // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;