make the test tidy up after itself to reduce CVS conflicts.

diff --git a/ajde/testdata/DuplicateManifestTest/build.ajsym b/ajde/testdata/DuplicateManifestTest/build.ajsym
deleted file mode 100644 (file)
index 391411c..0000000
Binary files a/ajde/testdata/DuplicateManifestTest/build.ajsym and /dev/null differ

diff --git a/ajde/testdata/DuplicateManifestTest/outjar.jar b/ajde/testdata/DuplicateManifestTest/outjar.jar
deleted file mode 100644 (file)
index 802c842..0000000
Binary files a/ajde/testdata/DuplicateManifestTest/outjar.jar and /dev/null differ

diff --git a/ajde/testdata/WeaveInfoMessagesTest/Empty.ajsym b/ajde/testdata/WeaveInfoMessagesTest/Empty.ajsym
deleted file mode 100644 (file)
index cb065e7..0000000
Binary files a/ajde/testdata/WeaveInfoMessagesTest/Empty.ajsym and /dev/null differ

diff --git a/ajde/testsrc/org/aspectj/ajde/DuplicateManifestTest.java b/ajde/testsrc/org/aspectj/ajde/DuplicateManifestTest.java
index 38c82bb42443fe3204c8b944e4f7ac74784a1add..4329d80d282770444d73cffddc6185a2608476e7 100644 (file)
--- a/ajde/testsrc/org/aspectj/ajde/DuplicateManifestTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/DuplicateManifestTest.java
@@ -48,6 +48,9 @@ public class DuplicateManifestTest extends AjdeTestCase {
                        "Build warnings",
                        ideManager.getCompilationSourceLineTasks().isEmpty());
                compareManifests(openFile(injarName),openFile(outjarName));
+               outjar.delete(); // Tidy up !
+               File rogueSymFile = new File(currTestDataPath + File.separatorChar + "build.ajsym");
+               if (rogueSymFile.exists()) rogueSymFile.delete();
        }
        
        private void compareManifests (File inFile, File outFile) {

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