Test comment cosmetics

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava14Only.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava14Only.java
index ece1276511a45c2405d2c2add9995877d181a5b6..70ebef47738d5c6f3eb68ba1133d086f39dda64d 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava14Only.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava14Only.java
@@ -17,11 +17,13 @@ public abstract class XMLBasedAjcTestCaseForJava14Only extends XMLBasedAjcTestCa
 
        @Override
        public void setUp() throws Exception {
+               // Activate this block after upgrading to JDT Core Java 15
                throw new IllegalStateException(
                        "These tests need a Java 14 level AspectJ compiler " +
                                "(e.g. because they use version-specific preview features). " +
                                "This compiler does not support preview features of a previous version anymore."
                );
+               // Activate this block before upgrading to JDT Core Java 15
                /*
                if (!LangUtil.is14VMOrGreater() || LangUtil.is15VMOrGreater()) {
                        throw new IllegalStateException(

diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java
index 868ece1e3cc1e84876fc24108ba675567d5ab05e..5b64445a90b2295f0a9796e77a6639a4e139a227 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java
@@ -17,11 +17,13 @@ public abstract class XMLBasedAjcTestCaseForJava15Only extends XMLBasedAjcTestCa
 
        @Override
        public void setUp() throws Exception {
+               // Activate this block after upgrading to JDT Core Java 16
                throw new IllegalStateException(
                        "These tests need a Java 15 level AspectJ compiler " +
                                "(e.g. because they use version-specific preview features). " +
                                "This compiler does not support preview features of a previous version anymore."
                );
+               // Activate this block before upgrading to JDT Core Java 16
                /*
                if (!LangUtil.is15VMOrGreater() || LangUtil.is16VMOrGreater()) {
                        throw new IllegalStateException(

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java
index 806cdc55bd18f0813b106f41190633d4bc4bd488..329b3f8800c1c54b609b2ad166276174af243ff9 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java
@@ -14,7 +14,7 @@ import junit.framework.Test;
 
 /*
  * Some very trivial tests that help verify things are OK.
- * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -10 option
+ * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -11 option
  * to check code generation and modification with that version specified.
  *
  * @author Andy Clement

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java b/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java
index c3acd04b269a752427827571d275b3df83f499b1..f8cffca691aa4ee2c48caa78cbc74ac1357ff3d5 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java
@@ -14,7 +14,7 @@ import junit.framework.Test;
 
 /*
  * Some very trivial tests that help verify things are OK.
- * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -10 option
+ * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -13 option
  * to check code generation and modification with that version specified.
  *
  * @author Andy Clement

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java b/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java
index 08013d6978894efab7fb69ea24c315f12542ffbc..c2e13b550edfb076c8873793edfd4078cdfa28ce 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java
@@ -24,11 +24,11 @@ public class AllTestsAspectJ196 {
                        suite.addTest(SanityTestsJava14.suite());
                }
                // Do not run tests using a previous compiler's preview features anymore. They would all fail.
-/*
+               /*
                if (LangUtil.is14VMOrGreater() && !LangUtil.is15VMOrGreater()) {
                        suite.addTest(Ajc196PreviewFeaturesTests.suite());
                }
-*/
+               */
                return suite;
        }
 }

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java b/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java
index 554832dd2d6ad1661b1c402f8ef613b52d787c56..6857b4d8ae1654849e8a3d6bebcdcf38c9890343 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java
@@ -14,7 +14,7 @@ import junit.framework.Test;
 
 /*
  * Some very trivial tests that help verify things are OK.
- * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -10 option
+ * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -14 option
  * to check code generation and modification with that version specified.
  *
  * @author Andy Clement

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java
index 9aaed7eb888a4bb117f3de921d83be536165d293..fe767e6395462bb51f96df184efbba13fbdbff38 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java
@@ -25,9 +25,12 @@ public class AllTestsAspectJ197 {
                        suite.addTest(SanityTestsJava16.suite());
                        suite.addTest(Ajc197TestsJava.suite());
                }
+               // Do not run tests using a previous compiler's preview features anymore. They would all fail.
+               /*
                if (LangUtil.is16VMOrGreater() && !LangUtil.is17VMOrGreater()) {
                        suite.addTest(Java16PreviewFeaturesTests.suite());
                }
+               */
                return suite;
        }
 }

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java
index a91d5c24002d1c245b321f4f73f615c53dfb4de0..9622e7364871a1ba6b8cef723da0826181c351e0 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java
@@ -13,7 +13,7 @@ import org.aspectj.testing.XMLBasedAjcTestCaseForJava15OrLater;
 
 /*
  * Some very trivial tests that help verify things are OK.
- * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -10 option
+ * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -15 option
  * to check code generation and modification with that version specified.
  *
  * @author Alexander Kriegisch

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java
index ab28b080f40ee16d3bf0369398200962da7ab5e9..52950b4dd1a195ec0075c8f08a5d23f7ddd74d68 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java
@@ -13,7 +13,7 @@ import org.aspectj.testing.XMLBasedAjcTestCaseForJava16OrLater;
 
 /*
  * Some very trivial tests that help verify things are OK.
- * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -10 option
+ * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -16 option
  * to check code generation and modification with that version specified.
  *
  * @author Alexander Kriegisch

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java
index d99042a3f08d255a800c2e8b99adc79c296587fb..69ed09593dc61daa2f2f1390e0e3e23f7fc45506 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java
@@ -19,7 +19,7 @@ public class AllTestsAspectJ198 {
        public static Test suite() {
                TestSuite suite = new TestSuite("AspectJ 1.9.8 tests");
                if (LangUtil.is9VMOrGreater()) {
-                       suite.addTest(org.aspectj.systemtest.ajc198.CompileWithReleaseTests.suite());
+                       suite.addTest(CompileWithReleaseTests.suite());
                }
                if (LangUtil.is17VMOrGreater()) {
                        suite.addTest(SanityTestsJava17.suite());

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/SanityTestsJava17.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/SanityTestsJava17.java
index 4fac5f3757da41bb0d60f3246dab5997185e64c1..0769be83b8d515945b1442bf63c6cb9251533903 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc198/SanityTestsJava17.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/SanityTestsJava17.java
@@ -13,7 +13,7 @@ import org.aspectj.testing.XMLBasedAjcTestCaseForJava17OrLater;
 
 /*
  * Some very trivial tests that help verify things are OK.
- * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -10 option
+ * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -17 option
  * to check code generation and modification with that version specified.
  *
  * @author Alexander Kriegisch