From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Wed, 17 Mar 2021 07:55:51 +0000 (+0700)
Subject: Do not run tests using Java 14 preview features on this Java 15 compiler
X-Git-Tag: java16-add-opens~28
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5bb8f42d3b2b65bf8ba12e9aaf6c892b5134fa36;p=aspectj.git

Do not run tests using Java 14 preview features on this Java 15 compiler

These tests need a Java 14 level AspectJ compiler, because they use
version-specific preview features. This compiler has been upgraded
to a Java 15 compliant JDT Core already, i.e. it does not support
preview features of a previous version anymore.

An error message similar to the above explanation will appear when
trying to run any XMLBasedAjcTestCaseForJava14Only subclass, such as
Ajc196PreviewFeaturesTests (currently the only one).

When running AllTestsAspectJ196, Ajc196PreviewFeaturesTests will not be
added to the test suite anymore.

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 3bdb4d6be..5a25c9a73 100644
--- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava14Only.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava14Only.java
@@ -19,6 +19,12 @@ public abstract class XMLBasedAjcTestCaseForJava14Only extends XMLBasedAjcTestCa
 
 	@Override
 	public void runTest(String title) {
+		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."
+		);
+		/*
 		if (!LangUtil.is14VMOrGreater() || LangUtil.is15VMOrGreater()) {
 			throw new IllegalStateException(
 				"These tests should be run on Java 14 only " +
@@ -26,6 +32,7 @@ public abstract class XMLBasedAjcTestCaseForJava14Only extends XMLBasedAjcTestCa
 			);
 		}
 		super.runTest(title);
+		*/
 	}
 
 }
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 fa2a3aea2..32e95c06b 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java
@@ -23,9 +23,12 @@ public class AllTestsAspectJ196 {
 			suite.addTest(Ajc196Tests.suite());
 			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;
 	}
 }