patch from helen to ensure the tests tidy up after themselves.

diff --git a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java
index 30465bda27f18f84ec217b9ac2ab74d619d94a98..258ff96dc056fce13f2d3d036ef2a56be2b28a41 100644 (file)
--- a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java
+++ b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java
@@ -93,6 +93,7 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase {
        protected void tearDown() throws Exception {
                super.tearDown();
                FileUtil.deleteContents(openFile(binDir));
+               openFile(binDir).delete();
                File rogueSymFile = new File(currTestDataPath + File.separatorChar + "Empty.ajsym");
                if (rogueSymFile.exists()) rogueSymFile.delete();
        }

diff --git a/ajde/testsrc/org/aspectj/ajde/SymbolFileGenerationTest.java b/ajde/testsrc/org/aspectj/ajde/SymbolFileGenerationTest.java
index 100ed2f66265e3911d2aebb3b7678e992d0d1cbb..f4b8c5814bdab5a6eb21fea6e7c7d0d182cda895 100644 (file)
--- a/ajde/testsrc/org/aspectj/ajde/SymbolFileGenerationTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/SymbolFileGenerationTest.java
@@ -14,8 +14,10 @@
 package org.aspectj.ajde;
 
 import java.io.File;
+import java.io.FileFilter;
 
 import org.aspectj.tools.ajc.AjcTestCase;
+import org.aspectj.util.FileUtil;
 
 /**
  * @author Mik Kersten
@@ -24,15 +26,35 @@ public class SymbolFileGenerationTest extends AjcTestCase {
        private static final String DIR = "../ajde/testdata/examples/coverage";
 
        protected File dir = new File(DIR);
-       protected File configFile = new File(DIR + "/coverage.lst");
-       protected File esymFile = new File(DIR + "/ModelCoverage.ajesym");
-       protected File outDir = new File(DIR + "/bin"); 
-       protected File crossRefsFile = new File(outDir.getAbsolutePath() + "/build.ajsym");
+       protected File configFile = new File(DIR + "/coverage.lst");    
+       protected File esymFile, outDir, crossRefsFile;
        
        protected void setUp() throws Exception {
                super.setUp();
+               esymFile = new File(DIR + "/ModelCoverage.ajesym");
+               outDir = new File(DIR + "/bin");        
+               crossRefsFile = new File(outDir.getAbsolutePath() + "/build.ajsym");
        }
        
+       protected void tearDown() throws Exception {
+               super.tearDown();
+                               
+               FileUtil.deleteContents(new File(DIR),ajesymResourceFileFilter);
+               FileUtil.deleteContents(new File(DIR + "/pkg"),ajesymResourceFileFilter);
+               
+               FileUtil.deleteContents(new File(DIR + "/bin"));
+               (new File(DIR + "/bin")).delete();
+
+       }
+       
+       public FileFilter ajesymResourceFileFilter =
+               new FileFilter() {
+               public boolean accept(File pathname) {
+                       String name = pathname.getName().toLowerCase();
+                       return name.endsWith(".ajesym");
+               }
+       };
+               
        public void testCrossRefsFileGeneration() {
                if (crossRefsFile.exists()) assertTrue(crossRefsFile.delete());
                if (esymFile.exists()) assertTrue(esymFile.delete());