remove temporary data after JUnit tests are done

5 files changed, 29 insertions, 0 deletions

diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
index 55aa0d2dd42..29646c57b9d 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
@@ -8,6 +8,7 @@
  * Contributors:
  *    Markus Schorn - initial API and implementation
  *    Andrew Ferguson (Symbian)
+ *    IBM Corporation
  *******************************************************************************/ 
 
 package org.eclipse.cdt.internal.index.tests;
@@ -88,6 +89,7 @@ public class IndexBugsTests extends BaseTestCase {
 		if (fCProject != null) {
 			CProjectHelper.delete(fCProject);
 		}
+		deleteTestDataDir();
 		super.tearDown();
 	}
 	
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java
index 697a753927a..aea9d3592fc 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Andrew Ferguson (Symbian) - Initial implementation
+ * IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.internal.index.tests;
 
@@ -69,6 +70,7 @@ public class IndexLocationTest extends BaseTestCase {
 				ptd.getProject().delete(IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT, new NullProgressMonitor());
 			}			
 		}
+		deleteTestDataDir();
 		super.tearDown();
 	}
 
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java
index dd56b76b1d9..868b19f1669 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Andrew Ferguson (Symbian) - Initial implementation
+ * IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.internal.index.tests;
 
@@ -96,6 +97,7 @@ public class IndexProviderManagerTest extends IndexTestBase {
 	protected void tearDown() throws Exception {
 		IndexProviderManager ipm= ((PDOMManager)CCorePlugin.getIndexManager()).getIndexProviderManager();
 		ipm.reset(); ipm.startup();
+		deleteTestDataDir();
 	}
 	
 	public void testProvider_SimpleLifeCycle_200958() throws Exception {
diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java
index 901d6b0a349..67185f03c6c 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java
@@ -8,10 +8,12 @@
  * Contributors:
  *    Markus Schorn - initial API and implementation
  *    Andrew Ferguson (Symbian)
+ *    IBM Corporation
  *******************************************************************************/ 
 
 package org.eclipse.cdt.core.testplugin.util;
 
+import java.io.File;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -209,6 +211,25 @@ public class BaseTestCase extends TestCase {
     	fExpectedLoggedNonOK= count;
     }
     
+    public void deleteTestDataDir () {
+    	deleteDir(new File(System.getProperty("java.io.tmpdir") + File.separator + "__testData").getCanonicalFile());
+    }
+    
+    /**
+     * Recursively delete a directory
+     * @param dir
+     */
+    public void deleteDir(File dir) {
+		if (dir.isDirectory()) {
+			File[] children = dir.listFiles();
+			for (int i = 0; i < children.length; i ++) {
+				deleteDir(children[i]);
+			}
+		}
+		
+		dir.delete();
+	}
+    
     /**
      * Some test steps need synchronizing against a CModel event. This class
      * is a very basic means of doing that.
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java
index f4d6c01a135..a88633c8d78 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java
@@ -8,6 +8,7 @@
  * Contributors:
  *    Andrew Ferguson (Symbian) - Initial implementation
  *    Markus Schorn (Wind River Systems)
+ *    IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.search;
 
@@ -76,6 +77,7 @@ public class BasicSearchTest extends BaseUITestCase {
 		if(fCProject != null) {
 			fCProject.getProject().delete(true, NPM);
 		}
+		deleteTestDataDir();
 		super.tearDown();
 	}