aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/test
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2022-01-08 16:06:51 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2022-01-08 16:06:51 +0700
commitde63b63d8264efc9c81aa667546d028859b7a90c (patch)
tree75506eddf1ffe6d81780f091dae73044a3f072f2 /tests/src/test
parent92779d0829d41d55cae300d4d4d5a67cff72916d (diff)
downloadaspectj-de63b63d8264efc9c81aa667546d028859b7a90c.tar.gz
aspectj-de63b63d8264efc9c81aa667546d028859b7a90c.zip
Add test for Java 11 constant-dynamic
Relates to #68. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests/src/test')
-rw-r--r--tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java3
-rw-r--r--tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Java11Tests.java32
-rw-r--r--tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml13
3 files changed, 48 insertions, 0 deletions
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 4aac84810..3cfc7a149 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java
@@ -22,6 +22,9 @@ public class AllTestsAspectJ198 {
if (LangUtil.is9VMOrGreater()) {
suite.addTest(CompileWithReleaseTests.suite());
}
+ if (LangUtil.is11VMOrGreater()) {
+ suite.addTest(Bugs198Java11Tests.suite());
+ }
if (LangUtil.is17VMOrGreater()) {
suite.addTest(SanityTestsJava17.suite());
suite.addTest(Ajc198TestsJava.suite());
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Java11Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Java11Tests.java
new file mode 100644
index 000000000..7e99b7d9f
--- /dev/null
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Java11Tests.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2021 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.ajc198;
+
+import junit.framework.Test;
+import org.aspectj.testing.XMLBasedAjcTestCase;
+import org.aspectj.testing.XMLBasedAjcTestCaseForJava11OrLater;
+
+/**
+ * @author Alexander Kriegisch
+ */
+public class Bugs198Java11Tests extends XMLBasedAjcTestCaseForJava11OrLater {
+
+ public void testGitHub_68() {
+ runTest("correctly weave code using constant-dynamic");
+ }
+
+ public static Test suite() {
+ return XMLBasedAjcTestCase.loadSuite(Bugs198Java11Tests.class);
+ }
+
+ @Override
+ protected java.net.URL getSpecFile() {
+ return getClassResource("ajc198.xml");
+ }
+
+}
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
index dfe86e2a9..202258c94 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
@@ -3,6 +3,19 @@
<suite>
+ <!-- https://github.com/eclipse/org.aspectj/issues/68 -->
+ <ajc-test dir="bugs198/github_68" vm="11" title="correctly weave code using constant-dynamic">
+ <compile files="Application.java MyAspect.aj" options="-11" inpath="condy.jar"/>
+ <run class="Application">
+ <stdout>
+ <line text="execution(CondyCallable())" />
+ <line text="execution(CondyCallable())" />
+ <line text="execution(Application())" />
+ <line text="Sample instance created" />
+ </stdout>
+ </run>
+ </ajc-test>
+
<!-- https://github.com/eclipse/org.aspectj/issues/105 -->
<ajc-test dir="bugs198/github_105" vm="8" title="ITD annotation with mandatory parameter via aspectpath">
<compile files="FooAnnotation.java BarAnnotation.java FooAspect.aj" options="-8" outjar="aspect.jar"/>