Fisheye: Tag 6548 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/TutorialDWP1WithAdaptionAndBishopUpliftVan.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r6543 -r6548 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6543) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6548) @@ -892,6 +892,7 @@ [TestCase("DWP_13", InputStabilityModelType.Bishop, "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 0.936, 23, "The characteristic points of the surfaceline are not ascending in X-direction.")] [TestCase("DWP_10", InputStabilityModelType.Bishop, "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.308, 16, "Location 'DWP_10', subsoil scenario 'DWP_10.stix', design scenario '3': The calculation failed with error message 'The design was not successful. After height adaption ditch does not fit inside surfaceline anymore.'")] [TestCase("DWP_1", InputStabilityModelType.BishopUpliftVan, "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.4, 1.405, 6)] + [TestCase("DWP_1", InputStabilityModelType.BishopUpliftVan, "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.367, 19)] public void GivenTutorialDesign_WhenSpecifiedLocationRunWithGeometryAdaption_ThenGivesExpectedResults(string locationId, InputStabilityModelType stabilityModelType, string designMethod, CalculationResult calculationResult, double requiredSafetyFactor, double actualSafetyFactor, int iterationCount, string errorMessage = "", string firstStabilityMessage = "") { @@ -945,40 +946,6 @@ }); } - [Test, Category(Categories.Slow)] - public void TestRunMacroStabilityTutorialDwp1WithAdaptionAndBishopUpliftVanProducesCorrectResults() - { - const string calcDir = "TestRunMacroStabilityTutorialDWP1WithAdaptionAndBishopUpliftVanProducesCorrectResults"; - if (Directory.Exists(calcDir)) - { - Directory.Delete(calcDir, true); // delete previous results - } - - Directory.CreateDirectory(calcDir); - - const string fileName = @"TestFiles\TutorialDWP1WithAdaptionAndBishopUpliftVan.xml"; - string inputString = File.ReadAllText(fileName); - 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); - - // one location is calculated with 1 2D profile and results are for the 3 models (Bishop, Uplift-Van and Bishop/UpliftVan) - Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3)); - Assert.Multiple(() => - { - CheckCalculationResults( - output.Results.CalculationResults[0], "DWP_1", "DWP_1.stix", - DesignResultStabilityDesignResultsStabilityModelType.Bishop, 1.538, true, CalculationResult.RunFailed); - CheckCalculationResults( - output.Results.CalculationResults[1], "DWP_1", "DWP_1.stix", - DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, 1.403, true, CalculationResult.RunFailed); - CheckCalculationResults( - output.Results.CalculationResults[2], "DWP_1", "DWP_1.stix", - DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, 1.403, true, CalculationResult.RunFailed); - }); - } - private static Output GetOutputStringForProject(string analysisType, bool isSuccessful) { // Create xml with Tutorial project