Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs =================================================================== diff -u -r4124 -r4129 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 4124) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 4129) @@ -35,26 +35,22 @@ public class StabilityInsideBishopGridTest { 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 = @".\damLiveBishopGridWork"; private const string testIntegrationDataFolder = @"..\..\..\data\IntegerationTests\StabilityInsideBishopGrid"; 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); + //Directory.CreateDirectory(testWorkingFolder); } [TearDown] @@ -80,8 +76,8 @@ public void CalculateStabilityInsideBishopGridUsingTestFilesHasExpectedResultsInOutputFile(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); //SetupStabilityProject(maxCores); runner.Initialize(); @@ -91,6 +87,7 @@ Assert.IsNotNull(runner.CalculationParameters); Assert.IsNotNull(runner.CalculationParameters.CalculationModules); Assert.IsNotNull(runner.CalculationParameters.MStabParameters); + runner.StabilityWorkingPath = "D:\test"; runner.Run(); //runner.WriteResultsToFile(outputFile);