From 4e5430011fc9283074339b39754b0f07ff5d8a04 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Wed, 17 Mar 2021 23:38:08 +0700 Subject: [PATCH] Add Java 15 / AspectJ 1.9.7 test suite Also fix some minor details in Java 14 suite Signed-off-by: Alexander Kriegisch --- .../XMLBasedAjcTestCaseForJava15Only.java | 39 +++++++ tests/features197/java15/Employee.java | 1 + tests/features197/java15/HiddenClass.java | 6 + tests/features197/java15/HiddenClassDemo.java | 39 +++++++ tests/features197/java15/Manager.java | 1 + tests/features197/java15/Person.java | 5 + tests/features197/java15/PersonAspect.aj | 17 +++ tests/features197/java15/PersonaNonGrata.java | 2 + tests/features197/java15/TopManager.java | 10 ++ .../org/aspectj/systemtest/AllTests19.java | 2 + .../systemtest/ajc196/SanityTestsJava14.java | 9 +- .../ajc197/Ajc197PreviewFeaturesTests.java | 58 ++++++++++ .../systemtest/ajc197/Ajc197Tests.java | 40 +++++++ .../systemtest/ajc197/AllTestsAspectJ197.java | 30 +++++ .../systemtest/ajc197/SanityTestsJava15.java | 87 ++++++++++++++ .../systemtest/ajc196/sanity-tests-14.xml | 24 ++-- .../org/aspectj/systemtest/ajc197/ajc197.xml | 107 ++++++++++++++++++ .../systemtest/ajc197/sanity-tests-15.xml | 69 +++++++++++ .../main/java/org/aspectj/util/LangUtil.java | 4 + 19 files changed, 533 insertions(+), 17 deletions(-) create mode 100644 testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java create mode 100644 tests/features197/java15/Employee.java create mode 100644 tests/features197/java15/HiddenClass.java create mode 100644 tests/features197/java15/HiddenClassDemo.java create mode 100644 tests/features197/java15/Manager.java create mode 100644 tests/features197/java15/Person.java create mode 100644 tests/features197/java15/PersonAspect.aj create mode 100644 tests/features197/java15/PersonaNonGrata.java create mode 100644 tests/features197/java15/TopManager.java create mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197PreviewFeaturesTests.java create mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197Tests.java create mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java create mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java create mode 100644 tests/src/test/resources/org/aspectj/systemtest/ajc197/ajc197.xml create mode 100644 tests/src/test/resources/org/aspectj/systemtest/ajc197/sanity-tests-15.xml diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java new file mode 100644 index 000000000..82fe4045c --- /dev/null +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java @@ -0,0 +1,39 @@ +/* ******************************************************************* + * Copyright (c) 2021 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.testing; + +import org.aspectj.util.LangUtil; + +/** + * Makes sure tests are running on the right level of JDK. + * + * @author Alexander Kriegisch + */ +public abstract class XMLBasedAjcTestCaseForJava15Only extends XMLBasedAjcTestCase { + + @Override + public void runTest(String title) { + // 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." + ); + */ + if (!LangUtil.is15VMOrGreater() || LangUtil.is16VMOrGreater()) { + throw new IllegalStateException( + "These tests should be run on Java 15 only " + + "(e.g. because they use version-specific preview features)" + ); + } + super.runTest(title); + } + +} diff --git a/tests/features197/java15/Employee.java b/tests/features197/java15/Employee.java new file mode 100644 index 000000000..9b0b9da99 --- /dev/null +++ b/tests/features197/java15/Employee.java @@ -0,0 +1 @@ +public final class Employee extends Person {} diff --git a/tests/features197/java15/HiddenClass.java b/tests/features197/java15/HiddenClass.java new file mode 100644 index 000000000..f1ef61166 --- /dev/null +++ b/tests/features197/java15/HiddenClass.java @@ -0,0 +1,6 @@ +public class HiddenClass implements Test { + @Override + public void concat(String... words) { + System.out.println(String.join(" ", words)); + } +} diff --git a/tests/features197/java15/HiddenClassDemo.java b/tests/features197/java15/HiddenClassDemo.java new file mode 100644 index 000000000..0b7f0ab17 --- /dev/null +++ b/tests/features197/java15/HiddenClassDemo.java @@ -0,0 +1,39 @@ +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Constructor; + +import java.io.FileInputStream; + +import static java.lang.invoke.MethodHandles.Lookup.ClassOption.NESTMATE; + +public class HiddenClassDemo { + public static void main(String[] args) throws Throwable { + // Step 1: Create lookup object + MethodHandles.Lookup lookup = MethodHandles.lookup(); + + // Step 2: Fetch or create the class bytes we want to define + byte[] bytes = Thread.currentThread().getContextClassLoader() + .getResourceAsStream("HiddenClass.class") + .readAllBytes(); + + // Step 3: Define hidden class + Class clazz = lookup.defineHiddenClass(bytes, true, NESTMATE).lookupClass(); + // Hidden classes have class names like my.package.MyClass/0x2a23f5, but no canonical name (null) + System.out.println("Hidden class name = " + clazz.getName()); + System.out.println("Hidden class canonical name = " + clazz.getCanonicalName ()); + // Hidden classes cannot be resolved by any class loader (ClassNotFoundException) + try { + Class.forName(clazz.getName()); + } + catch (ClassNotFoundException e) { + System.out.println("Class.forName resolution error = " + e); + } + + //Step 4: Create instance of hidden class object and call interface method + Test test = (Test) clazz.getConstructor(null).newInstance(null); + test.concat("Hello", "from", "dynamically", "defined", "hidden", "class"); + } +} + +interface Test { + void concat(String... words); +} diff --git a/tests/features197/java15/Manager.java b/tests/features197/java15/Manager.java new file mode 100644 index 000000000..09b897d1e --- /dev/null +++ b/tests/features197/java15/Manager.java @@ -0,0 +1 @@ +public non-sealed class Manager extends Person {} diff --git a/tests/features197/java15/Person.java b/tests/features197/java15/Person.java new file mode 100644 index 000000000..cdd87d7f3 --- /dev/null +++ b/tests/features197/java15/Person.java @@ -0,0 +1,5 @@ +public abstract sealed class Person permits Employee, Manager { + public void sayHello(String name) { + System.out.println("Hello " + name); + } +} diff --git a/tests/features197/java15/PersonAspect.aj b/tests/features197/java15/PersonAspect.aj new file mode 100644 index 000000000..695a4de36 --- /dev/null +++ b/tests/features197/java15/PersonAspect.aj @@ -0,0 +1,17 @@ +public aspect PersonAspect { + // Weave into sealed class + void around(String name): execution(void sayHello(*)) && args(name) { + proceed("Sir " + name); + } + + // ITD into non-sealed subclass of sealed class + private String Manager.jobTitle; + + public void TopManager.setJobTitle(String jobTitle) { + this.jobTitle = jobTitle; + } + + public String TopManager.getJobTitle() { + return jobTitle; + } +} diff --git a/tests/features197/java15/PersonaNonGrata.java b/tests/features197/java15/PersonaNonGrata.java new file mode 100644 index 000000000..fc801536d --- /dev/null +++ b/tests/features197/java15/PersonaNonGrata.java @@ -0,0 +1,2 @@ +// This should not compile because Person is sealed and does not allow PersonaNonGrata as a subclass +public final class PersonaNonGrata extends Person {} diff --git a/tests/features197/java15/TopManager.java b/tests/features197/java15/TopManager.java new file mode 100644 index 000000000..e1dfdc367 --- /dev/null +++ b/tests/features197/java15/TopManager.java @@ -0,0 +1,10 @@ +public class TopManager extends Manager { + public static void main(String[] args) { + TopManager topManager = new TopManager(); + topManager.sayHello("John"); + + // Call ITD methods + topManager.setJobTitle("CEO"); + System.out.println(topManager.getJobTitle()); + } +} diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests19.java b/tests/src/test/java/org/aspectj/systemtest/AllTests19.java index 20ecc3894..418ecbff5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests19.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests19.java @@ -16,6 +16,7 @@ import org.aspectj.systemtest.ajc196.AllTestsAspectJ196; import junit.framework.Test; import junit.framework.TestSuite; +import org.aspectj.systemtest.ajc197.AllTestsAspectJ197; /** * @author Andy Clement @@ -32,6 +33,7 @@ public class AllTests19 { // there were no new tests for 1.9.4 suite.addTest(AllTestsAspectJ195.suite()); suite.addTest(AllTestsAspectJ196.suite()); + suite.addTest(AllTestsAspectJ197.suite()); suite.addTest(AllTests18.suite()); // $JUnit-END$ 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 edf08298c..a07e3afa4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java @@ -60,23 +60,22 @@ public class SanityTestsJava14 extends XMLBasedAjcTestCaseForJava14OrLater { runTest("simple - i"); } - public void testVersionCorrect1() throws ClassNotFoundException { + public void testVersionCorrect1() { runTest("simple - j"); checkVersion("A", bytecode_version_for_JDK_level, 0); } - public void testVersionCorrect2() throws ClassNotFoundException { + public void testVersionCorrect2() { runTest("simple - k"); checkVersion("A", bytecode_version_for_JDK_level, 0); } - public void testVersionCorrect4() throws ClassNotFoundException { // check it is 49.0 when -1.5 is specified + public void testVersionCorrect4() { runTest("simple - m"); + // Must be 49.0 when -1.5 is specified checkVersion("A", 49, 0); } - - // /////////////////////////////////////// public static Test suite() { return XMLBasedAjcTestCase.loadSuite(SanityTestsJava14.class); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197PreviewFeaturesTests.java new file mode 100644 index 000000000..2c26ca441 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197PreviewFeaturesTests.java @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2021 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.systemtest.ajc197; + +import junit.framework.Test; +import org.aspectj.apache.bcel.Constants; +import org.aspectj.testing.XMLBasedAjcTestCase; +import org.aspectj.testing.XMLBasedAjcTestCaseForJava15Only; + +/** + * @author Alexander Kriegisch + */ +public class Ajc197PreviewFeaturesTests extends XMLBasedAjcTestCaseForJava15Only { + + public void testRecords() { + runTest("simple record"); + checkVersion("Person", Constants.MAJOR_15, Constants.PREVIEW_MINOR_VERSION); + } + + public void testRecords2() { + runTest("using a record"); + } + + public void testInstanceofPatterns() { + runTest("instanceof patterns"); + } + + public void testAdvisingRecords() { + runTest("advising records"); + } + + public void testSealedClassWithLegalSubclasses() { + runTest("sealed class with legal subclasses"); + } + + public void testSealedClassWithIllegalSubclass() { + runTest("sealed class with illegal subclass"); + } + + public void testWeaveSealedClass() { + runTest("weave sealed class"); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Ajc197PreviewFeaturesTests.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc197.xml"); + } + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197Tests.java new file mode 100644 index 000000000..bd6600f49 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197Tests.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2021 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.systemtest.ajc197; + +import junit.framework.Test; +import org.aspectj.testing.XMLBasedAjcTestCase; +import org.aspectj.testing.XMLBasedAjcTestCaseForJava15OrLater; + +/** + * @author Alexander Kriegisch + */ +public class Ajc197Tests extends XMLBasedAjcTestCaseForJava15OrLater { + + public void testHiddenClass() { + runTest("hidden class"); + } + + public void testTextBlock1() { + runTest("textblock 1"); + } + + public void testTextBlock2() { + runTest("textblock 2"); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Ajc197Tests.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc197.xml"); + } + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java new file mode 100644 index 000000000..2b33099cb --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2021 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.systemtest.ajc197; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.aspectj.util.LangUtil; + +/** + * @author Alexander Kriegisch + */ +public class AllTestsAspectJ197 { + + public static Test suite() { + TestSuite suite = new TestSuite("AspectJ 1.9.7 tests"); + if (LangUtil.is15VMOrGreater()) { + suite.addTest(Ajc197Tests.suite()); + suite.addTest(SanityTestsJava15.suite()); + } + if (LangUtil.is15VMOrGreater() && !LangUtil.is16VMOrGreater()) { + suite.addTest(Ajc197PreviewFeaturesTests.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 new file mode 100644 index 000000000..8a9d5c3bd --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java @@ -0,0 +1,87 @@ +/******************************************************************************* + * Copyright (c) 2021 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.systemtest.ajc197; + +import junit.framework.Test; +import org.aspectj.testing.XMLBasedAjcTestCase; +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 + * to check code generation and modification with that version specified. + * + * @author Alexander Kriegisch + */ +public class SanityTestsJava15 extends XMLBasedAjcTestCaseForJava15OrLater { + + public static final int bytecode_version_for_JDK_level = 59; + + // 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", 49, 0); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(SanityTestsJava15.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("sanity-tests-15.xml"); + } + +} diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc196/sanity-tests-14.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc196/sanity-tests-14.xml index e831c9916..a1a4a81c6 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc196/sanity-tests-14.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc196/sanity-tests-14.xml @@ -12,53 +12,53 @@ - + - + - + - + - + - + - + - + - - + + - + - + diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc197/ajc197.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc197/ajc197.xml new file mode 100644 index 000000000..6f6edaff5 --- /dev/null +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc197/ajc197.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc197/sanity-tests-15.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc197/sanity-tests-15.xml new file mode 100644 index 000000000..e43269da5 --- /dev/null +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc197/sanity-tests-15.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/util/src/main/java/org/aspectj/util/LangUtil.java b/util/src/main/java/org/aspectj/util/LangUtil.java index 1f4ee65b4..a0535d389 100644 --- a/util/src/main/java/org/aspectj/util/LangUtil.java +++ b/util/src/main/java/org/aspectj/util/LangUtil.java @@ -182,6 +182,10 @@ public class LangUtil { return 15 <= vmVersion; } + public static boolean is16VMOrGreater() { + return 16 <= vmVersion; + } + /** * Shorthand for "if null, throw IllegalArgumentException" * -- 2.39.5