Clean-up ensuring no resources modified as a result of test runs.

diff --git a/ajdoc/.cvsignore b/ajdoc/.cvsignore
new file mode 100644 (file)
index 0000000..c76dd53
--- /dev/null
+++ b/ajdoc/.cvsignore
@@ -0,0 +1 @@
+ajdocworkingdir 

diff --git a/ajdoc/testdata/spacewar/.cvsignore b/ajdoc/testdata/spacewar/.cvsignore
index 693869726de4b8cdc70b4c6f4f2341dab23b514a..e9f81f44bae3d01ea5a9ff9fa6215d72eed03749 100644 (file)
--- a/ajdoc/testdata/spacewar/.cvsignore
+++ b/ajdoc/testdata/spacewar/.cvsignore
@@ -1,2 +1 @@
-bin
-doc
+docdir

diff --git a/ajdoc/testsrc/AjdocModuleTests.java b/ajdoc/testsrc/AjdocModuleTests.java
index 8aabdfed53623d96fa7b1dd2c21083b7f7d96c3b..a840b35a6879de3cfcf0c7df22b2633e21ac1de1 100644 (file)
--- a/ajdoc/testsrc/AjdocModuleTests.java
+++ b/ajdoc/testsrc/AjdocModuleTests.java
@@ -11,6 +11,7 @@
  * ******************************************************************/
 import org.aspectj.tools.ajdoc.CoverageTestCase;
 import org.aspectj.tools.ajdoc.ExecutionTestCase;
+import org.aspectj.tools.ajdoc.PatternsTestCase;
 import org.aspectj.tools.ajdoc.SpacewarTestCase;
 
 import junit.framework.Test;
@@ -24,6 +25,7 @@ public class AjdocModuleTests {
                TestSuite suite = new TestSuite("Test for org.aspectj.tools.ajdoc");
                //$JUnit-BEGIN$
                suite.addTestSuite(SpacewarTestCase.class);
+               suite.addTestSuite(PatternsTestCase.class);
                suite.addTestSuite(CoverageTestCase.class); 
                suite.addTestSuite(ExecutionTestCase.class);// !!! must be last because it exists
                //$JUnit-END$

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java
index 03c7c643c569b9fd8603414f177c2ef0e378b137..b90d749005cd65a681622622b14730d3503fe009 100644 (file)
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java
@@ -23,7 +23,7 @@ public class SpacewarTestCase extends TestCase {
        public void testSimpleExample() {
                
 //             System.err.println(new File("testdata/figures-demo").exists());
-               File outdir = new File("testdata/spacewar/doc");
+               File outdir = new File("testdata/spacewar/docdir");
                File sourcepath = new File("testdata/spacewar");
                
                String[] args = { "-d",