Updated with Java12 support

4 files changed, 55 insertions, 37 deletions

diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java
new file mode 100644
index 000000000..50bddfb5d
--- /dev/null
+++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java
@@ -0,0 +1,18 @@
+/* *******************************************************************
+ * Copyright (c) 2019 Contributors.
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Eclipse Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/epl-v10.html 
+ * ******************************************************************/
+package org.aspectj.tools.ajdoc;
+
+/**
+ * @author Andy Clement
+ */
+public class AJDocConstants {
+
+	public final static String VERSION = "1.7";
+	
+}
diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/BugTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/BugTest.java
index 6caf5d79d..6cbec3ebe 100644
--- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/BugTest.java
+++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/BugTest.java
@@ -69,7 +69,7 @@ public class BugTest extends AjdocTestCase {
 		initialiseProject("pr148906");
 		File[] files = {new File(getAbsoluteProjectDir() + "/C.java")};
 		String[] ajOptions = {new String("-aspectpath"), new String(getAbsoluteProjectDir() + File.separator + "simple.jar")};
-		runAjdoc(files,"1.6",ajOptions);
+		runAjdoc(files,AJDocConstants.VERSION,ajOptions);
 		assertFalse("expected clean build of project but found that build aborted",Main.hasAborted());
 		File html = new File(getAbsolutePathOutdir() + File.separator + "C.html");
 		if (!html.exists()) {
@@ -90,7 +90,7 @@ public class BugTest extends AjdocTestCase {
 		initialiseProject("pr148906");
 		File[] files = {new File(getAbsoluteProjectDir() + "/C.java")};
 		String[] ajOptions = {new String("-outxml"),new String("-aspectpath"), new String(getAbsoluteProjectDir() + File.separator + "simple.jar")};
-		runAjdoc(files,"1.6",ajOptions);
+		runAjdoc(files,AJDocConstants.VERSION,ajOptions);
 		assertFalse("expected clean build of project but found that build aborted",Main.hasAborted());
 		File html = new File(getAbsolutePathOutdir() + File.separator + "C.html");
 		if (!html.exists()) {
diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/CoverageTestCase.java
index 70aaa8b35..c92e96d2e 100644
--- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/CoverageTestCase.java
+++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@ -87,7 +87,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
 	public void testAJdocHasAspectTitle() throws Exception {
 		File[] files = {new File(getAbsoluteProjectDir() + "/pkg/A.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
         File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/A.html");
 		if (!htmlFile.exists()) {
 			fail("couldn't find " + htmlFile.getAbsolutePath()+ " - were there compilation errors?");
@@ -101,7 +101,7 @@ public class CoverageTestCase extends AjdocTestCase {
 	 */
 	public void testAJdocHasClassTitle() throws Exception {
 		File[] files = {new File(getAbsoluteProjectDir() + "/pkg/C.java")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
         File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/C.html");
 		if (!htmlFile.exists()) {
 			fail("couldn't find " + htmlFile.getAbsolutePath()+ " - were there compilation errors?");
@@ -117,7 +117,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testInnerAspect() throws Exception {
     	File[] files = {file1, file2};
-        runAjdoc("private","1.6",files);
+        runAjdoc("private",AJDocConstants.VERSION,files);
             
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/ClassA.InnerAspect.html");
 		if (!htmlFile.exists()) {
@@ -205,7 +205,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdviceNamingCoverage() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdviceNamingCoverage.html");
 		if (!htmlFile.exists()) {
@@ -237,7 +237,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisesRelationshipCoverage() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdvisesRelationshipCoverage.html");
 		if (!htmlFile.exists()) {
@@ -290,7 +290,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByMethodExecution() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -321,7 +321,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByConstructorExecution() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -358,7 +358,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByMethodCall() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -389,7 +389,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByConstructorCall() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -420,7 +420,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByGet() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -451,7 +451,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedBySet() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -500,7 +500,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByInitialization() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -532,7 +532,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByStaticInitialization() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -553,7 +553,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testAdvisedByHandler() throws Exception {
     	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html");
 		if (!htmlFile.exists()) {
@@ -591,7 +591,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testTwoBeforeAdvice() throws Exception {
     	File[] files = {new File(getAbsoluteProjectDir() + "/pkg/A2.aj")};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/C2.html");
 		if (!htmlFile.exists()) {
@@ -637,7 +637,7 @@ public class CoverageTestCase extends AjdocTestCase {
      */
     public void testNoSpuriousAdvisedByRels() throws Exception {
        	File[] files = {file4};
-    	runAjdoc("private","1.6",files);
+    	runAjdoc("private",AJDocConstants.VERSION,files);
     	
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdvisesRelationshipCoverage.html");
 		if (!htmlFile.exists()) {
@@ -666,7 +666,7 @@ public class CoverageTestCase extends AjdocTestCase {
 	 */
 	public void testNestedAspect() throws Exception {
 		File[] files = {file9};
-		runAjdoc("private","1.6",files);	
+		runAjdoc("private",AJDocConstants.VERSION,files);	
 		
 	       File htmlFile = new File(getAbsolutePathOutdir() + "/PkgVisibleClass.NestedAspect.html");
 			if (!htmlFile.exists()) {
@@ -748,7 +748,7 @@ public class CoverageTestCase extends AjdocTestCase {
 	 */
 	public void testNestedAspectWithSimilarName() throws Exception {
     	File[] files = {new File(getAbsoluteProjectDir() + "/pkg/ClassWithNestedAspect.java")};
-        runAjdoc("private","1.6",files);
+        runAjdoc("private",AJDocConstants.VERSION,files);
             
         File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.NestedAspect.html");
 		if (!htmlFile.exists()) {
@@ -829,7 +829,7 @@ public class CoverageTestCase extends AjdocTestCase {
 	 */
 	public void testAdviceInNestedAspect() throws Exception {
     	File[] files = {new File(getAbsoluteProjectDir() + "/pkg/ClassWithNestedAspect.java")};
-        runAjdoc("private","1.6",files);
+        runAjdoc("private",AJDocConstants.VERSION,files);
             
         File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.NestedAspect.html");
 		if (!htmlFile.exists()) {
@@ -860,7 +860,7 @@ public class CoverageTestCase extends AjdocTestCase {
 	 */
 	public void testAdvisedByInNestedAspect() throws Exception {
     	File[] files = {new File(getAbsoluteProjectDir() + "/pkg/ClassWithNestedAspect.java")};
-        runAjdoc("private","1.6",files);
+        runAjdoc("private",AJDocConstants.VERSION,files);
             
         File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.html");
 		if (!htmlFile.exists()) {
diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/DeclareFormsTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/DeclareFormsTest.java
index 8dc4c24fe..ea477d699 100644
--- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/DeclareFormsTest.java
+++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/DeclareFormsTest.java
@@ -49,7 +49,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testDeclareStatments() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html");
 		if (!htmlFile.exists()) {
@@ -84,7 +84,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testDeclareWarning() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html");
 		if (!htmlFile.exists()) {
@@ -116,7 +116,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testMatchesDeclareCall() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Main2.html");
 		if (!htmlFile.exists()) {
@@ -148,7 +148,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testMatchesDeclareExecution() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point2.html");
 		if (!htmlFile.exists()) {
@@ -181,7 +181,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testDeclareParents() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html");
 		if (!htmlFile.exists()) {
@@ -212,7 +212,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testAspectDeclarations() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point2.html");
 		if (!htmlFile.exists()) {
@@ -235,7 +235,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testDeclareSoft() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html");
 		if (!htmlFile.exists()) {
@@ -266,7 +266,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testSoftenedBy() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Main2.html");
 		if (!htmlFile.exists()) {
@@ -305,7 +305,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testDeclareAnnotation() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtType.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 			
 		// Aspect AnnotationTest should contain within it's declare
 	    // detail and summary the declare annotation statement.
@@ -351,7 +351,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testMethodAnnotatedBy() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtMethod.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html");
 		if (!htmlFile.exists()) {
@@ -384,7 +384,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testConstructorAnnotatedBy() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtConstructor.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html");
 		if (!htmlFile.exists()) {
@@ -418,7 +418,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testFieldAnnotatedBy() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtField.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html");
 		if (!htmlFile.exists()) {
@@ -452,7 +452,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testTypeAnnotatedBy() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtType.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html");
 		if (!htmlFile.exists()) {
@@ -475,7 +475,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testMatchesDeclareAndAdvisedBy() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "A.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html");
 		if (!htmlFile.exists()) {
@@ -521,7 +521,7 @@ public class DeclareFormsTest extends AjdocTestCase {
 	public void testTwoDeclareParents() throws Exception {
 		initialiseProject("declareForms");
 		File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareParents.aj")};
-		runAjdoc("private","1.6",files);
+		runAjdoc("private",AJDocConstants.VERSION,files);
 		
         File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareParents.html");
 		if (!htmlFile.exists()) {