Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r6716 -r6738
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6716)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6738)
@@ -106,7 +106,9 @@
     }
 
     [Test]
-    public void TestRunMacroStabilityTutorialDesignUpliftVan_NoUplift()
+    [TestCase(true)]
+    [TestCase(false)]
+    public void TestRunMacroStabilityTutorialDesignUpliftVan_NoUplift(bool isUpliftVanRunOnlyWhenUpliftOccurs)
     {
         // Based on DAM UI tutorial for stability, for location DWP_18
         const string calcDir = "TestStabInwardsUpliftVan_NoUplift";
@@ -120,22 +122,24 @@
         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
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "IsUpliftVanRunOnlyWhenUpliftOccurs", isUpliftVanRunOnlyWhenUpliftOccurs.ToString().ToLower());
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
         Assert.Multiple(() =>
         {
             Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(1));
-            Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1));
+            Assert.That(output.Results.CalculationMessages, isUpliftVanRunOnlyWhenUpliftOccurs ? Has.Length.EqualTo(1) : Has.Length.EqualTo(0));
         });
+
         DesignResult result = output.Results.CalculationResults[0];
         Assert.Multiple(() =>
         {
-            Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False);
-            // ResultMessage "No uplift"
-            Assert.That(result.StabilityDesignResults.ResultMessage, Is.EqualTo("No uplift"));
+            Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, isUpliftVanRunOnlyWhenUpliftOccurs ? Is.False : Is.True);
+            Assert.That(result.StabilityDesignResults.SafetyFactor, 
+                        isUpliftVanRunOnlyWhenUpliftOccurs ? Is.EqualTo(0.0).Within(tolerance) : Is.EqualTo(1.341).Within(tolerance));
+            Assert.That(result.StabilityDesignResults.ResultMessage, isUpliftVanRunOnlyWhenUpliftOccurs ? Is.EqualTo("No uplift") : Is.EqualTo(""));
             // Check that a line is specified
             Assert.That(result.StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null);
             // Profile name = DWP_18.stix
@@ -149,7 +153,8 @@
         {
             Assert.That(upliftSituation.IsUplift, Is.EqualTo(false));
             // Calculation Result
-            Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.NoRun));
+            Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), 
+                        isUpliftVanRunOnlyWhenUpliftOccurs ? Is.EqualTo(CalculationResult.NoRun) : Is.EqualTo(CalculationResult.Succeeded));
         });
     }
 
@@ -283,7 +288,9 @@
     }
 
     [Test]
-    public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift()
+    [TestCase(true)]
+    [TestCase(false)]
+    public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift(bool isUpliftVanRunOnlyWhenUpliftOccurs)
     {
         // Based on DAM UI tutorial for stability, for location DWP_18
         const string calcDir = "TestStabInwardsBishopUpliftVan_NoUplift";
@@ -299,6 +306,7 @@
         inputString = XmlAdapter.ChangeStabilityInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "IsUpliftVanRunOnlyWhenUpliftOccurs", isUpliftVanRunOnlyWhenUpliftOccurs.ToString().ToLower());
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
         Assert.Multiple(() =>
@@ -321,8 +329,10 @@
         result = output.Results.CalculationResults[1].StabilityDesignResults;
         Assert.Multiple(() =>
         {
-            Assert.That(result.SafetyFactorSpecified, Is.False);
-            Assert.That(result.ResultMessage, Is.EqualTo("No uplift"));
+            Assert.That(result.SafetyFactorSpecified, isUpliftVanRunOnlyWhenUpliftOccurs ? Is.False : Is.True);
+            Assert.That(result.SafetyFactor, 
+                        isUpliftVanRunOnlyWhenUpliftOccurs ? Is.EqualTo(0.0).Within(tolerance) : Is.EqualTo(1.341).Within(tolerance));
+            Assert.That(result.ResultMessage, isUpliftVanRunOnlyWhenUpliftOccurs ? Is.EqualTo("No uplift") : Is.EqualTo(""));
             Assert.That(result.UpliftSituation.IsUplift, Is.False);
             Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
         });
@@ -331,7 +341,8 @@
         Assert.Multiple(() =>
         {
             Assert.That(result.SafetyFactorSpecified, Is.True);
-            Assert.That(result.SafetyFactor, Is.EqualTo(1.357).Within(tolerance));
+            Assert.That(result.SafetyFactor, 
+                        isUpliftVanRunOnlyWhenUpliftOccurs ? Is.EqualTo(1.357).Within(tolerance) : Is.EqualTo(1.341).Within(tolerance));
             Assert.That(result.ResultMessage, Is.EqualTo(""));
             Assert.That(result.UpliftSituation.IsUplift, Is.False);
             Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
@@ -340,7 +351,8 @@
         {
             // Calculation Result
             Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
-            Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), Is.EqualTo(CalculationResult.NoRun));
+            Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult), 
+                        isUpliftVanRunOnlyWhenUpliftOccurs ? Is.EqualTo(CalculationResult.NoRun) : Is.EqualTo(CalculationResult.Succeeded));
             Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
         });
     }