diff options
16 files changed, 988 insertions, 10 deletions
diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java index 216bdfdde..77477747c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java @@ -104,8 +104,10 @@ public interface Constants { short MINOR_19 = 0; short MAJOR_20 = 64; short MINOR_20 = 0; -// short MAJOR_21 = 65; -// short MINOR_21 = 0; + short MAJOR_21 = 65; + short MINOR_21 = 0; +// short MAJOR_22 = 66; +// short MINOR_22 = 0; int PREVIEW_MINOR_VERSION = 65535; diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java index 23905d45d..ab99fd670 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java @@ -252,15 +252,15 @@ public class AjcTask extends MatchingTask { static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", - "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20" + "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21" }; static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", - "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20" + "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21" }; static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "-1.9", "-9", - "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19", "-20" + "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19", "-20", "-21" }; private static final ICommandEditor COMMAND_EDITOR; diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava20Only.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava20Only.java index aeb1152fd..4e0567d0d 100644 --- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava20Only.java +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava20Only.java @@ -20,14 +20,13 @@ public abstract class XMLBasedAjcTestCaseForJava20Only extends XMLBasedAjcTestCa @Override public void setUp() throws Exception { // Activate this block after upgrading to JDT Core Java 21 - /* throw new IllegalStateException( "These tests need a Java 20 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 21 + /* if (!LangUtil.is20VMOrGreater() || LangUtil.is21VMOrGreater()) { throw new IllegalStateException( "These tests should be run on Java 20 only " + @@ -35,6 +34,7 @@ public abstract class XMLBasedAjcTestCaseForJava20Only extends XMLBasedAjcTestCa ); } super.setUp(); + */ } } diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava21Only.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava21Only.java new file mode 100644 index 000000000..fb6795b3d --- /dev/null +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava21Only.java @@ -0,0 +1,40 @@ +/* ******************************************************************* + * Copyright (c) 2023 Contributors + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * ******************************************************************/ +package org.aspectj.testing; + +import org.aspectj.util.LangUtil; + +/** + * Makes sure tests are running on the right level of JDK. + * + * @author Alexander Kriegisch + */ +public abstract class XMLBasedAjcTestCaseForJava21Only extends XMLBasedAjcTestCase { + + @Override + public void setUp() throws Exception { + // Activate this block after upgrading to JDT Core Java 22 + /* + throw new IllegalStateException( + "These tests need a Java 21 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 22 + if (!LangUtil.is21VMOrGreater() || LangUtil.is22VMOrGreater()) { + throw new IllegalStateException( + "These tests should be run on Java 21 only " + + "(e.g. because they use version-specific preview features)" + ); + } + super.setUp(); + } + +} diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava21OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava21OrLater.java new file mode 100644 index 000000000..4c1d59d15 --- /dev/null +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava21OrLater.java @@ -0,0 +1,27 @@ +/* ******************************************************************* + * Copyright (c) 2023 Contributors + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * ******************************************************************/ +package org.aspectj.testing; + +import org.aspectj.util.LangUtil; + +/** + * Makes sure tests are running on the right level of JDK. + * + * @author Alexander Kriegisch + */ +public abstract class XMLBasedAjcTestCaseForJava21OrLater extends XMLBasedAjcTestCase { + + @Override + public void setUp() throws Exception { + if (!LangUtil.is21VMOrGreater()) + throw new IllegalStateException("These tests should be run on Java 21 or later"); + super.setUp(); + } + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1920/AllTestsAspectJ1920.java b/tests/src/test/java/org/aspectj/systemtest/ajc1920/AllTestsAspectJ1920.java index c7962c2db..a095eb758 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1920/AllTestsAspectJ1920.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1920/AllTestsAspectJ1920.java @@ -24,10 +24,11 @@ public class AllTestsAspectJ1920 { suite.addTest(Ajc1920TestsJava.suite()); } // Do not run tests using a previous compiler's preview features anymore. They would all fail. - // TODO: Comment out the following block when upgrading JDT Core to Java 20 + /* if (LangUtil.is20VMOrGreater() && !LangUtil.is21VMOrGreater()) { suite.addTest(Java20PreviewFeaturesTests.suite()); } + */ return suite; } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1920/Java20PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1920/Java20PreviewFeaturesTests.java index e597b32ec..89a0a61c6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1920/Java20PreviewFeaturesTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1920/Java20PreviewFeaturesTests.java @@ -52,7 +52,7 @@ public class Java20PreviewFeaturesTests extends XMLBasedAjcTestCaseForJava20Only } public void testRecordPatternsPreview1Error() { - // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/450 (fixed for preview 2 in Eclipse 2033-03, 4.27) + // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/450 (fixed for preview 2 in Eclipse 2023-03, 4.27) runTest("record patterns error"); checkVersion("RecordPatternsPreview1Error", Constants.MAJOR_20, Constants.PREVIEW_MINOR_VERSION); checkVersion("Box", Constants.MAJOR_20, Constants.PREVIEW_MINOR_VERSION); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1921/Ajc1921TestsJava.java b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Ajc1921TestsJava.java new file mode 100644 index 000000000..e7d3b9596 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Ajc1921TestsJava.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2022 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + *******************************************************************************/ +package org.aspectj.systemtest.ajc1921; + +import junit.framework.Test; +import org.aspectj.testing.XMLBasedAjcTestCase; +import org.aspectj.testing.XMLBasedAjcTestCaseForJava21OrLater; + +/** + * @author Alexander Kriegisch + */ +public class Ajc1921TestsJava extends XMLBasedAjcTestCaseForJava21OrLater { + + public void testDummyJava21() { + //runTest("dummy Java 21"); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Ajc1921TestsJava.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc1921.xml"); + } + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1921/AllTestsAspectJ1921.java b/tests/src/test/java/org/aspectj/systemtest/ajc1921/AllTestsAspectJ1921.java new file mode 100644 index 000000000..773ac9037 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1921/AllTestsAspectJ1921.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2022 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + *******************************************************************************/ +package org.aspectj.systemtest.ajc1921; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.aspectj.util.LangUtil; + +/** + * @author Alexander Kriegisch + */ +public class AllTestsAspectJ1921 { + + public static Test suite() { + TestSuite suite = new TestSuite("AspectJ 1.9.21 tests"); + suite.addTest(Bugs1921Tests.suite()); + if (LangUtil.is21VMOrGreater()) { + suite.addTest(SanityTestsJava21.suite()); + suite.addTest(Ajc1921TestsJava.suite()); + } + // Do not run tests using a previous compiler's preview features anymore. They would all fail. + // TODO: Comment out the following block when upgrading JDT Core to Java 22 + if (LangUtil.is21VMOrGreater() && !LangUtil.is22VMOrGreater()) { + suite.addTest(Java21PreviewFeaturesTests.suite()); + } + return suite; + } +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1921/Bugs1921Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Bugs1921Tests.java new file mode 100644 index 000000000..3c11149d3 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Bugs1921Tests.java @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright (c) 2023 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + *******************************************************************************/ +package org.aspectj.systemtest.ajc1921; + +import junit.framework.Test; +import org.aspectj.testing.XMLBasedAjcTestCase; + +/** + * @author Alexander Kriegisch + */ +public class Bugs1921Tests extends XMLBasedAjcTestCase { + + public void testSwitchWith_Integer_MAX_VALUE() { + runTest("switch with Integer.MAX_VALUE case"); + } + + public void testParenthesisedExpressionWithAjKeyword() { + runTest("parenthesised expression with AspectJ keyword"); + } + + public void testInterfaceInnerAspectImplicitlyStatic() { + runTest("inner aspect of interface is implicitly static"); + } + + public void testExactArrayTypeMatchCompiledTogether() { + runTest("exact array type matching, aspect compiled together with target class"); + } + + public void testExactArrayTypeMatchCompiledSeparately() { + runTest("exact array type matching, aspect compiled separately from target class"); + } + + public void testFuzzyArrayTypeMatchCompiledTogether() { + runTest("fuzzy array type matching, aspect compiled together with target class"); + } + + public void testFuzzyArrayTypeMatchCompiledSeparately() { + runTest("fuzzy array type matching, aspect compiled separately from target class"); + } + + public void test_GitHub_214() { + runTest("ArrayIndexOutOfBoundsException with Xlint unorderedAdviceAtShadow=warning"); + } + + /** + * Add correct annotations to multiple ITD methods with the same name and same number of arguments, i.e. copy the + * annotations correctly from the aspect into the target class instead of falsely always copying the annotations (if + * any) from the first ITD method found. + * <p> + * See <a href="https://github.com/eclipse-aspectj/aspectj/issues/246">GitHub issue 246</a>. + */ + public void test_GitHub_246() { + runTest("add correct annotations to multiple ITD methods with the same name and same number of arguments"); + } + + /** + * Make sure to create one {@code ajc$inlineAccessMethod} for identically named (overloaded) private aspect methods. + * <p> + * See <a href="https://github.com/eclipse-aspectj/aspectj/issues/250">GitHub issue 250</a>. + */ + public void test_GitHub_250() { + runTest("correctly handle overloaded private methods in aspects"); + } + + /** + * If one generic method overrides another one with a narrower return type, avoid matching bridge methods. + * <p> + * See <a href="https://github.com/spring-projects/spring-framework/issues/27761">Spring GitHub issue 27761</a>. + * <p> + * This test uses an ASM-modified class file reproducing the problem seen in Spring in plain AspectJ. Before the + * bugfix, it fails with <b>"advice defined in RepositoryAspect has not been applied [Xlint:adviceDidNotMatch]".</b> + */ + public void test_Spring_GitHub_27761() { + runTest("do not match bridge methods"); + } + + /** + * In 1.9.20, a regression bug occurred, matching negated types like '!void' and '!String' incorrectly. + * <p> + * See <a href="https://github.com/eclipse-aspectj/aspectj/issues/257">GitHub issue 257</a>. + */ + public void test_GitHub_257() { + runTest("handle negated type patterns correctly"); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Bugs1921Tests.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc1921.xml"); + } + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1921/Java21PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Java21PreviewFeaturesTests.java new file mode 100644 index 000000000..1088aac63 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Java21PreviewFeaturesTests.java @@ -0,0 +1,103 @@ +/******************************************************************************* + * Copyright (c) 2023 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + *******************************************************************************/ +package org.aspectj.systemtest.ajc1921; + +import junit.framework.Test; +import org.aspectj.apache.bcel.Constants; +import org.aspectj.testing.XMLBasedAjcTestCase; +import org.aspectj.testing.XMLBasedAjcTestCaseForJava21Only; + +/** + * @author Alexander Kriegisch + */ +public class Java21PreviewFeaturesTests extends XMLBasedAjcTestCaseForJava21Only { + + public void testSwitchPatternMatchingPreview4Java() { + runTest("switch pattern matching preview 4 java"); + checkVersion("SwitchPatternPreview4OK", Constants.MAJOR_21, Constants.PREVIEW_MINOR_VERSION); + } + + public void testSwitchPatternMatchingPreview4Error() { + runTest("switch pattern matching preview 4 error"); + } + + public void testSwitchPatternMatchingPreview3Aspect() { + runTest("switch pattern matching preview 3 aspect"); + checkVersion("SwitchPatternPreview3Aspect", Constants.MAJOR_21, Constants.PREVIEW_MINOR_VERSION); + checkVersion("Application", Constants.MAJOR_21, Constants.PREVIEW_MINOR_VERSION); + checkVersion("Shape", Constants.MAJOR_21, Constants.PREVIEW_MINOR_VERSION); + checkVersion("S", Constants.MAJOR_21, Constants.PREVIEW_MINOR_VERSION); + } + + public void testSwitchPatternMatchingCaseLabelDominatedByPrecedingError() { + runTest("switch pattern matching error"); + } + + public void testSwitchPatternMatchingPreview3Error1() { + runTest("switch pattern matching preview 3 error 1"); + } + + public void testSwitchPatternMatchingPreview3Error2() { + runTest("switch pattern matching preview 3 error 2"); + } + + public void testRecordPatternsPreview1OK() { + // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/450 + runTest("record patterns"); + } + + public void testRecordPatternsPreview1Error() { + // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/450 (fixed for preview 2 in Eclipse 2023-03, 4.27) + runTest("record patterns error"); + checkVersion("RecordPatternsPreview1Error", Constants.MAJOR_21, Constants.PREVIEW_MINOR_VERSION); + checkVersion("Box", Constants.MAJOR_21, Constants.PREVIEW_MINOR_VERSION); + } + + public void testRecordPatternsPreview1ExhaustivenessOK1() { + // Falsely throws 'An enhanced switch statement should be exhaustive; a default label expected' twice, + // see https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 + // TODO: Remove redundant default clauses when fixed upstream + System.out.println("TODO: fully activate when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed"); + runTest("record patterns exhaustiveness 1"); + } + + public void testRecordPatternsPreview1Aspect() { + runTest("record patterns aspect"); + } + + public void testRecordPatternsPreview1ExhaustivenessAspect() { + // Falsely throws 'An enhanced switch statement should be exhaustive; a default label expected' twice, + // see https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 + // TODO: Remove redundant default clauses when fixed upstream + System.out.println("TODO: fully activate when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed"); + runTest("record patterns exhaustiveness aspect"); + } + + public void testRecordPatternsPreview1ExhaustivenessError() { + // See https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 + runTest("record patterns exhaustiveness error"); + } + + public void testRecordPatternsPreview1ExhaustivenessOK2() { + // Falsely throws 'An enhanced switch statement should be exhaustive; a default label expected', + // see https://github.com/eclipse-jdt/eclipse.jdt.core/issues/398 + // TODO: activate when fixed + System.out.println("TODO: activate when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/398 has been fixed"); + //runTest("record patterns exhaustiveness 2"); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Java21PreviewFeaturesTests.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc1921.xml"); + } + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1921/SanityTestsJava21.java b/tests/src/test/java/org/aspectj/systemtest/ajc1921/SanityTestsJava21.java new file mode 100644 index 000000000..ed2216fdb --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1921/SanityTestsJava21.java @@ -0,0 +1,88 @@ +/******************************************************************************* + * Copyright (c) 2023 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + *******************************************************************************/ +package org.aspectj.systemtest.ajc1921; + +import junit.framework.Test; +import org.aspectj.apache.bcel.Constants; +import org.aspectj.testing.XMLBasedAjcTestCase; +import org.aspectj.testing.XMLBasedAjcTestCaseForJava21OrLater; + +/* + * 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 -21 option + * to check code generation and modification with that version specified. + * + * @author Alexander Kriegisch + */ +public class SanityTestsJava21 extends XMLBasedAjcTestCaseForJava21OrLater { + + public static final int bytecode_version_for_JDK_level = Constants.MAJOR_21; + + // Incredibly trivial test programs that check the compiler works at all (these are easy-ish to debug) + public void testSimpleJava_A() { + runTest("simple - a"); + } + + public void testSimpleJava_B() { + runTest("simple - b"); + } + + public void testSimpleCode_C() { + runTest("simple - c"); + } + + public void testSimpleCode_D() { + runTest("simple - d"); + } + + public void testSimpleCode_E() { + runTest("simple - e"); + } + + public void testSimpleCode_F() { + runTest("simple - f"); + } + + public void testSimpleCode_G() { + runTest("simple - g"); + } + + public void testSimpleCode_H() { + runTest("simple - h", true); + } + + public void testSimpleCode_I() { + runTest("simple - i"); + } + + public void testVersionCorrect1() { + runTest("simple - j"); + checkVersion("A", bytecode_version_for_JDK_level, 0); + } + + public void testVersionCorrect2() { + runTest("simple - k"); + checkVersion("A", bytecode_version_for_JDK_level, 0); + } + + public void testVersionCorrect4() { + runTest("simple - m"); + // Must be 49.0 when -1.5 is specified + checkVersion("A", Constants.MAJOR_1_5, 0); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(SanityTestsJava21.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("sanity-tests-21.xml"); + } + +} diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml index 86fa7db02..1d25a176a 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml @@ -105,7 +105,7 @@ <!-- Java ?? final, Java 19, 20 preview --> <ajc-test dir="features1919/java19" vm="20" title="record patterns error"> <compile files="RecordPatternsPreview1Error.java" options="--enable-preview -20"> - <!-- https://github.com/eclipse-jdt/eclipse.jdt.core/issues/450 (fixed for preview 2 in Eclipse 2033-03, 4.27) --> + <!-- https://github.com/eclipse-jdt/eclipse.jdt.core/issues/450 (fixed for preview 2 in Eclipse 2023-03, 4.27) --> <!-- <message kind="error" file="RecordPatternsPreview1Error.java" text="Raw types are not allowed in record patterns"/> <message kind="error" file="RecordPatternsPreview1Error.java" text="Raw types are not allowed in record patterns"/> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml new file mode 100644 index 000000000..1199bb03a --- /dev/null +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml @@ -0,0 +1,478 @@ +<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]> + +<!-- + Java 20: no new final language features, only preview/incubator ones: + - "JEP 432: Record Patterns (Second Preview)" (###) + - "JEP 433: Pattern Matching for switch (Fourth Preview)" (###) + - "JEP 429: Scoped Values (Incubator)" (API only) + - "JEP 436: Virtual Threads (Second Preview)" (API only) + - "JEP 437: Structured Concurrency (Second Incubator)" (API only) +--> +<suite> + + <!-- Java ?? final, Java 17, 18, 19, 20 preview --> + <ajc-test dir="features1920/java20" vm="21" title="switch pattern matching preview 4 java"> + <compile files="SwitchPatternPreview4OK.java" options="--enable-preview -21" /> + <run class="SwitchPatternPreview4OK" vmargs="--enable-preview"> + <message></message> + <stdout> + <line text="null" /> + <line text="int 123" /> + <line text="long 999" /> + <line text="double 12.340000" /> + <line text="String foo" /> + <line text="[123, foo, 999, 12.34]" /> + <line text="Non-circle" /> + <line text="Small circle" /> + <line text="Large circle" /> + <line text="Sealed sub-class A" /> + <line text="Sealed sub-class B" /> + <line text="Sealed sub-record C" /> + <line text="absolute value 1: -1" /> + <line text="other integer: 0" /> + <line text="positive integer: 42" /> + <line text="other integer: -99" /> + <line text="positive integer: 123" /> + <line text="value unavailable: null" /> + </stdout> + </run> + </ajc-test> + + <!-- Java ?? final, Java 17, 18, 19, 20 preview --> + <ajc-test dir="features1920/java20" vm="21" title="switch pattern matching preview 4 error"> + <compile files="SwitchPatternPreview4Error.java" options="--enable-preview -21"> + <!-- TODO: Add correct compiler error message, as soon as JDT Core supports it --> + <message kind="error" file="SwitchPatternPreview4Error.java" text="This case label is dominated by one of the preceding case labels"/> + </compile> + </ajc-test> + + <!-- Java ?? final, Java 17, 18, 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="switch pattern matching preview 3 aspect"> + <compile files="SwitchPatternPreview3Aspect.aj" options="--enable-preview -21" /> + <run class="Application" vmargs="--enable-preview"> + <stdout> + <line text="null" /> + <line text="int 123" /> + <line text="long 999" /> + <line text="double 12.340000" /> + <line text="String foo" /> + <line text="[123, foo, 999, 12.34]" /> + <line text="Non-circle" /> + <line text="Small circle" /> + <line text="Large circle" /> + <line text="Sealed sub-class A" /> + <line text="Sealed sub-class B" /> + <line text="Sealed sub-record C" /> + <line text="absolute value 1: -1" /> + <line text="other integer: 0" /> + <line text="positive integer: 42" /> + <line text="other integer: -99" /> + <line text="positive integer: 123" /> + <line text="value unavailable: null" /> + </stdout> + </run> + </ajc-test> + + <!-- Java ?? final, Java 17, 18, 19, 20 preview --> + <ajc-test dir="features198/java17" vm="21" title="switch pattern matching error"> + <compile files="SwitchPatternError.java" options="--enable-preview -21"> + <!-- TODO: Add correct compiler error message, as soon as JDT Core supports it --> + <message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case labels"/> + </compile> + </ajc-test> + + <!-- Java ?? final, Java 17, 18, 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="switch pattern matching preview 3 error 1"> + <compile files="SwitchPatternPreview3Error1.java" options="--enable-preview -21"> + <!-- TODO: Add correct compiler error message, as soon as JDT Core supports it --> + <message kind="error" file="SwitchPatternPreview3Error1.java" text="This case label is dominated by one of the preceding case labels"/> + </compile> + </ajc-test> + + <!-- Java ?? final, Java 17, 18, 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="switch pattern matching preview 3 error 2"> + <compile files="SwitchPatternPreview3Error2.java" options="--enable-preview -21"> + <!-- TODO: Add correct compiler error message, as soon as JDT Core supports it --> + <message kind="error" file="SwitchPatternPreview3Error2.java" text="This case label is dominated by one of the preceding case labels"/> + </compile> + </ajc-test> + + <!-- Java ?? final, Java 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="record patterns"> + <compile files="RecordPatternsPreview1OK.java" options="--enable-preview -21"/> + </ajc-test> + + <!-- Java ?? final, Java 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="record patterns error"> + <compile files="RecordPatternsPreview1Error.java" options="--enable-preview -21"> + <!-- https://github.com/eclipse-jdt/eclipse.jdt.core/issues/450 (fixed for preview 2 in Eclipse 2023-03, 4.27) --> + <!-- + <message kind="error" file="RecordPatternsPreview1Error.java" text="Raw types are not allowed in record patterns"/> + <message kind="error" file="RecordPatternsPreview1Error.java" text="Raw types are not allowed in record patterns"/> + --> + </compile> + <run class="RecordPatternsPreview1Error" vmargs="--enable-preview"> + <stdout> + <line text="I'm a box"/> + <line text="I'm a box"/> + </stdout> + </run> + </ajc-test> + + <!-- Java ?? final, Java 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="record patterns exhaustiveness 1"> + <compile files="RecordPatternsPreview1ExhaustivenessOK1.java" options="--enable-preview -21"/> + <run class="RecordPatternsPreview1ExhaustivenessOK1" vmargs="--enable-preview"> + <stdout> + <line text="y"/> + <line text="a"/> + </stdout> + </run> + </ajc-test> + + <!-- Java ?? final, Java 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="record patterns exhaustiveness aspect"> + <compile files="RecordPatternsPreview1ExhaustivenessAspect.aj" options="--enable-preview -21"/> + <!-- TODO: Remove redundant default clauses when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed --> + <run class="RecordPatternsPreview1ExhaustivenessAspect" vmargs="--enable-preview"> + <stdout> + <line text="y"/> + <line text="a"/> + <line text="Pair[x=C@000, y=D@000]"/> + </stdout> + </run> + </ajc-test> + + <!-- Java ?? final, Java 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="record patterns aspect"> + <compile files="RecordPatternsPreview1Aspect.aj" options="--enable-preview -21"/> + <run class="RecordPatternsPreview1Aspect" vmargs="--enable-preview"> + <stdout> + <line text="9"/> + <line text="14"/> + <line text="Doing something with Point[x=2, y=7]"/> + <line text="Upper-left color: RED"/> + <line text="Upper-left color: RED"/> + <line text="Upper-left x coordinate: 1"/> + <line text="Doing something with Rectangle[upperLeft=ColoredPoint[p=Point[x=1, y=6], c=RED], lowerRight=ColoredPoint[p=Point[x=4, y=6], c=BLUE]]"/> + </stdout> + </run> + </ajc-test> + + <!-- Java ?? final, Java 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="record patterns exhaustiveness error"> + <compile files="RecordPatternsPreview1ExhaustivenessError.java" options="--enable-preview -21"> + <message kind="error" file="RecordPatternsPreview1ExhaustivenessError.java" text="An enhanced switch statement should be exhaustive; a default label expected"/> + </compile> + </ajc-test> + + <!-- Java ?? final, Java 19, 20 preview --> + <ajc-test dir="features1919/java19" vm="21" title="record patterns exhaustiveness 2"> + <compile files="RecordPatternsPreview1ExhaustivenessOK2.java" options="--enable-preview -21"/> + <run class="RecordPatternsPreview1ExhaustivenessOK2" vmargs="--enable-preview"> + <stdout> + <line text="Bob 12"/> + </stdout> + </run> + </ajc-test> + + <!-- RuntimeException in BcelWeaver, see https://github.com/eclipse/org.aspectj/issues/190 --> + <ajc-test dir="bugs1920/github_190" vm="1.5" title="switch with Integer.MAX_VALUE case"> + <compile files="SwitchCaseWith_Integer_MAX_VALUE.java" options="-1.5 -showWeaveInfo"> + <message kind="weave" text="Join point 'method-execution(java.lang.String SwitchCaseWith_Integer_MAX_VALUE.switchTest(int))'"/> + </compile> + <run class="SwitchCaseWith_Integer_MAX_VALUE"> + <stdout> + <line text="execution(String SwitchCaseWith_Integer_MAX_VALUE.switchTest(int))"/> + <line text="CASE_1"/> + </stdout> + </run> + </ajc-test> + + <!-- + 'Syntax error, insert "Expression" to complete Expression' when compiling parenthesised expressions + containing AspectJ keywords, e.g. '(before)', see https://github.com/eclipse/org.aspectj/issues/20 + --> + <ajc-test dir="bugs1920/github_20" vm="1.5" title="parenthesised expression with AspectJ keyword"> + <compile files="ParenthesisedAJKeywords.java" options="-1.5 -showWeaveInfo"/> + <run class="ParenthesisedAJKeywords"> + <stdout> + <line text="before"/> + <line text="after"/> + <line text="around"/> + <line text="aspect"/> + <line text="pointcut"/> + <line text="declare"/> + <line text="privileged"/> + </stdout> + </run> + </ajc-test> + + <!-- + 'inner aspects must be static' when compiling an interface with an inner aspect which was not explicitly declared + static, see https://github.com/eclipse/org.aspectj/issues/162 + --> + <ajc-test dir="bugs1920/github_162" vm="1.5" title="inner aspect of interface is implicitly static"> + <compile files="InterfaceWithInnerClass.java" options="-1.5 -showWeaveInfo"> + <message kind="weave" text="method-execution(int InterfaceWithInnerClass$ImplicitlyStatic.getNumber())' in Type 'InterfaceWithInnerClass$ImplicitlyStatic'"/> + <message kind="weave" text="method-execution(void InterfaceWithInnerClass$ImplicitlyStatic.main(java.lang.String[]))' in Type 'InterfaceWithInnerClass$ImplicitlyStatic'"/> + </compile> + <run class="InterfaceWithInnerClass$ImplicitlyStatic"> + <stdout> + <line text="execution(void InterfaceWithInnerClass.ImplicitlyStatic.main(String[]))"/> + <line text="execution(int InterfaceWithInnerClass.ImplicitlyStatic.getNumber())"/> + <line text="11"/> + </stdout> + </run> + </ajc-test> + + <!-- + When compiling aspect and target class together, matching works as expected, + see https://github.com/eclipse/org.aspectj/issues/24 + --> + <ajc-test dir="bugs1920/github_24" vm="1.5" title="exact array type matching, aspect compiled together with target class"> + <compile files="ExactlyMatchingAspect.aj MaybeMissingClass.java" options="-1.5 -showWeaveInfo"> + <!-- Even before the bugfix, in this case weaving worked as expected --> + <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/> + <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/> + <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/> + </compile> + <run class="MaybeMissingClass"> + <stdout> + <line text="MaybeMissingClass.f1"/> + <line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <line text="MaybeMissingClass.f2"/> + <line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <line text="MaybeMissingClass.f3"/> + <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <line text="MaybeMissingClass.f4"/> + <line text="execution(int MaybeMissingClass.f4())"/> + <line text="MaybeMissingClass.f5"/> + <line text="execution(int[] MaybeMissingClass.f5())"/> + <line text="MaybeMissingClass.f6"/> + <line text="execution(int[][] MaybeMissingClass.f6())"/> + </stdout> + </run> + </ajc-test> + + <!-- + When compiling aspect and target class separately, too many joinpoints are matched, + see https://github.com/eclipse/org.aspectj/issues/24 + --> + <ajc-test dir="bugs1920/github_24" vm="1.5" title="exact array type matching, aspect compiled separately from target class"> + <compile files="ExactlyMatchingAspect.aj" options="-1.5 -showWeaveInfo" outjar="aspect.jar"> + <message kind="warning" text="no match for this type name: MaybeMissingClass [Xlint:invalidAbsoluteTypeName]"/> + <message kind="warning" text="advice defined in ExactlyMatchingAspect has not been applied [Xlint:adviceDidNotMatch]"/> + </compile> + <compile files="MaybeMissingClass.java" options="-1.5 -showWeaveInfo" aspectpath="aspect.jar"> + <!-- Before the bugfix, f1 would be woven twice, f2 not at all--> + <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/> + <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/> + <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/> + </compile> + <run class="MaybeMissingClass" classpath="aspect.jar"> + <stdout> + <line text="MaybeMissingClass.f1"/> + <line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <line text="MaybeMissingClass.f2"/> + <line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <line text="MaybeMissingClass.f3"/> + <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <line text="MaybeMissingClass.f4"/> + <line text="execution(int MaybeMissingClass.f4())"/> + <line text="MaybeMissingClass.f5"/> + <line text="execution(int[] MaybeMissingClass.f5())"/> + <line text="MaybeMissingClass.f6"/> + <line text="execution(int[][] MaybeMissingClass.f6())"/> + </stdout> + </run> + </ajc-test> + + <!-- + When compiling aspect and target class together, too many joinpoints are matched, + see https://github.com/eclipse/org.aspectj/issues/24 + --> + <ajc-test dir="bugs1920/github_24" vm="1.5" title="fuzzy array type matching, aspect compiled together with target class"> + <compile files="FuzzilyMatchingAspect.aj MaybeMissingClass.java" options="-1.5 -showWeaveInfo"> + <!-- Before the bugfix, both f1 and f2 would be woven twice --> + <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/> + <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/> + <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/> + </compile> + <run class="MaybeMissingClass"> + <stdout> + <line text="MaybeMissingClass.f1"/> + <line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <line text="MaybeMissingClass.f2"/> + <line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <line text="MaybeMissingClass.f3"/> + <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <line text="MaybeMissingClass.f4"/> + <line text="execution(int MaybeMissingClass.f4())"/> + <line text="MaybeMissingClass.f5"/> + <line text="execution(int[] MaybeMissingClass.f5())"/> + <line text="MaybeMissingClass.f6"/> + <line text="execution(int[][] MaybeMissingClass.f6())"/> + </stdout> + </run> + </ajc-test> + + <!-- + When compiling aspect and target class separately, too many joinpoints are matched, + see https://github.com/eclipse/org.aspectj/issues/24 + --> + <ajc-test dir="bugs1920/github_24" vm="1.5" title="fuzzy array type matching, aspect compiled separately from target class"> + <compile files="FuzzilyMatchingAspect.aj" options="-1.5 -showWeaveInfo" outjar="aspect.jar"> + <message kind="warning" text="advice defined in FuzzilyMatchingAspect has not been applied [Xlint:adviceDidNotMatch]"/> + </compile> + <compile files="MaybeMissingClass.java" options="-1.5 -showWeaveInfo" aspectpath="aspect.jar"> + <!-- Before the bugfix, both f1 and f2 would be woven twice --> + <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/> + <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/> + <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/> + </compile> + <run class="MaybeMissingClass" classpath="aspect.jar"> + <stdout> + <line text="MaybeMissingClass.f1"/> + <line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/> + <line text="MaybeMissingClass.f2"/> + <line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/> + <line text="MaybeMissingClass.f3"/> + <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/> + <line text="MaybeMissingClass.f4"/> + <line text="execution(int MaybeMissingClass.f4())"/> + <line text="MaybeMissingClass.f5"/> + <line text="execution(int[] MaybeMissingClass.f5())"/> + <line text="MaybeMissingClass.f6"/> + <line text="execution(int[][] MaybeMissingClass.f6())"/> + </stdout> + </run> + </ajc-test> + + <!-- + https://github.com/eclipse/org.aspectj/issues/214 + https://github.com/mojohaus/aspectj-maven-plugin/issues/164 + Problem with multiple, subsequent weaving steps and '-Xlint:warning' or '-Xlint:unorderedAdviceAtShadow=warning' + java.lang.ArrayIndexOutOfBoundsException: 1 + [ERROR] at org.aspectj.weaver.bcel.BcelShadow.prepareForMungers(BcelShadow.java:379) + [ERROR] at org.aspectj.weaver.Shadow.implement(Shadow.java:546) + --> + <ajc-test dir="bugs1920/github_214" vm="1.5" title="ArrayIndexOutOfBoundsException with Xlint unorderedAdviceAtShadow=warning"> + <compile files="FirstAspect.java MarkerOne.java" options="-1.8 -showWeaveInfo -Xlint:warning" outjar="first-aspect.jar"> + <message kind="warning" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard [Xlint:noGuardForLazyTjp]"/> + <message kind="warning" text="advice defined in FirstAspect has not been applied [Xlint:adviceDidNotMatch]"/> + </compile> + <compile files="Application.java MarkerTwo.java" options="-1.5 -showWeaveInfo -Xlint:warning" classpath="$sandbox/first-aspect.jar" outjar="application.jar"/> + <compile files="SecondAspect.java" options="-1.5 -showWeaveInfo -Xlint:warning" aspectpath="first-aspect.jar" inpath="application.jar" outjar="second-aspect.jar"> + <message kind="warning" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard [Xlint:noGuardForLazyTjp]"/> + <message kind="warning" text="at this shadow method-execution(void Application.greet(java.lang.String)) no precedence is specified between advice applying from aspect FirstAspect and aspect SecondAspect [Xlint:unorderedAdviceAtShadow]"/> + <message kind="warning" text="can not implement lazyTjp at joinpoint method-execution(void Application.greet(java.lang.String)) because of advice conflicts, see secondary locations to find conflicting advice [Xlint:multipleAdviceStoppingLazyTjp]"/> + <message kind="weave" text="method-execution(void Application.greet(java.lang.String))' in Type 'Application' (Application.java:4) advised by around advice from 'SecondAspect'"/> + <message kind="weave" text="method-execution(void Application.greet(java.lang.String))' in Type 'Application' (Application.java:4) advised by before advice from 'FirstAspect'"/> + </compile> + <run class="Application" classpath="$sandbox/second-aspect.jar,$sandbox/first-aspect.jar"> + <stdout> + <line text="FirstAspect: execution(void Application.greet(String))"/> + <line text="SecondAspect: execution(void Application.greet(String))"/> + <line text="Hello world!"/> + </stdout> + </run> + </ajc-test> + + <!-- https://github.com/eclipse-aspectj/aspectj/issues/246 --> + <ajc-test dir="bugs1920/github_246" vm="8" title="add correct annotations to multiple ITD methods with the same name and same number of arguments"> + <compile files="First.java Second.java App.java ITDAspect.aj" options="-8"/> + <run class="App"> + <stdout> + <line text="[@Second()] public int App.foo(int[])"/> + <line text="[@First()] public void App.foo(java.lang.String)"/> + <line text="[] public void App.foo(java.lang.String[])"/> + <line text="[@First(), @Second()] public void App.foo(java.lang.Object)"/> + <line text="[@Second()] public int App.foo(int)"/> + </stdout> + </run> + </ajc-test> + + <!-- https://github.com/eclipse-aspectj/aspectj/issues/250 --> + <ajc-test dir="bugs1920/github_250" vm="8" title="correctly handle overloaded private methods in aspects"> + <compile files="MyAspect.aj" options="-8"/> + <run class="MyAspect"> + <stdout> + <line text="execution(void Application.doSomething())"/> + <line text="1 / one"/> + <line text="execution(void Application.doSomething())"/> + <line text="2"/> + </stdout> + </run> + </ajc-test> + + <!-- https://github.com/spring-projects/spring-framework/issues/27761 --> + <ajc-test dir="bugs1921/gh_spring_27761" vm="8" title="do not match bridge methods"> + <!-- (1) Use ASM to generate JpaRepository class with reordered methods --> + <compile files="JpaRepositoryDump.java" options="-8"/> + <run class="JpaRepositoryDump" options="$sandbox"/> + <file deletefile="JpaRepositoryDump.class"/> + <!-- (2) Use AJC to compile the remaining classes and run the test --> + <compile files="RepositoryAspect.aj" options="-8"/> + <run class="RepositoryAspect"> + <stdout> + <line text="execution(List RepositoryImpl.saveAll(Iterable))"/> + <line text="Saving [One, Two, Three]"/> + </stdout> + </run> + </ajc-test> + + <!-- https://github.com/eclipse-aspectj/aspectj/issues/257 --> + <ajc-test dir="bugs1921/gh_257" vm="8" title="handle negated type patterns correctly"> + <compile files="NegatedTypeAspect.aj" options="-8"/> + <run class="NegatedTypeAspect"> + <stdout> + <line text="[SETTER] execution(void Person.setId(int))"/> + <line text="[SETTER] execution(void Person.setFirstName(String))"/> + <line text="[SETTER] execution(void Person.setLastName(String))"/> + <line text="Person(id=11, lastName='Curie', firstName='Marie')"/> + <line text="[GETTER] execution(int Person.getId())"/> + <line text="[NON-STRING GETTER] execution(int Person.getId())"/> + <line text="[NON-STRING-ARRAY GETTER] execution(int Person.getId())"/> + <line text="[NON-STRING-ARRAY-ARRAY GETTER] execution(int Person.getId())"/> + <line text="[GETTER] execution(String Person.getFirstName())"/> + <line text="[NON-STRING-ARRAY GETTER] execution(String Person.getFirstName())"/> + <line text="[NON-STRING-ARRAY-ARRAY GETTER] execution(String Person.getFirstName())"/> + <line text="[GETTER] execution(String Person.getLastName())"/> + <line text="[NON-STRING-ARRAY GETTER] execution(String Person.getLastName())"/> + <line text="[NON-STRING-ARRAY-ARRAY GETTER] execution(String Person.getLastName())"/> + <line text="Marie Curie"/> + <line text="[SETTER] execution(void Person.setFullName(String))"/> + <line text="[SETTER] execution(void Person.setId(int))"/> + <line text="Person(id=22, lastName='Einstein', firstName='Albert')"/> + <line text="Einstein, Albert"/> + <line text="[NON-STRING GETTER] execution(void Person.getVoid())"/> + <line text="[NON-STRING-ARRAY GETTER] execution(void Person.getVoid())"/> + <line text="[NON-STRING-ARRAY-ARRAY GETTER] execution(void Person.getVoid())"/> + <line text="[GETTER] execution(String[] Person.getStringArray())"/> + <line text="[NON-STRING GETTER] execution(String[] Person.getStringArray())"/> + <line text="[STRING-ARRAY GETTER] execution(String[] Person.getStringArray())"/> + <line text="[NON-STRING-ARRAY-ARRAY GETTER] execution(String[] Person.getStringArray())"/> + <line text="[Hello, world]"/> + <line text="[GETTER] execution(String[][] Person.getStringArrayArray())"/> + <line text="[NON-STRING GETTER] execution(String[][] Person.getStringArrayArray())"/> + <line text="[NON-STRING-ARRAY GETTER] execution(String[][] Person.getStringArrayArray())"/> + <line text="[[Hello, world], [Hallo, Welt]]"/> + <line text="AspectJ rules!"/> + </stdout> + </run> + </ajc-test> + +</suite> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1921/sanity-tests-21.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/sanity-tests-21.xml new file mode 100644 index 000000000..e7da49fa1 --- /dev/null +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/sanity-tests-21.xml @@ -0,0 +1,70 @@ +<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]> + +<suite> + + <!-- empty class --> + <ajc-test dir="bugs160/simplejava" title="simple - a"> + <compile files="SimpleA.java" options="-21"/> + </ajc-test> + + <!-- class with one method --> + <ajc-test dir="bugs160/simplejava" title="simple - b"> + <compile files="SimpleB.java" options="-21"/> + <run class="SimpleB"/> + </ajc-test> + + <!-- empty aspect --> + <ajc-test dir="bugs160/simplejava" title="simple - c"> + <compile files="SimpleC.java" options="-21"/> + </ajc-test> + + <!-- simple before --> + <ajc-test dir="bugs160/simplejava" title="simple - d"> + <compile files="SimpleD.java" options="-21"/> + </ajc-test> + + <!-- simple itd field --> + <ajc-test dir="bugs160/simplejava" title="simple - e"> + <compile files="SimpleE.java" options="-21"/> + </ajc-test> + + <!-- aspect with main calling a static method --> + <ajc-test dir="bugs160/simplejava" title="simple - f"> + <compile files="SimpleF.java" options="-21"/> + </ajc-test> + + <!-- pertarget --> + <ajc-test dir="bugs160/simplejava" title="simple - g"> + <compile files="SimpleG.java" options="-21"/> + </ajc-test> + + <!-- generic ctor itds --> + <ajc-test dir="bugs160/simplejava" title="simple - h"> + <compile files="SimpleH.java" options="-21"/> + </ajc-test> + + <!-- overriding generic itd methods --> + <ajc-test dir="bugs160/simplejava" title="simple - i"> + <compile files="SimpleI.java" options="-21"/> + </ajc-test> + + <!-- check class file version is 65.0 (Java 21) --> + <ajc-test dir="bugs160/simplejava" title="simple - j"> + <compile files="SimpleJ.java" options="-21"/> + </ajc-test> + + <!-- check class file version is 65.0 (Java 21) --> + <ajc-test dir="bugs160/simplejava" title="simple - k"> + <compile files="SimpleJ.java" options="-source 21"/> + </ajc-test> + + <!-- check class file version is 49.0 --> + <ajc-test dir="bugs160/simplejava" title="simple - m"> + <compile files="SimpleJ.java" options="-1.5"/> + </ajc-test> + + <ajc-test dir="bugs160/simplejava" title="simple - n"> + <compile files="SimpleN.java" options="-21"/> + </ajc-test> + +</suite> diff --git a/util/src/main/java/org/aspectj/util/LangUtil.java b/util/src/main/java/org/aspectj/util/LangUtil.java index 97676ea84..43d100165 100644 --- a/util/src/main/java/org/aspectj/util/LangUtil.java +++ b/util/src/main/java/org/aspectj/util/LangUtil.java @@ -191,6 +191,10 @@ public class LangUtil { return 21 <= vmVersion; } + public static boolean is22VMOrGreater() { + return 22 <= vmVersion; + } + /** * Shorthand for "if null, throw IllegalArgumentException" * |