Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Invoer10.xml
===================================================================
diff -u -r4000 -r5340
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Invoer10.xml (.../Invoer10.xml) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Invoer10.xml (.../Invoer10.xml) (revision 5340)
@@ -1,936 +1,433 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5338 -r5340
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5338)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5340)
@@ -396,19 +396,15 @@
});
}
- [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")]
- [Category(Categories.WorkInProgress)]
+ [Test]
+ [Category(Categories.Slow)]
public void TestRunMacroStabilityInvoer10ForbiddenZoneBishop()
{
- // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\Invoer10\ZoneType.damx
- // with Dam Classic rev.1059
- // Select locations DWP_10_2 and DWP_10_6
+ // xml file is created with Invoer10\ZoneType.defx
+ // Select locations DWP_10_1 and DWP_10_5
// Analysis type "No adaption"
// Calculation options: Stability Inside - Bishop
- // This tests two locations with same profile
- // But first location with Zone Areas and second location with Forbidden Zone
-
- // Note: this test might be activated again in the future as Forbidden zone seems to be supported by the new kernel. But then all new reference values are needed.
+ // This tests the first location with No Zones and the second with Forbidden Zone
const string calcDir = "TestStabInwardsForbiddenZoneBishop";
if (Directory.Exists(calcDir))
{
@@ -428,17 +424,17 @@
Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(2));
DesignResult result = output.Results.CalculationResults[0];
- // SafetyFactor=1.972 (Zone Areas)
- Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.972).Within(tolerance));
- Assert.That(result.LocationName, Is.EqualTo("DWP_10_2"));
- Assert.That(result.ProfileName, Is.EqualTo("DWP_10.sti"));
+ // No Zone
+ Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.212).Within(tolerance));
+ Assert.That(result.LocationName, Is.EqualTo("DWP_10_1"));
+ Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix"));
Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
result = output.Results.CalculationResults[1];
- // SafetyFactor=2.034 (Forbidden Zone)
- Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.034).Within(tolerance));
- Assert.That(result.LocationName, Is.EqualTo("DWP_10_6"));
- Assert.That(result.ProfileName, Is.EqualTo("DWP_10.sti"));
+ // Forbidden Zone, factor = 0.5
+ Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.225).Within(tolerance));
+ Assert.That(result.LocationName, Is.EqualTo("DWP_10_5"));
+ Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix"));
Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
}