test and fix for 134063

2 files changed, 29 insertions, 0 deletions

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java
index 372c9c637..3b79bdb1e 100644
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java
@@ -273,4 +273,27 @@ public class AjdocTestCase extends TestCase{
 		}
         org.aspectj.tools.ajdoc.Main.main(args);
 	}
+	
+	/**
+	 * Run the ajdoc command with the given visibility argument,
+	 * the default source level and the given input directories. 
+	 */
+	public void runAjdoc(String visibility, String lstFile) {
+		if (!visibility.equals("public") 
+				&& !visibility.equals("protected")
+				&& !visibility.equals("private")) {
+				fail("need to pass 'public','protected' or 'private' visibility to ajdoc");
+		}
+ 	
+ 		String[] args = new String[8];
+		args[0] = "-" + visibility;
+		args[1] = "-classpath";
+		args[2] = AjdocTests.ASPECTJRT_PATH.getPath();
+		args[3] = "-d";
+		args[4] = getAbsolutePathOutdir();
+		args[5] = "-sourcepath";
+		args[6] = getAbsoluteProjectDir();
+		args[7] = "@" + getAbsoluteProjectDir() + File.separatorChar + lstFile;
+        org.aspectj.tools.ajdoc.Main.main(args);
+	}
 }
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java
index b6aa0c4b8..cefdae1d7 100644
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java
@@ -11,6 +11,8 @@
  * ******************************************************************/
  package org.aspectj.tools.ajdoc;
 
+import java.io.File;
+
 
 /**
  * @author Mik Kersten
@@ -32,4 +34,8 @@ public class SpacewarTestCase extends AjdocTestCase {
 		runAjdoc("public",dirs);
 	}
 
+	public void testPr134063() {
+		String lstFile = "spacewar" + File.separatorChar + "demo.lst";
+		runAjdoc("private",lstFile);
+	}
 }