Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r4234 -r4474
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 4234)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 4474)
@@ -67,18 +67,15 @@
         const string fileName = @"PipingVoorbeeld1_BlighInputFile.xml";
         string inputString = File.ReadAllText(fileName);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
-        var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        string outputString = engineInterface.Run();
         // Factor piping = 0.521
         // Kritische hoogte = 1.667
         // Factor opdrijven = 0.5825
-        //   Kwelweglengte piping = 25.0
-        //   Intredepunt x-lokaal = 10.0
+        // Kwelweglengte piping = 25.0
+        // Intredepunt x-lokaal = 10.0
         // Uittredepunt x-lokaal = 35.0
         // Opdrijven = true
         // Profielnaam = soilprofile_01
-        //   PL3 opdrijven = 0.582
+        // PL3 opdrijven = 0.582
         // PL3 stijghoogte aangepast = 1.262
         // PL3 locatie opdrijven lokaal = 35.0
         // PL4 opdrijven = 0.0
@@ -87,9 +84,8 @@
         // Locatie naam = "profiel 1"
         // ID locatie scenario = "1"
         // Heave Factor = 90.0
-        Assert.IsNotNull(outputString);
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-        Assert.IsNotNull(output.Results.CalculationResults, "No results available");
+        Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        
         DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
         SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
         Assert.AreEqual(0.521, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance);
@@ -121,11 +117,9 @@
         // Select all locations
         const string fileName = @"Rechter Diezedijk_BlighInputFile.xml";
         string inputString = File.ReadAllText(fileName);
-        var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        string outputString = engineInterface.Run();
-        Assert.IsNotNull(outputString);
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+        
+        Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        
         Assert.AreEqual(112, output.Results.CalculationResults.Length);
         Assert.AreEqual(0.782, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance);
         Assert.AreEqual(0.809, output.Results.CalculationResults[111].PipingDesignResults.BlighFactor, tolerance);
@@ -139,11 +133,9 @@
         // Set Analysis type to "Adapt geometry"
         const string fileName = @"PipingVoorbeeld1_BlighDesignInputFile.xml";
         string inputString = File.ReadAllText(fileName);
-        var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        string outputString = engineInterface.Run();
-        Assert.IsNotNull(outputString);
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+        
+        Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        
         DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
         SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
         Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
@@ -182,11 +174,9 @@
         // Select second location (101)
         const string fileName = @"Rechter Diezedijk_BlighDesignInputFile_1Location.xml";
         string inputString = File.ReadAllText(fileName);
-        var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        string outputString = engineInterface.Run();
-        Assert.IsNotNull(outputString);
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+        
+        Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        
         var locationIndex = 0;
         Assert.AreEqual(1.313, output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, tolerance);
         Assert.AreEqual(1.295, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance);
@@ -205,10 +195,9 @@
         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
         const string fileName = @"Rechter Diezedijk_BlighFailedDesignInputFile_1Location.xml";
         string inputString = File.ReadAllText(fileName);
-        var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        string outputString = engineInterface.Run();
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+        
+        Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        
         Assert.AreEqual(2, output.Results.CalculationResults.Length);
         Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.", output.Results.CalculationResults[1].PipingDesignResults.ResultMessage);
         Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult));
@@ -229,11 +218,9 @@
         // Select first 5 locations (100, 101, 102, 103 and 104)
         const string fileName = @"Rechter Diezedijk_BlighDesignInputFile.xml";
         string inputString = File.ReadAllText(fileName);
-        var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        string outputString = engineInterface.Run();
-        Assert.IsNotNull(outputString);
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+        
+        Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        
         var locationIndex = 0;
         Assert.AreEqual(1.516, output.Results.CalculationResults[locationIndex + 0].PipingDesignResults.BlighFactor, tolerance);
         Assert.AreEqual(1.497, output.Results.CalculationResults[locationIndex + 1].PipingDesignResults.BlighFactor, tolerance);
@@ -261,14 +248,10 @@
         const string fileName = @"PipingBlighWithoutUplift.xml";
         string inputString = File.ReadAllText(fileName);
         var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        engineInterface.DamProjectData.MaxCalculationCores = maxCores;
-        string result = engineInterface.Validate();
-        Assert.IsTrue(result == null, "Validation must succeed but does not, see output xml in debugger");
-        string outputString = engineInterface.Run();
         string outputName = "Output" + maxCores + ".xml";
-        File.WriteAllText(outputName, outputString);
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+        
+        Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName);
+        
         int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
         Assert.AreEqual(0, errorCount, "There should be no errors during the calculation.");
         Assert.AreNotEqual(null, output.Results.CalculationResults);