diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
| commit | 49cb924f5402c9d24379ae1af62def6fa5892649 (patch) | |
| tree | 69844405209043e2e18aa9eef0f01f287bc1ae52 /tests/src/test/java/org/aspectj/systemtest/ajc186 | |
| parent | 82df3f0fc9842758f15f12299c9113e48f1ccb5c (diff) | |
| download | aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.tar.gz aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.zip | |
Upgrade license from CPLv1/EPLv1 to EPLv2
This was required by the Eclipse team as one precondition for the next
release.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests/src/test/java/org/aspectj/systemtest/ajc186')
| -rw-r--r-- | tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java | 22 | ||||
| -rw-r--r-- | tests/src/test/java/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java index be324c279..ba80be718 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2014 Contributors * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement - initial API and implementation @@ -100,7 +100,7 @@ public class Ajc186Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testLambdaBeans() throws Exception { runTest("lambda beans"); - + // Load the 1.8 compiled code URLClassLoader ucl = new URLClassLoader(new URL[] {ajc.getSandboxDirectory().toURI().toURL()},this.getClass().getClassLoader()); Class<?> applicationClass = Class.forName("Application",false,ucl); @@ -108,14 +108,14 @@ public class Ajc186Tests extends org.aspectj.testing.XMLBasedAjcTestCase { Object instance = applicationClass.getDeclaredConstructor().newInstance(); Method works = applicationClass.getDeclaredMethod("fromInnerClass"); works.setAccessible(true); - Runnable r = (Runnable) works.invoke(instance); + Runnable r = (Runnable) works.invoke(instance); // r.getClass().getName() == Application$1 - + Method fails = applicationClass.getDeclaredMethod("fromLambdaExpression"); fails.setAccessible(true); - Runnable r2 = (Runnable) fails.invoke(instance); + Runnable r2 = (Runnable) fails.invoke(instance); // r2.getClass().getName() == Application$$Lambda$1/1652149987 - + // JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "Application"); PointcutParser parser = PointcutParser .getPointcutParserSupportingAllPrimitivesAndUsingSpecifiedClassloaderForResolution(ucl); @@ -127,18 +127,18 @@ public class Ajc186Tests extends org.aspectj.testing.XMLBasedAjcTestCase { context.addContextBinding("beanName", "myBean"); assertTrue(pc.couldMatchJoinPointsInType(r.getClass())); - + context.addContextBinding("beanName", "yourBean"); assertFalse(pc.couldMatchJoinPointsInType(r.getClass())); context.addContextBinding("beanName", "myBean"); assertTrue(pc.couldMatchJoinPointsInType(r2.getClass())); - + context.addContextBinding("beanName", "yourBean"); assertFalse(pc.couldMatchJoinPointsInType(r2.getClass())); } - - + + public void testMissingExtends() throws Exception { runTest("missing extends on generic target"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java b/tests/src/test/java/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java index ff67705de..3b294e207 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2014 Contributors * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement - initial API and implementation |