Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r4446 -r4462
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4446)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4462)
@@ -71,7 +71,7 @@
     /// <summary>Test for different segmentFailureMechanismType</summary>
     /// <param name="segmentFailureMechanismType">The soilprobabilities are set tot the specified segmentFailureMechanismType</param>
     [Test, Category("Slow")]
-    [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
+    [Ignore("Test disabled due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation")]
     [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)]
     [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)]
     public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType)
@@ -135,7 +135,7 @@
     }
 
     [Test, Category("Slow")]
-    [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
+    [Ignore("Test disabled due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation")]
     public void TestRunMacroStabilityTutorialDesignUpliftVan()
     {
         // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -191,7 +191,7 @@
     }
 
     [Test, Category("Slow")]
-    [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
+    [Ignore("Test disabled due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation")]
     public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest()
     {
         // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -591,136 +591,8 @@
         Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
         Assert.AreEqual(18, output.Results.CalculationResults.Length);
         Assert.AreEqual(3020, output.Results.CalculationMessages.Length);
-        int resultsFound = 0;
-        foreach (var designResult in output.Results.CalculationResults)
-        {
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
-            {
-                Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
-            {
-                Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
-            {
-                Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
-            {
-                Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
-            {
-                Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
-            {
-                Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
-            {
-                Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
-            {
-                Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
-            {
-                Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
-            {
-                Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
-            {
-                Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
-            {
-                Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
-            {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
-            {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)"))
-            {
-                Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)"))
-            {
-                Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
-            {
-                Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
-            {
-                Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-        }
+        int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(
+            output.Results.CalculationResults);
         Assert.AreEqual(18, resultsFound);
     }