Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r2620 -r2644
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2620)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2644)
@@ -36,6 +36,23 @@
     [TestFixture]
     public class DataPluginImporterTests
     {
+        private string tmpTestFolder;
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+            tmpTestFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpDataPluginImporterTests");
+            if (!Directory.Exists(tmpTestFolder))
+                Directory.CreateDirectory(tmpTestFolder);
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+            if (Directory.Exists(tmpTestFolder))
+                Directory.Delete(tmpTestFolder, true);
+        }
+
         const string directoryWithCsvFiles = @"..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\";
 
         //Project Invoer1 uses both a locations.csv and a cross section shapefile
@@ -504,7 +521,7 @@
         public void ImportRiverLevelFromLocationsTest()
         {
             // Setup folder for situation where RiverLevel is specified in locations
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesRiverLevelFromLocations");
+            var importFolder = Path.Combine(tmpTestFolder, "TmpImportFilesRiverLevelFromLocations");
             if (!Directory.Exists(importFolder))
                 Directory.CreateDirectory(importFolder);
             srcDataSources = new List<DataSource>
@@ -550,7 +567,7 @@
         public void ImportRiverLevelFromScenariosTest()
         {
             // Setup folder for situation where RiverLevel is specified in locations and scenarios
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesRiverLevelFromScenarios");
+            var importFolder = Path.Combine(tmpTestFolder, "TmpImportFilesRiverLevelFromScenarios");
             if (!Directory.Exists(importFolder))
                 Directory.CreateDirectory(importFolder);
             srcDataSources = new List<DataSource>
@@ -596,7 +613,7 @@
         public void ImportRiverLevelNotSpecifiedTest()
         {
             // Setup folder for situation where RiverLevel is NOT specified in locations and scenarios
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesRiverLevelNotSpecified");
+            var importFolder = Path.Combine(tmpTestFolder, "TmpImportFilesRiverLevelNotSpecified");
             if (!Directory.Exists(importFolder))
                 Directory.CreateDirectory(importFolder);
             srcDataSources = new List<DataSource>
@@ -646,7 +663,7 @@
         public void ImportHemPolderScenarioDefaultsTest()
         {
             // Copy import data to test folder
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderScenarioDefaultsTest");
+            var importFolder = Path.Combine(tmpTestFolder, "ImportHemPolderScenarioDefaultsTest");
             if (Directory.Exists(importFolder))
             {
                 Directory.Delete(importFolder, true);
@@ -724,7 +741,7 @@
         public void ImportHemPolderScenarioFromLocationsCsvTest()
         {
             // Copy import data to test folder
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderScenarioFromLocationsCsvTest");
+            var importFolder = Path.Combine(tmpTestFolder, "ImportHemPolderScenarioFromLocationsCsvTest");
             if (Directory.Exists(importFolder))
             {
                 Directory.Delete(importFolder, true);
@@ -802,7 +819,7 @@
         public void ImportHemPolderLineShapeOverLocationsCsvTest()
         {
             // Copy import data to test folder
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderLineShapeOverLocationsCsvTest");
+            var importFolder = Path.Combine(tmpTestFolder, "ImportHemPolderLineShapeOverLocationsCsvTest");
             if (Directory.Exists(importFolder))
             {
                 Directory.Delete(importFolder, true);
@@ -887,7 +904,7 @@
         public void ImportHemPolderAreaShapeOverLocationsCsvTest()
         {
             // Copy import data to test folder
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderAreaShapeOverLocationsCsvTest");
+            var importFolder = Path.Combine(tmpTestFolder, "ImportHemPolderAreaShapeOverLocationsCsvTest");
             if (Directory.Exists(importFolder))
             {
                 Directory.Delete(importFolder, true);
@@ -972,7 +989,7 @@
         public void ImportHemPolderScenarioOverShapeAndLocationsCsvTest()
         {
             // Copy import data to test folder
-            var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderScenarioOverShapeAndLocationsCsvTest");
+            var importFolder = Path.Combine(tmpTestFolder, "ImportHemPolderScenarioOverShapeAndLocationsCsvTest");
             if (Directory.Exists(importFolder))
             {
                 Directory.Delete(importFolder, true);