Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs
===================================================================
diff -u -r4121 -r4124
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4121)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4124)
@@ -26,24 +26,21 @@
 using Deltares.Dam.Application.Live;
 using Deltares.Dam.Data;
 using Deltares.DamLive.TestHelper;
-using Deltares.Standard.IO;
 using NUnit.Framework;
 
 namespace Deltares.DamLive.Tests;
 
-
 [TestFixture]
 [Category("Integration")]
-
 public class StabilityInsideBishopGridTest
 {
-    const string projectStabilityFilename = @"DAMLive.damx";
+    const string projectIntegrationFilename = @"DAMLive.damx";
     const string input1aFilename = @"live.InputTimeSeriesMHW.xml";
     const string output1aFilename = @"live.OutputTimeSeriesMHW.xml";
-    const string calculationParametersStabilityFilename = @"live.ParametersFile.xml";
+    const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml";
 
     const string testWorkingFolder = @".\damLiveBishopGridWork";
-    private const string testStablityDataFolder = @"..\..\..\data\IntegerationTests\StabilityInsideBishopGrid";
+    private const string testIntegrationDataFolder = @"..\..\..\data\IntegerationTests\StabilityInsideBishopGrid";
     private List<Location> locations;
 
     private string inputFile;
@@ -52,7 +49,7 @@
     private string parameterFile;
 
     private DamEngineRunner runner;
-    
+
     [SetUp]
     public void SetupFixture()
     {
@@ -69,21 +66,24 @@
     [TearDown]
     public void TearDownTest()
     {
-        AssertNoErrors();
+        GeneralHelper.AssertNoErrors(runner);
     }
 
     [SetUp]
     public void SetupTest() {}
-    
-    [Test] //, Ignore("")]
+
+    [Test]
     [Category("Integration")]
     [Category("Work_In_Progress")]
     [TestCase(1)]
     [TestCase(20)]
     public void CalculateStabilityInsideBishopGridUsingTestFilesHasExpectedResultsInOutputFile(int maxCores)
     {
         const double cTolerance = 0.0005;
-        SetupStabilityProject(maxCores);
+        GeneralHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1aFilename, 
+                                              output1aFilename, calculationParametersIntegrationFilename, 
+                                              projectIntegrationFilename, out runner, out locations);
+        //SetupStabilityProject(maxCores);
         runner.Initialize();
         runner.MaxCalculationCores = maxCores;
         Assert.IsNotNull(runner);
@@ -95,7 +95,7 @@
         runner.Run();
         //runner.WriteResultsToFile(outputFile);
 
-        AssertNoErrors();
+        GeneralHelper.AssertNoErrors(runner);
 
         // Assertions
 
@@ -128,64 +128,24 @@
                     }
                     else
                     {
-                        //Assert.AreEqual(1.493, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                        Assert.AreEqual(1.493, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     }
                 }
+
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
                     // Following value was 0.590 in the previous DamLive version, but that has to do with how the 
                     // reference level Su is handled in D-GeoStability 18.1 and D-GeoStability 15.1
                     Assert.AreEqual(1.317, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                 }
-                
-                
             }
 
             seriesCount++;
         }
 
         Assert.IsTrue(seriesCount > 0, "No output time series");
-        
     }
-    
-    private void SetupStabilityProject(int maxCores)
-    {
-        string actualTestPath = Path.GetFullPath(testWorkingFolder + maxCores.ToString());
 
-        Directory.CreateDirectory(actualTestPath);
-
-        DirectoryHelper.CopyRecursive(actualTestPath, testStablityDataFolder);
-
-        inputFile = Path.Combine(actualTestPath, input1aFilename);
-        outputFile = Path.Combine(actualTestPath, output1aFilename);
-        parameterFile = Path.Combine(actualTestPath, calculationParametersStabilityFilename);
-        projectFile = Path.Combine(actualTestPath, projectStabilityFilename);
-        DamProject.SetTestProgramVersion("23.1");
-        DamProjectData damData = DamProject.LoadData(projectFile);
-        locations = damData.Locations;
-
-        // Load the sensor time serie data (see input file for details)
-        TimeSerieCollection inputTimeSeries = TimeSerieCollection.LoadFromFile(inputFile);
-        //ShortenTimeSeries(inputTimeSeries);
-        inputTimeSeries.Save(Path.ChangeExtension(inputFile, "short.xml"));
-
-        runner = new DamEngineRunner
-        {
-            DamXFile = new FileInfo(projectFile),
-            ParametersFile = new FileInfo(parameterFile),
-            FewsInputFile = new FileInfo(inputFile),
-            FewsOutputFile = new FileInfo(outputFile),
-            Filter = "",
-            InputTimeSeriesCollection = inputTimeSeries
-        };
-    }
     
-    private void AssertNoErrors()
-    {
-        if (runner.HasErrors)
-        {
-            Assert.Fail("The test failed. See the error log in the test output console for more info");
-        }
-    }
 }
\ No newline at end of file