Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs =================================================================== diff -u -r4124 -r4129 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 4124) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 4129) @@ -26,34 +26,28 @@ using Deltares.Dam.Application.Live; using Deltares.Dam.Data; using Deltares.DamLive.TestHelper; -using Deltares.Standard.IO; using NUnit.Framework; namespace Deltares.DamLive.Tests; public class PipingWtiInsideTest { const string projectIntegrationFilename = @"DAMLive.damx"; - const string input1aFilename = @"live.InputTimeSeriesMHW.xml"; - const string output1aFilename = @"live.OutputTimeSeriesMHW.xml"; + const string input1AFilename = @"live.InputTimeSeriesMHW.xml"; + const string output1AFilename = @"live.OutputTimeSeriesMHW.xml"; const string calculationParametersIntegrationFilename = @"live.ParametersFile.xml"; const string testWorkingFolder = @".\damLivePipingWtiWork"; private const string testIntegrationDataFolder = @"..\..\..\data\IntegerationTests\PipingWti"; private List locations; - - private string inputFile; - private string outputFile; - private string projectFile; - private string parameterFile; - + private DamEngineRunner runner; [SetUp] public void SetupFixture() { - IoHelper.RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests - Directory.CreateDirectory(testWorkingFolder); + IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 1); // to be sure no test directory exist from previous tests + IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + 20); } [TearDown] @@ -79,8 +73,8 @@ public void CalculatePipingInsideWt1ModelUsingTestFilesHasExpectedResultsInOutputFile(int maxCores) { const double cTolerance = 0.0005; - GeneralHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1aFilename, - output1aFilename, calculationParametersIntegrationFilename, + GeneralHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1AFilename, + output1AFilename, calculationParametersIntegrationFilename, projectIntegrationFilename, out runner, out locations); //SetupPipingProject(maxCores); runner.Initialize();