From 2548a8ab0b3649ed3fc8eac331ebeb1f28f02c3d Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Mon, 3 Oct 2022 16:36:33 +0200 Subject: Deactivate Java 18 preview language feature tests and enable LangUtil to parse Java versions like '19+36-2238'. Signed-off-by: Alexander Kriegisch --- .../test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java | 2 +- .../test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/src') 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 c2e13b550..d3cbfb9ab 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java @@ -26,7 +26,7 @@ public class AllTestsAspectJ196 { // 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()); + suite.addTest(Java14PreviewFeaturesTests.suite()); } */ return suite; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java index 6ff7adee4..6b77073be 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java @@ -23,9 +23,12 @@ public class AllTestsAspectJ199 { suite.addTest(SanityTestsJava18.suite()); suite.addTest(Ajc199TestsJava.suite()); } + // Do not run tests using a previous compiler's preview features anymore. They would all fail. + /* if (LangUtil.is18VMOrGreater() && !LangUtil.is19VMOrGreater()) { suite.addTest(Java18PreviewFeaturesTests.suite()); } + */ return suite; } } -- cgit v1.2.3