Updated to support running on JDK 1.5, and fixed related bug#82218

2 files changed, 41 insertions, 16 deletions

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
index 25182eaf7..34f22a03d 100644
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@ -33,7 +33,8 @@ public class CoverageTestCase extends TestCase {
 	File file7 = new File("testdata/coverage/fluffy/bunny/rocks/Rocks.java");
 	File file8 = new File("testdata/coverage/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java");
 	File file9 = new File("testdata/coverage/foo/PkgVisibleClass.java");
-	 
+	File file10 = new File("testdata/coverage/foo/NoMembers.java");
+    
 	File outdir = new File("testdata/coverage/doc");
 	
 	public void testOptions() {
@@ -54,6 +55,20 @@ public class CoverageTestCase extends TestCase {
 	    assertTrue(true);
 	}
 	
+    public void testCoveragePublicMode() {
+        outdir.delete();
+        String[] args = { 
+            "-public",
+            "-source", 
+            "1.4",
+            "-d", 
+            outdir.getAbsolutePath(),
+            file3.getAbsolutePath(),
+            file9.getAbsolutePath() 
+        };
+        org.aspectj.tools.ajdoc.Main.main(args);
+    }
+    
 	public void testCoverage() {
 		outdir.delete();
 		String[] args = { 
@@ -73,21 +88,8 @@ public class CoverageTestCase extends TestCase {
 			file6.getAbsolutePath(),
 			file7.getAbsolutePath(),
 			file8.getAbsolutePath(),
-			file9.getAbsolutePath()
-		};
-		org.aspectj.tools.ajdoc.Main.main(args);
-	}
-	
-	public void testCoveragePublicMode() {
-		outdir.delete();
-		String[] args = { 
-			"-public",
-			"-source", 
-			"1.4",
-			"-d", 
-			outdir.getAbsolutePath(),
-			file3.getAbsolutePath(),
-			file9.getAbsolutePath() 
+			file9.getAbsolutePath(),
+            file10.getAbsolutePath()
 		};
 		org.aspectj.tools.ajdoc.Main.main(args);
 	}
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/JDKVersionTest.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/JDKVersionTest.java
new file mode 100644
index 000000000..9e8b06b5f
--- /dev/null
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/JDKVersionTest.java
@@ -0,0 +1,23 @@
+/*
+ * Created on Jan 12, 2005
+  */
+package org.aspectj.tools.ajdoc;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Mik Kersten
+ */
+public class JDKVersionTest extends TestCase {
+
+//    public void testIsUsing1point4() {
+//        String v = System.getProperty("java.class.version","44.0");
+//        assertTrue(("49.0".compareTo(v) > 0) && ("48.0".compareTo(v) <= 0));
+//        assertFalse(Util.isExecutingOnJava5());
+//    }
+
+    public void testIsUsing1point5() {
+        assertTrue(Util.isExecutingOnJava5());
+    }
+    
+}