Fisheye: Tag 5344 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ErrorInDGeoStabilityCalculation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5342 -r5344
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5342)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5344)
@@ -444,125 +444,8 @@
         });
     }
 
-    [Test, Category(Categories.Slow)]
-    public void TestRunMacroStabilityWithErrorUpliftVan()
-    {
-        // Expected results are determined by running .\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
-        // with Dam Classic rev.1059
-        // Select 5th and 6th location (6-4-3-A-1-C and 6-4-3-A-1-D)
-        // This project has 2 locations with each 2 profiles
-        // In one the combinations location-profile (1st location, 2nd profile) DGeoStability stops during the calculation.
-        // Then the kernel tries to read the safety factor, but fails because the dumpfile is not complete.
-        // In Release+Classic this returned a result Unexpected Error but the calculation continued with the next combination.
-        const string calcDir = "TestStabInwardsWithErrorUpliftVan";
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
-
-        Directory.CreateDirectory(calcDir);
-
-        const string fileName = @"TestFiles\ErrorInDGeoStabilityCalculation.xml";
-        string inputString = File.ReadAllText(fileName);
-        inputString = ChangeInputModel(inputString, InputStabilityModelType.UpliftVan);
-        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);
-
-        Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(4));
-        DesignResult result = output.Results.CalculationResults[0];
-        Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C"));
-        Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_1_s"));
-        // Calculation Result
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
-        // SafetyFactor=1.814
-        Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.816).Within(tolerance));
-
-        result = output.Results.CalculationResults[1];
-        Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C"));
-        Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s"));
-        // Calculation Result
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.RunFailed));
-        // SafetyFactor not specified
-        Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False);
-
-        result = output.Results.CalculationResults[2];
-        Assert.That(result.LocationName, Is.EqualTo("6-4-3-B-1-D"));
-        Assert.That(result.ProfileName, Is.EqualTo("6-4-3-B-1-D_1_s"));
-        // Calculation Result
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
-        // SafetyFactor=2.099
-        Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.087).Within(tolerance));
-
-        result = output.Results.CalculationResults[3];
-        Assert.That(result.LocationName, Is.EqualTo("6-4-3-B-1-D"));
-        Assert.That(result.ProfileName, Is.EqualTo("6-4-3-B-1-D_2_s"));
-        // Calculation Result
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
-        // SafetyFactor=2.300
-        Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.300).Within(tolerance));
-    }
-
     [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")]
     [Category(Categories.WorkInProgress)]
-    public void TestRunMacroStabilityWithErrorBishopUpliftVan()
-    {
-        // Expected results are determined by running .\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
-        // with Dam Classic rev.1059
-        // Select 5th and 6th location (6-4-3-A-1-C and 6-4-3-A-1-D)
-        // This project has 2 locations with each 2 profiles
-        // In one the combinations location-profile (1st location, 2nd profile) DGeoStability stops during the calculation.
-        // Then the kernel tries to read the safety factor, but fails because the dumpfile is not complete.
-        // In Release+Classic this returned a result Unexpected Error but the calculation continued with the next combination.
-        const string calcDir = "TestStabInwardsWithErrorBishopUpliftVan";
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
-
-        Directory.CreateDirectory(calcDir);
-
-        const string fileName = @"TestFiles\ErrorInDGeoStabilityCalculation.xml";
-        string inputString = File.ReadAllText(fileName);
-        inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
-        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);
-
-        int expectedCount = output.Results.CalculationResults.Length;
-        Assert.That(expectedCount, Is.EqualTo(12), "12 results expected but only " + expectedCount);
-        DesignResult result = output.Results.CalculationResults[3];
-        Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C"));
-        Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s"));
-        // Bishop
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
-        // SafetyFactor=2.219
-        Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.219).Within(tolerance));
-        Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop));
-
-        result = output.Results.CalculationResults[4];
-        Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C"));
-        Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s"));
-        // Uplift Van
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError));
-        // SafetyFactor not specified
-        Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False);
-        Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
-
-        result = output.Results.CalculationResults[5];
-        Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C"));
-        Assert.That(result.ProfileName, Is.EqualTo("6-4-3-A-1-C_2_s"));
-        // Bishop/Uplift Van
-        Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError));
-        // SafetyFactor not specified
-        Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False);
-        Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
-    }
-
-    [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")]
-    [Category(Categories.WorkInProgress)]
     public void TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption()
     {
         // Inputfile was created with .\data\DamEngineTestProjects\Invoer2\DAM Tutorial Design\DAM Tutorial Design.damx
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5338 -r5344
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 5338)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 5344)
@@ -38,9 +38,6 @@
         <None Update="TestFiles\DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestFiles\ErrorInDGeoStabilityCalculation.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Update="TestFiles\GrebbedijkStability.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>