Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r3623 -r3636 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 3623) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 3636) @@ -346,7 +346,6 @@ } [Test, Category("Slow")] - [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")] public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1D() { // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx @@ -389,8 +388,8 @@ Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName); var result = output.Results.CalculationResults[0]; - // SafetyFactor=1.621 - Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, Tolerance); + // SafetyFactor=1.682 + Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, Tolerance); // skip testing some of the results like uplift etc. @@ -399,11 +398,19 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; - // SafetyFactor=1.620 - Assert.AreEqual(1.620, result.StabilityDesignResults.SafetyFactor, Tolerance); + // SafetyFactor=1.644 + Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, Tolerance); result = output.Results.CalculationResults[2]; - // SafetyFactor=1.621 - Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, Tolerance); + // SafetyFactor=1.682 + Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, Tolerance); + + // Stix file + var file1 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\Bishop\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_1_s).stix"); + Assert.IsTrue(File.Exists(file1)); + var file2 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\Bishop\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_2_s).stix"); + Assert.IsTrue(File.Exists(file2)); + var file3 = Path.Combine(Path.GetFullPath(calcDir), "Stability\\Bishop\\Loc(6-4-1-A-1-F)_Sce(1)_Pro(6-4-1-A-1-F_3_s).stix"); + Assert.IsTrue(File.Exists(file3)); } [Test, Category("Slow")] @@ -938,11 +945,12 @@ private string ChangeInputModel(string input, InputStabilityModelType modelType) { - string pattern = "StabilityModelType=\"Bishop\""; + string pattern = "StabilityModelType=\"[a-zA-Z]+\""; string replacement = pattern; switch (modelType) { case InputStabilityModelType.Bishop: + replacement = "StabilityModelType=\"Bishop\""; break; case InputStabilityModelType.UpliftVan: replacement = "StabilityModelType=\"UpliftVan\"";