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 | |
| 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')
309 files changed, 2184 insertions, 2175 deletions
diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java index ae3d79554..5d915e1ac 100644 --- a/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java +++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationAbstract.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2004 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 - * - * Contributors: - * Wes Isberg initial implementation + * 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 + * + * Contributors: + * Wes Isberg initial implementation * ******************************************************************/ import org.aspectj.testing.Tester; diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java index 1de505a78..f4f52b5d3 100644 --- a/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java +++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationFull.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2004 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 - * - * Contributors: - * Wes Isberg initial implementation + * 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 + * + * Contributors: + * Wes Isberg initial implementation * ******************************************************************/ import org.aspectj.testing.Tester; @@ -29,7 +29,7 @@ public class InterfaceMethodDeclarationFull { interface I {} aspect A { - abstract public int I.getInt(); + abstract public int I.getInt(); before() : execution(int getInt()) && target(I) { Tester.event("before-execution"); } diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java index a1998f6c0..590a208a8 100644 --- a/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java +++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationNonPublic.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2004 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 - * - * Contributors: - * Wes Isberg initial implementation + * 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 + * + * Contributors: + * Wes Isberg initial implementation * ******************************************************************/ import org.aspectj.testing.Tester; diff --git a/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java b/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java index be568c46f..97630395d 100644 --- a/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java +++ b/tests/bugs/interAbstract/InterfaceMethodDeclarationNone.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2004 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 - * - * Contributors: - * Wes Isberg initial implementation + * 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 + * + * Contributors: + * Wes Isberg initial implementation * ******************************************************************/ import org.aspectj.testing.Tester; diff --git a/tests/bugs/seven/lint/Main.java b/tests/bugs/seven/lint/Main.java index 24aa38b3e..3bc98c382 100644 --- a/tests/bugs/seven/lint/Main.java +++ b/tests/bugs/seven/lint/Main.java @@ -1,13 +1,13 @@ /* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html + * 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 * * Created on 25.03.2005 - * + * * Contributors * Oliver Boehm initial implementation */ @@ -19,64 +19,64 @@ import org.aspectj.lang.annotation.SuppressAjWarnings; * Test Aspect to check the different Xlint warnings */ aspect XlintTest { - + /* * examples for "invalidAbsoluteTypeName" */ - + pointcut correctName() : call(String java.lang.Object.toString()); - + pointcut wrongPackageName() : call(String java.xxx.Object.toString()); - + pointcut wrongTypeName() : call(String java.lang.Xxx.toString()); - + /** no warning!!! */ pointcut wrongMethodName() : call(String java.lang.Object.xxx()); - + @SuppressAjWarnings after() : call(String java.lang.Xxx.toString()) { System.out.println(thisJoinPoint); } - - - + + + /* * no example for "invalidWildcardTypeName" - * + * * Never signalled anywhere in the codebase * @see http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg01404.html */ - - + + /* * example for "unresolvableMember" - * + * * hard to reproduce - I tried different things but at last I give up * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=59596#c2 */ - - - + + + /* * example for "typeNotExposedToWeaver" */ - + public int Object.dummy = 0; - - - + + + /* * no example for "shadowNotInStructure" - * + * * Signalled if the structure model is broken, probably can't happen * @see http://dev.eclipse.org/mhonarc/lists/aspectj-dev/msg01404.html */ - + /* @@ -88,35 +88,35 @@ aspect XlintTest { pointcut matchedToStringCall() : call(String Object.toString()) && target(Car); - + before() : unmatchedToStringCall() && !within(XlintTest) { System.out.println(thisJoinPoint); } - + @SuppressAjWarnings before() : call(String Car.toString()) { System.out.println(thisJoinPoint); } - + @SuppressAjWarnings({"adviceDidNotMatch"}) before() : call(* java.lang.String.helloWorld()) { System.out.println(thisJoinPoint); } - - + + /* * example for "canNotImplementLazyTjp" - * + * * This example is from the README-12.html. To get the warning you must * compile it with "-XlazyTjp" - * + * * NOTE: The expected warnung does not appear. I don't know why. * Here is the commandline: * ajc -XlazyTjp -Xlint:warning -inpath src -d classes src */ - + public static boolean enabled = false; - + pointcut toBeTraced() : execution(* *(..)) && !within(XlintTest); Object around() : toBeTraced() && if(enabled) { @@ -125,20 +125,20 @@ aspect XlintTest { return proceed(); } - - + + /* * example for "needsSerialVersionUIDField" */ - + declare parents : Main implements java.io.Serializable; - - - + + + /* * example for "brokeSerialVersionCompatibility" - * - * NOTE: I don't see this warning inside Eclipse with + * + * NOTE: I don't see this warning inside Eclipse with * AJDT 1.2.0.20050308091611 although I activate the warning * via the project properties. * I see it only when I start the compiler from the commandline @@ -147,15 +147,15 @@ aspect XlintTest { public int Car.breakSerial = 1; - - + + /* * example for "noInterfaceCtorJoinpoint" */ - + pointcut interfaceConstructor() : execution(java.util.List.new()); - + } class Car implements Serializable {} @@ -171,7 +171,7 @@ public class Main extends Object { Long l = new Long(1); String s = l.toString(); } - + public void run() { new Car().toString(); } diff --git a/tests/bugs153/pr132080/AbstractSuperAspect.aj b/tests/bugs153/pr132080/AbstractSuperAspect.aj index 9692579b9..2a9e5a022 100644 --- a/tests/bugs153/pr132080/AbstractSuperAspect.aj +++ b/tests/bugs153/pr132080/AbstractSuperAspect.aj @@ -1,19 +1,19 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ public abstract aspect AbstractSuperAspect { - + protected abstract pointcut scope (); - + before () : execution(public static void main(String[])) && scope() { System.out.println("? " + thisJoinPoint.getSignature()); } diff --git a/tests/bugs161/pr230134/HelloWorldTracing.java b/tests/bugs161/pr230134/HelloWorldTracing.java index 1115a876d..cff6e3188 100644 --- a/tests/bugs161/pr230134/HelloWorldTracing.java +++ b/tests/bugs161/pr230134/HelloWorldTracing.java @@ -1,12 +1,12 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. * 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: - * Matthew Webster initial implementation + * Matthew Webster initial implementation *******************************************************************************/ package demo.hello.tracing; @@ -20,12 +20,12 @@ public aspect HelloWorldTracing extends SimpleTracing { /** * Template method that allows choice of destination for output - * + * * @param s message to be traced */ protected void println (String s) { System.out.println(s); } - + } diff --git a/tests/bugs161/pr230134/SimpleTracing.java b/tests/bugs161/pr230134/SimpleTracing.java index 97f92da8a..e9ef6391f 100644 --- a/tests/bugs161/pr230134/SimpleTracing.java +++ b/tests/bugs161/pr230134/SimpleTracing.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 + * 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 - * http://www.eclipse.org/legal/cpl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Matthew Webster - initial implementation * Sian January @@ -22,9 +22,9 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.CodeSignature; /** - * This simple abstract aspect is enabled by default and traces method - * signatures as well as arguments to stderr. An abstract scoping pointcut - * is provided for concrete, user-supplied sub-aspect to determine which + * This simple abstract aspect is enabled by default and traces method + * signatures as well as arguments to stderr. An abstract scoping pointcut + * is provided for concrete, user-supplied sub-aspect to determine which * classes should be traced. */ public abstract aspect SimpleTracing extends Tracing { @@ -35,16 +35,16 @@ public abstract aspect SimpleTracing extends Tracing { protected abstract pointcut tracingScope (); private static SimpleDateFormat timeFormat; - + /** * Enabled or disable tracing - * - * @param enabled + * + * @param enabled */ public static void setEnabled (boolean enabled) { tracingEnabled = enabled; } - + public static boolean getEnabled () { return tracingEnabled; } @@ -56,7 +56,7 @@ public abstract aspect SimpleTracing extends Tracing { */ protected pointcut shouldTrace () : if(tracingEnabled) && tracingScope(); - + private static boolean tracingEnabled = getBoolean("org.aspectj.lib.tracing",true); private static boolean getBoolean (String name, boolean def) { @@ -73,31 +73,31 @@ public abstract aspect SimpleTracing extends Tracing { println(signature.getDeclaringType(),formatMessage(">",signature.getDeclaringTypeName(),signature.getName(),obj,jp.getArgs())); // println("> " + signature.toShortString() + " " + formatParam("obj",obj) + " " + formatArgs(signature.getParameterNames(),jp.getArgs())); } - + protected void enter (JoinPoint jp) { CodeSignature signature = (CodeSignature)jp.getSignature(); println(signature.getDeclaringType(),formatMessage(">",signature.getDeclaringTypeName(),signature.getName(),null,jp.getArgs())); // println("> " + jp.getSignature().toShortString() + " " + formatArgs(signature.getParameterNames(),jp.getArgs())); } - + protected void exit (JoinPoint.StaticPart sjp, Object ret) { CodeSignature signature = (CodeSignature)sjp.getSignature(); println(signature.getDeclaringType(),formatMessage("<",signature.getDeclaringTypeName(),signature.getName(),ret,null)); // println("< " + sjp.getSignature().toShortString() + " " + formatParam("ret",ret)); } - + protected void exit (JoinPoint.StaticPart sjp) { CodeSignature signature = (CodeSignature)sjp.getSignature(); println(signature.getDeclaringType(),formatMessage("<",signature.getDeclaringTypeName(),signature.getName(),null,null)); // println("< " + sjp.getSignature().toShortString()); } - + protected void exception (JoinPoint.StaticPart sjp, Throwable th) { CodeSignature signature = (CodeSignature)sjp.getSignature(); println(signature.getDeclaringType(),formatMessage("E",signature.getName(),th)); // println("E " + sjp.getSignature().toShortString() + " " + th.toString()); } - + /* * Formatting */ @@ -113,7 +113,7 @@ public abstract aspect SimpleTracing extends Tracing { if (args != null) message.append(" ").append(formatArgs(args)); return message.toString(); } - + protected String formatMessage(String kind, String text, Throwable th) { StringBuffer message = new StringBuffer(); Date now = new Date(); @@ -125,33 +125,33 @@ public abstract aspect SimpleTracing extends Tracing { return message.toString(); } - /** + /** * Format arguments into a comma separated list - * + * * @param names array of argument names * @param args array of arguments * @return the formated list */ protected String formatArgs(Object[] args) { StringBuffer sb = new StringBuffer(); - + for (int i = 0; i < args.length; i++) { sb.append(formatObj(args[i])); if (i < args.length-1) sb.append(", "); } - + return sb.toString(); } /** * Format objects safely avoiding toString which can cause recursion, * NullPointerExceptions or highly verbose results. - * + * * @param obj parameter to be formatted * @return the formated parameter */ protected Object formatObj(Object obj) { - + /* These classes have a safe implementation of toString() */ if (obj == null || obj instanceof String @@ -171,35 +171,35 @@ public abstract aspect SimpleTracing extends Tracing { return formatCollection((Collection)obj); } else try { - + /* Use classname@hashcode */ return obj.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(obj)); - - /* Object.hashCode() can be override and may thow an exception */ + + /* Object.hashCode() can be override and may thow an exception */ } catch (Exception ex) { return obj.getClass().getName() + "@FFFFFFFF"; } } - + protected String formatArray (Object obj) { - return obj.getClass().getComponentType().getName() + "[" + Array.getLength(obj) + "]"; + return obj.getClass().getComponentType().getName() + "[" + Array.getLength(obj) + "]"; } - + protected String formatCollection (Collection c) { - return c.getClass().getName() + "(" + c.size() + ")"; + return c.getClass().getName() + "(" + c.size() + ")"; } - + private static String formatDate (Date date) { if (timeFormat == null) { timeFormat = new SimpleDateFormat("HH:mm:ss.SSS"); } - + return timeFormat.format(date); } /** * Template method that allows choice of destination for output - * + * * @param s message to be traced */ protected void println (Class clazz, String s) { diff --git a/tests/bugs161/pr230134/Tracing.java b/tests/bugs161/pr230134/Tracing.java index 2029bc968..1f3b76753 100644 --- a/tests/bugs161/pr230134/Tracing.java +++ b/tests/bugs161/pr230134/Tracing.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 + * 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 - * http://www.eclipse.org/legal/cpl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Matthew Webster - initial implementation * Sian January @@ -14,18 +14,18 @@ package org.aspectj.lib.tracing; import org.aspectj.lang.*; /** - * This root abstract aspect determines the basic tracing behaviour - * i.e. entry/exit/exception using the method/constructor execution() pointcut - * and before/after returning/after throwing advice. Determining what - * methods and constructors belonging to which classes is delegated to a - * user-supplied concrete aspect using an abstract pointcut. When tracing - * occurs and what is done with the captured data is delegated to an abstract, + * This root abstract aspect determines the basic tracing behaviour + * i.e. entry/exit/exception using the method/constructor execution() pointcut + * and before/after returning/after throwing advice. Determining what + * methods and constructors belonging to which classes is delegated to a + * user-supplied concrete aspect using an abstract pointcut. When tracing + * occurs and what is done with the captured data is delegated to an abstract, * infrastructure-specific sub-aspect through template methods. */ public abstract aspect Tracing { /** - * Sub-aspects <b>must</b> implement this pointcut to determine what and when to + * Sub-aspects <b>must</b> implement this pointcut to determine what and when to * trace */ protected abstract pointcut shouldTrace (); @@ -33,14 +33,14 @@ public abstract aspect Tracing { private pointcut staticContext () : !this(Object); private pointcut nonStaticContext (Object obj) : this(obj); private pointcut voidMethod () : execution(void *(..)); - + public final static pointcut methodExecution () : execution(* *(..)); public final static pointcut constructorExecution () : execution(new(..)); public final static pointcut objectMethod () : execution(* Object.*(..)); - /** - * Sub-aspects <b>may</b> override this point to determine which methods if any - * are traced. By default include only public methods and those not inherited + /** + * Sub-aspects <b>may</b> override this point to determine which methods if any + * are traced. By default include only public methods and those not inherited * from java.lang.Object e.g. toString(). */ protected pointcut includedMethod () : @@ -48,18 +48,18 @@ public abstract aspect Tracing { && !objectMethod(); - /** - * Sub-aspects <b>may</b> override this point to determine which constructors if any + /** + * Sub-aspects <b>may</b> override this point to determine which constructors if any * are traced. By default include only public constructors. */ protected pointcut includedConstructor () : execution(public new(..)); - + /* - * Exclude methods and constructors in Tracing and sub-aspects as well as + * Exclude methods and constructors in Tracing and sub-aspects as well as * those in the control flow of Tracing advice or constructors to avoid recursion. */ - private pointcut excluded () : + private pointcut excluded () : within(Tracing+) // || cflow((adviceexecution() || execution(new(..))) && within(Tracing+)) || cflow((adviceexecution() && within(Tracing+))) @@ -83,106 +83,106 @@ public abstract aspect Tracing { && !excluded() && this(obj) ; - + /* * Trace entry to instance methods - * + * * Tracing pattern 1: Only use thisJoinPoint in before() */ before (Object obj) : tracedMethod() && nonStaticContext(obj) && shouldTrace() { enter(thisJoinPoint,obj); } - + /* * Trace entry to static methods - * + * * Tracing pattern 1: Only use thisJoinPoint in before() */ before () : tracedMethod() && staticContext() && shouldTrace() { enter(thisJoinPoint); } - + /* * Trace exit from void methods - * + * * Tracing pattern 1: Use thisJoinPointStaticPart in after() */ after() returning() : tracedMethod() && voidMethod() && shouldTrace() { exit(thisJoinPointStaticPart); } - + /* * Trace exit from non-void methods including return value - * + * * Tracing pattern 1: Use thisJoinPointStaticPart in after() */ after() returning(Object ret) : tracedMethod() && !voidMethod() && shouldTrace() { exit(thisJoinPointStaticPart,ret); } - + /* * Trace exceptions thrown from methods and constructors - * + * * Tracing pattern 1: Use thisJoinPointStaticPart in after() */ after() throwing(Throwable th) : (tracedMethod() || tracedConstructor(Object)) && shouldTrace() { if (shouldTrace(th)) exception(thisJoinPointStaticPart,th); } - + /* * Trace entry to constructors - * + * * Tracing pattern 1: Only use thisJoinPoint in before() */ before () : tracedConstructor(Object) && shouldTrace() { enter(thisJoinPoint); } - + /* * Trace exit from constructors including new object - * + * * Tracing pattern 1: Only use thisJoinPoint in before() */ after (Object obj) : tracedConstructor(obj) && shouldTrace() { exit(thisJoinPointStaticPart,obj); } - + /* * Template methods to log data implemented by infrastructure-specific sub-aspects - * e.g. java.util.logging.Logger + * e.g. java.util.logging.Logger */ protected abstract void enter (JoinPoint jp, Object obj); - + protected abstract void enter (JoinPoint jp); - + protected abstract void exit (JoinPoint.StaticPart sjp); - + protected abstract void exit (JoinPoint.StaticPart sjp, Object ret); - + protected abstract void exception (JoinPoint.StaticPart sjp, Throwable th); - /** + /** * Format arguments into a comma separated list - * + * * @param names array of argument names * @param args array of arguments * @return the formated list */ protected String formatArgs (String[] names, Object[] args) { StringBuffer sb = new StringBuffer(); - + for (int i = 0; i < args.length; i++) { sb.append(formatParam(names[i],args[i])); if (i < args.length-1) sb.append(", "); } - + return sb.toString(); } - + /** * Format objects safely avoiding toString which can cause recursion, * NullPointerExceptions or highly verbose results. - * + * * @param obj parameter to be formatted * @return the formated parameter */ @@ -201,10 +201,10 @@ public abstract aspect Tracing { return obj.getClass().getName(); } } - + /** * Format parameter into name=value pair - * + * * @param name parameter name * @param arg parameted to be formatted * @return the formated parameter @@ -212,11 +212,11 @@ public abstract aspect Tracing { protected String formatParam (String name, Object arg) { return name + "=" + formatObj(arg); } - + /** - * By default we do not trace errors e.g. OutOfMemoryError because the + * By default we do not trace errors e.g. OutOfMemoryError because the * system my be in an inconsistent state. However users may override this - * + * * @param th excpeption or error to be traced * @return whether it should be traced */ diff --git a/tests/bugs1610/pr324932/A.java b/tests/bugs1610/pr324932/A.java index e71f2a044..6de6affd0 100644 --- a/tests/bugs1610/pr324932/A.java +++ b/tests/bugs1610/pr324932/A.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2010 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 - Repro test case - * Abraham Nevado + * Abraham Nevado *******************************************************************************/ class AtomicAction { @@ -19,9 +19,9 @@ public class A { public static void main(String []argv) { System.out.println("It WORKS"); } - - AtomicAction f; - + + AtomicAction f; + public void m() { switch (f.status()) { case 1: @@ -32,7 +32,7 @@ public class A { } switch (f.commit(1)) { case 1: - throw new RuntimeException(); + throw new RuntimeException(); } } diff --git a/tests/bugs1610/pr324932/X.aj b/tests/bugs1610/pr324932/X.aj index 8b6d046ee..24d752de2 100644 --- a/tests/bugs1610/pr324932/X.aj +++ b/tests/bugs1610/pr324932/X.aj @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2010 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 - Repro test case - * Abraham Nevado + * Abraham Nevado *******************************************************************************/ aspect X { diff --git a/tests/bugs1610/pr324932_2/A.java b/tests/bugs1610/pr324932_2/A.java index 1e998ff07..0cbdbd592 100644 --- a/tests/bugs1610/pr324932_2/A.java +++ b/tests/bugs1610/pr324932_2/A.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2010 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 - Repro test case - * Abraham Nevado + * Abraham Nevado *******************************************************************************/ aspect X { @@ -20,7 +20,7 @@ aspect X { } interface LogNoi18n { -boolean isDebugEnabled(); +boolean isDebugEnabled(); void debug(String message); String getString(String key); } @@ -39,10 +39,10 @@ class RollbackException extends RuntimeException { public class A { public static void main(String []argv) { System.out.println("It WORKS"); -int i = 1; +int i = 1; } static LogNoi18n logger; - AtomicAction _theTransaction; + AtomicAction _theTransaction; Throwable _rollbackOnlyCallerStacktrace; public void m() { if (logger.isDebugEnabled()) { @@ -75,11 +75,11 @@ int i = 1; RollbackException o = new RollbackException(logger.getString("inactive")); if (_rollbackOnlyCallerStacktrace!=null) { o.initCause(_rollbackOnlyCallerStacktrace); - } else + } else if (_theTransaction.getDeferredThrowable()!=null) { o.initCause(_theTransaction.getDeferredThrowable()); } - + throw o; default: throw new RuntimeException(logger.getString("inactive")); diff --git a/tests/bugs1611/pr335783/A.java b/tests/bugs1611/pr335783/A.java index 5b399ea20..a7b2d13c2 100644 --- a/tests/bugs1611/pr335783/A.java +++ b/tests/bugs1611/pr335783/A.java @@ -8,31 +8,31 @@ /******************************************************************************* * Copyright (c) 2010 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 - Repro test case - * Abraham Nevado + * Abraham Nevado *******************************************************************************/ public class A implements java.io.Serializable{ - - public A() - { - } - public void doSomething() throws Exception - { - - - } - public static void main(String[] args) throws Exception { - A lc = new A(); - lc.doSomething(); - - } + + public A() + { + } + public void doSomething() throws Exception + { + + + } + public static void main(String[] args) throws Exception { + A lc = new A(); + lc.doSomething(); + + } } - + diff --git a/tests/bugs1611/pr335783/X.aj b/tests/bugs1611/pr335783/X.aj index c14cd2bac..e854772c6 100644 --- a/tests/bugs1611/pr335783/X.aj +++ b/tests/bugs1611/pr335783/X.aj @@ -1,15 +1,15 @@ /******************************************************************************* * Copyright (c) 2010 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 - * + * 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 + * * Contributors: Abraham Nevado *******************************************************************************/ aspect X { - public pointcut doSomething(Object o): + public pointcut doSomething(Object o): execution(* *()) && target(o); before(Object o) : doSomething(o) { diff --git a/tests/features171/pr386341/A.java b/tests/features171/pr386341/A.java index 98bbf4fb4..4e7930e91 100644 --- a/tests/features171/pr386341/A.java +++ b/tests/features171/pr386341/A.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2010 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 - Repro test case - * Abraham Nevado + * Abraham Nevado *******************************************************************************/ class AtomicAction { @@ -20,7 +20,7 @@ public class A { A a = new A(); a.m(); } - + public void m() throws Exception{ Thread.sleep(5*1000); } diff --git a/tests/features171/pr386341/X.aj b/tests/features171/pr386341/X.aj index b96b73ad1..3f467b539 100644 --- a/tests/features171/pr386341/X.aj +++ b/tests/features171/pr386341/X.aj @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2010 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 - Repro test case - * Abraham Nevado + * Abraham Nevado *******************************************************************************/ aspect X { diff --git a/tests/harness/classpathTest/classpath-src/build.xml b/tests/harness/classpathTest/classpath-src/build.xml index 3cc258f19..c1c71c438 100644 --- a/tests/harness/classpathTest/classpath-src/build.xml +++ b/tests/harness/classpathTest/classpath-src/build.xml @@ -3,9 +3,9 @@ <!-- Copyright (c) 2002 Wes Isberg --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Eclipse Public License v1.0 --> +<!-- 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: --> <!-- Xerox/PARC initial implementation --> @@ -14,38 +14,38 @@ <project name="classpath-test" default="all" basedir="."> - <target name="init.variables" + <target name="init.variables" description="setup variables - user defines aspectj.lib.dir"> <!-- required directories - run from examples or predefine --> <property name="test.base.dir" - location="${basedir}/.."/> + location="${basedir}/.."/> <property name="classes.dir" - location="${test.base.dir}/classesDir"/> + location="${test.base.dir}/classesDir"/> <property name="jar.dir" - location="${test.base.dir}/jars"/> + location="${test.base.dir}/jars"/> + - <!-- caller must define aspectj.lib.dir --> <property name="aspectj.lib.dir" - location="lib"/> + location="lib"/> <property name="aspectjrt.jar" - location="${aspectj.lib.dir}/aspectjrt.jar"/> + location="${aspectj.lib.dir}/aspectjrt.jar"/> <available file="${aspectjrt.jar}" property="aspectjrt.jar.available"/> <fail unless="aspectjrt.jar.available" message="expecting aspectjrt.jar at ${aspectjrt.jar}"/> <property name="aspectjtools.jar" - location="${aspectj.lib.dir}/aspectjtools.jar"/> + location="${aspectj.lib.dir}/aspectjtools.jar"/> <available file="${aspectjtools.jar}" property="aspectjtools.jar.available"/> <fail unless="aspectjtools.jar.available" message="expecting aspectjtools.jar at ${aspectjtools.jar}"/> <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"> - <classpath> - <pathelement path="${aspectjtools.jar}"/> + <classpath> + <pathelement path="${aspectjtools.jar}"/> </classpath> </taskdef> @@ -55,15 +55,15 @@ <iajc outjar="${jar.dir}/required.jar" sourceroots="${test.base.dir}/classpath-src/classjar"> <classpath> - <pathelement path="${aspectjrt.jar}"/> + <pathelement path="${aspectjrt.jar}"/> </classpath> </iajc> <iajc outjar="${jar.dir}/requiredAspects.jar" sourceroots="${test.base.dir}/classpath-src/aspectjar"> <classpath> - <pathelement path="${aspectjrt.jar}"/> - <pathelement path="${test.base.dir}/../../../lib/test/testing-client.jar"/> + <pathelement path="${aspectjrt.jar}"/> + <pathelement path="${test.base.dir}/../../../lib/test/testing-client.jar"/> </classpath> </iajc> @@ -73,7 +73,7 @@ <iajc destdir="${classes.dir}" sourceroots="${test.base.dir}/classpath-src/classesDir"> <classpath> - <pathelement path="${aspectjrt.jar}"/> + <pathelement path="${aspectjrt.jar}"/> </classpath> </iajc> </target> diff --git a/tests/incrementalju/injarTests/classAdded/src/World.java b/tests/incrementalju/injarTests/classAdded/src/World.java index 01abd2556..37e96957e 100644 --- a/tests/incrementalju/injarTests/classAdded/src/World.java +++ b/tests/incrementalju/injarTests/classAdded/src/World.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ public aspect World { - + after() returning : execution(* Hello.*(..)) { System.out.println("World"); } -}
\ No newline at end of file +} diff --git a/tests/incrementalju/injarTests/classRemoved/src/World.java b/tests/incrementalju/injarTests/classRemoved/src/World.java index 01abd2556..37e96957e 100644 --- a/tests/incrementalju/injarTests/classRemoved/src/World.java +++ b/tests/incrementalju/injarTests/classRemoved/src/World.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ public aspect World { - + after() returning : execution(* Hello.*(..)) { System.out.println("World"); } -}
\ No newline at end of file +} diff --git a/tests/incrementalju/injarTests/src/Hello.java b/tests/incrementalju/injarTests/src/Hello.java index 35fd5bb79..7cd6c23e7 100644 --- a/tests/incrementalju/injarTests/src/Hello.java +++ b/tests/incrementalju/injarTests/src/Hello.java @@ -1,22 +1,22 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ /** * Used to generate Hello.class that is placed in indir for these resource tests. */ public class Hello { - + public static void main(String[] args) { System.out.println("hello"); } - -}
\ No newline at end of file + +} diff --git a/tests/incrementalju/injarTests/src/Hello2.java b/tests/incrementalju/injarTests/src/Hello2.java index 7d8446cb9..641b943b2 100644 --- a/tests/incrementalju/injarTests/src/Hello2.java +++ b/tests/incrementalju/injarTests/src/Hello2.java @@ -1,22 +1,22 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ /** * Used to generate Hello2.class that is placed in MyJar.jar for these tests. */ public class Hello2 { - + public static void main(String[] args) { System.out.println("hello"); } - -}
\ No newline at end of file + +} diff --git a/tests/incrementalju/inpathDirTests/classAdded/src/World.java b/tests/incrementalju/inpathDirTests/classAdded/src/World.java index 01abd2556..37e96957e 100644 --- a/tests/incrementalju/inpathDirTests/classAdded/src/World.java +++ b/tests/incrementalju/inpathDirTests/classAdded/src/World.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ public aspect World { - + after() returning : execution(* Hello.*(..)) { System.out.println("World"); } -}
\ No newline at end of file +} diff --git a/tests/incrementalju/inpathDirTests/classRemoved/src/World.java b/tests/incrementalju/inpathDirTests/classRemoved/src/World.java index 01abd2556..37e96957e 100644 --- a/tests/incrementalju/inpathDirTests/classRemoved/src/World.java +++ b/tests/incrementalju/inpathDirTests/classRemoved/src/World.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ public aspect World { - + after() returning : execution(* Hello.*(..)) { System.out.println("World"); } -}
\ No newline at end of file +} diff --git a/tests/incrementalju/inpathDirTests/classUpdated/src/World.java b/tests/incrementalju/inpathDirTests/classUpdated/src/World.java index 01abd2556..37e96957e 100644 --- a/tests/incrementalju/inpathDirTests/classUpdated/src/World.java +++ b/tests/incrementalju/inpathDirTests/classUpdated/src/World.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ public aspect World { - + after() returning : execution(* Hello.*(..)) { System.out.println("World"); } -}
\ No newline at end of file +} diff --git a/tests/incrementalju/inpathDirTests/src/Hello.20.java b/tests/incrementalju/inpathDirTests/src/Hello.20.java index b1f656f86..b86073158 100644 --- a/tests/incrementalju/inpathDirTests/src/Hello.20.java +++ b/tests/incrementalju/inpathDirTests/src/Hello.20.java @@ -1,22 +1,22 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ /** * Used to generate Hello.class that is placed in indir for these resource tests. */ public class Hello { - + public static void main(String[] args) { System.out.println("updated hello"); } - + } diff --git a/tests/incrementalju/inpathDirTests/src/Hello.java b/tests/incrementalju/inpathDirTests/src/Hello.java index 35fd5bb79..7cd6c23e7 100644 --- a/tests/incrementalju/inpathDirTests/src/Hello.java +++ b/tests/incrementalju/inpathDirTests/src/Hello.java @@ -1,22 +1,22 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ /** * Used to generate Hello.class that is placed in indir for these resource tests. */ public class Hello { - + public static void main(String[] args) { System.out.println("hello"); } - -}
\ No newline at end of file + +} diff --git a/tests/incrementalju/inpathDirTests/src/Hello2.java b/tests/incrementalju/inpathDirTests/src/Hello2.java index 7d8446cb9..641b943b2 100644 --- a/tests/incrementalju/inpathDirTests/src/Hello2.java +++ b/tests/incrementalju/inpathDirTests/src/Hello2.java @@ -1,22 +1,22 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ /** * Used to generate Hello2.class that is placed in MyJar.jar for these tests. */ public class Hello2 { - + public static void main(String[] args) { System.out.println("hello"); } - -}
\ No newline at end of file + +} diff --git a/tests/incrementalju/resourceTests/resourceAdded/src/World.java b/tests/incrementalju/resourceTests/resourceAdded/src/World.java index 01abd2556..37e96957e 100644 --- a/tests/incrementalju/resourceTests/resourceAdded/src/World.java +++ b/tests/incrementalju/resourceTests/resourceAdded/src/World.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ public aspect World { - + after() returning : execution(* Hello.*(..)) { System.out.println("World"); } -}
\ No newline at end of file +} diff --git a/tests/incrementalju/resourceTests/resourceRemoved/src/World.java b/tests/incrementalju/resourceTests/resourceRemoved/src/World.java index 01abd2556..37e96957e 100644 --- a/tests/incrementalju/resourceTests/resourceRemoved/src/World.java +++ b/tests/incrementalju/resourceTests/resourceRemoved/src/World.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ public aspect World { - + after() returning : execution(* Hello.*(..)) { System.out.println("World"); } -}
\ No newline at end of file +} diff --git a/tests/incrementalju/resourceTests/src/Hello.java b/tests/incrementalju/resourceTests/src/Hello.java index 35fd5bb79..7cd6c23e7 100644 --- a/tests/incrementalju/resourceTests/src/Hello.java +++ b/tests/incrementalju/resourceTests/src/Hello.java @@ -1,22 +1,22 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * 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 - * - * Contributors: - * Adrian Colyer, + * 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 + * + * Contributors: + * Adrian Colyer, * ******************************************************************/ /** * Used to generate Hello.class that is placed in indir for these resource tests. */ public class Hello { - + public static void main(String[] args) { System.out.println("hello"); } - -}
\ No newline at end of file + +} diff --git a/tests/java5/annotations/within/PlainWithin.java b/tests/java5/annotations/within/PlainWithin.java index a85466ddc..4ac735873 100644 --- a/tests/java5/annotations/within/PlainWithin.java +++ b/tests/java5/annotations/within/PlainWithin.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/AfterXTest.java b/tests/java5/ataspectj/ataspectj/AfterXTest.java index 270bea9d1..0a5f026bc 100644 --- a/tests/java5/ataspectj/ataspectj/AfterXTest.java +++ b/tests/java5/ataspectj/ataspectj/AfterXTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/AllLTWTests.java b/tests/java5/ataspectj/ataspectj/AllLTWTests.java index b98d7c210..d0f156193 100644 --- a/tests/java5/ataspectj/ataspectj/AllLTWTests.java +++ b/tests/java5/ataspectj/ataspectj/AllLTWTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2005 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: * Alexandre Vasseur initial implementation diff --git a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest.java b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest.java index ed6c4fd94..1ed423767 100644 --- a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest.java +++ b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest2.aj b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest2.aj index beedea36b..4bec873f4 100644 --- a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest2.aj +++ b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTest2.aj @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects.java b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects.java index 5a93d37c3..8eb1dca07 100644 --- a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects.java +++ b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects2.aj b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects2.aj index 59c2b96df..8a694e734 100644 --- a/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects2.aj +++ b/tests/java5/ataspectj/ataspectj/AroundInlineMungerTestAspects2.aj @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/BindingTest.java b/tests/java5/ataspectj/ataspectj/BindingTest.java index 3c30ff101..e67180ec1 100644 --- a/tests/java5/ataspectj/ataspectj/BindingTest.java +++ b/tests/java5/ataspectj/ataspectj/BindingTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/Bug104212.java b/tests/java5/ataspectj/ataspectj/Bug104212.java index d529973d6..64f7f29ca 100644 --- a/tests/java5/ataspectj/ataspectj/Bug104212.java +++ b/tests/java5/ataspectj/ataspectj/Bug104212.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/CflowTest.java b/tests/java5/ataspectj/ataspectj/CflowTest.java index 1dc243b2a..75b994475 100644 --- a/tests/java5/ataspectj/ataspectj/CflowTest.java +++ b/tests/java5/ataspectj/ataspectj/CflowTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/ConcreteAspectTest.aj b/tests/java5/ataspectj/ataspectj/ConcreteAspectTest.aj index d3bcd2136..b028d9b24 100644 --- a/tests/java5/ataspectj/ataspectj/ConcreteAspectTest.aj +++ b/tests/java5/ataspectj/ataspectj/ConcreteAspectTest.aj @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Alexandre Vasseur initial implementation diff --git a/tests/java5/ataspectj/ataspectj/ConcreteAtAspectTest.java b/tests/java5/ataspectj/ataspectj/ConcreteAtAspectTest.java index ef26fbf9a..be327b91d 100644 --- a/tests/java5/ataspectj/ataspectj/ConcreteAtAspectTest.java +++ b/tests/java5/ataspectj/ataspectj/ConcreteAtAspectTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ConcretePrecedenceAspectTest.java b/tests/java5/ataspectj/ataspectj/ConcretePrecedenceAspectTest.java index c873028b1..10545a68d 100644 --- a/tests/java5/ataspectj/ataspectj/ConcretePrecedenceAspectTest.java +++ b/tests/java5/ataspectj/ataspectj/ConcretePrecedenceAspectTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTest.java b/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTest.java index 1636328ab..d684037f1 100644 --- a/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTest.java +++ b/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTestAspect.java b/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTestAspect.java index 60a6ca42f..bdddad837 100644 --- a/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTestAspect.java +++ b/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsReweavableTestAspect.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsTest.java b/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsTest.java index 8ce1e1915..c083122c1 100644 --- a/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsTest.java +++ b/tests/java5/ataspectj/ataspectj/DeclareParentsImplementsTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java b/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java index d21fc7b7d..535155224 100644 --- a/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java +++ b/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/DeowTest.java b/tests/java5/ataspectj/ataspectj/DeowTest.java index fc8a27015..407169ef4 100644 --- a/tests/java5/ataspectj/ataspectj/DeowTest.java +++ b/tests/java5/ataspectj/ataspectj/DeowTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/DumpTest.java b/tests/java5/ataspectj/ataspectj/DumpTest.java index 4fb2b7487..e11125d34 100644 --- a/tests/java5/ataspectj/ataspectj/DumpTest.java +++ b/tests/java5/ataspectj/ataspectj/DumpTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/DumpTestTheDump.java b/tests/java5/ataspectj/ataspectj/DumpTestTheDump.java index f33ffa85a..781a6126e 100644 --- a/tests/java5/ataspectj/ataspectj/DumpTestTheDump.java +++ b/tests/java5/ataspectj/ataspectj/DumpTestTheDump.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ @@ -16,6 +16,6 @@ package ataspectj; */ public class DumpTestTheDump { public void aroundMethod (String s) { - + } } diff --git a/tests/java5/ataspectj/ataspectj/IfPointcut2Test.java b/tests/java5/ataspectj/ataspectj/IfPointcut2Test.java index 73b4b0f84..57553b09f 100644 --- a/tests/java5/ataspectj/ataspectj/IfPointcut2Test.java +++ b/tests/java5/ataspectj/ataspectj/IfPointcut2Test.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ @@ -44,7 +44,7 @@ public class IfPointcut2Test extends TestCase { f.doo(); f.doo(1); f.dooMulti(); - + // we don't want to rely on the order the if pcds are evaluated String exp3 = "test test2-doo-doo doo test3-1-doo-doo-doo doo-1 testTWO-dooMulti doMulti "; String exp4 = "test test2-doo-doo doo test3-1-doo-doo-doo doo-1 testONE-dooMulti doMulti "; diff --git a/tests/java5/ataspectj/ataspectj/IfPointcutTest.java b/tests/java5/ataspectj/ataspectj/IfPointcutTest.java index eb97bc05e..7b5fb6cfd 100644 --- a/tests/java5/ataspectj/ataspectj/IfPointcutTest.java +++ b/tests/java5/ataspectj/ataspectj/IfPointcutTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/MultipleBindingTest.java b/tests/java5/ataspectj/ataspectj/MultipleBindingTest.java index 366a127cb..f1017bf8e 100644 --- a/tests/java5/ataspectj/ataspectj/MultipleBindingTest.java +++ b/tests/java5/ataspectj/ataspectj/MultipleBindingTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/PerClauseInheritanceTest.java b/tests/java5/ataspectj/ataspectj/PerClauseInheritanceTest.java index fe1d6456b..0349452cb 100644 --- a/tests/java5/ataspectj/ataspectj/PerClauseInheritanceTest.java +++ b/tests/java5/ataspectj/ataspectj/PerClauseInheritanceTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/PerClauseTest.java b/tests/java5/ataspectj/ataspectj/PerClauseTest.java index a7f981997..5585754a6 100644 --- a/tests/java5/ataspectj/ataspectj/PerClauseTest.java +++ b/tests/java5/ataspectj/ataspectj/PerClauseTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/PerClauseTestAspects.java b/tests/java5/ataspectj/ataspectj/PerClauseTestAspects.java index 5c0f27cde..48459a6a5 100644 --- a/tests/java5/ataspectj/ataspectj/PerClauseTestAspects.java +++ b/tests/java5/ataspectj/ataspectj/PerClauseTestAspects.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/PointcutReferenceTest.java b/tests/java5/ataspectj/ataspectj/PointcutReferenceTest.java index 895765cd2..196f0985c 100644 --- a/tests/java5/ataspectj/ataspectj/PointcutReferenceTest.java +++ b/tests/java5/ataspectj/ataspectj/PointcutReferenceTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/PrecedenceTest.java b/tests/java5/ataspectj/ataspectj/PrecedenceTest.java index 0a2b2cd37..96723ff4b 100644 --- a/tests/java5/ataspectj/ataspectj/PrecedenceTest.java +++ b/tests/java5/ataspectj/ataspectj/PrecedenceTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest.java b/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest.java index c141e95b2..89e4fb5ea 100644 --- a/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest.java +++ b/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest2.aj b/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest2.aj index 5083375bb..af6be1ab7 100644 --- a/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest2.aj +++ b/tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest2.aj @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/SingletonInheritanceTest.java b/tests/java5/ataspectj/ataspectj/SingletonInheritanceTest.java index 660d9d5ea..ea14341df 100644 --- a/tests/java5/ataspectj/ataspectj/SingletonInheritanceTest.java +++ b/tests/java5/ataspectj/ataspectj/SingletonInheritanceTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/TestAroundAspect.aj b/tests/java5/ataspectj/ataspectj/TestAroundAspect.aj index 8ae2954c3..8ea367b36 100644 --- a/tests/java5/ataspectj/ataspectj/TestAroundAspect.aj +++ b/tests/java5/ataspectj/ataspectj/TestAroundAspect.aj @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/TestHelper.java b/tests/java5/ataspectj/ataspectj/TestHelper.java index f53956193..e7a5c1eb0 100644 --- a/tests/java5/ataspectj/ataspectj/TestHelper.java +++ b/tests/java5/ataspectj/ataspectj/TestHelper.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/TestInterface.java b/tests/java5/ataspectj/ataspectj/TestInterface.java index 28d4f29f9..4f58a4781 100644 --- a/tests/java5/ataspectj/ataspectj/TestInterface.java +++ b/tests/java5/ataspectj/ataspectj/TestInterface.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Matthew Webster - initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/TestProxyGenerator.java b/tests/java5/ataspectj/ataspectj/TestProxyGenerator.java index e7fa8e750..e1d29e35f 100644 --- a/tests/java5/ataspectj/ataspectj/TestProxyGenerator.java +++ b/tests/java5/ataspectj/ataspectj/TestProxyGenerator.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Matthew Webster - initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/UnweavableTest.java b/tests/java5/ataspectj/ataspectj/UnweavableTest.java index 066b30b05..1ef970612 100644 --- a/tests/java5/ataspectj/ataspectj/UnweavableTest.java +++ b/tests/java5/ataspectj/ataspectj/UnweavableTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Alexandre Vasseur initial implementation diff --git a/tests/java5/ataspectj/ataspectj/XXJoinPointTest.java b/tests/java5/ataspectj/ataspectj/XXJoinPointTest.java index 1bbd4e87f..87e28ed8f 100644 --- a/tests/java5/ataspectj/ataspectj/XXJoinPointTest.java +++ b/tests/java5/ataspectj/ataspectj/XXJoinPointTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEChild.java b/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEChild.java index 0adbf41f1..1a3980b08 100644 --- a/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEChild.java +++ b/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEChild.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEParent.java b/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEParent.java index 8cba4b3b3..66dd89bc5 100644 --- a/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEParent.java +++ b/tests/java5/ataspectj/ataspectj/bugs/AbstractAspectNPEParent.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/bugs/AbstractInherited.java b/tests/java5/ataspectj/ataspectj/bugs/AbstractInherited.java index 397c1ad18..af1e90b06 100644 --- a/tests/java5/ataspectj/ataspectj/bugs/AbstractInherited.java +++ b/tests/java5/ataspectj/ataspectj/bugs/AbstractInherited.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ @@ -26,7 +26,7 @@ public abstract aspect AbstractInherited { //} void around(): execution(* foo(..)) { - } + } } diff --git a/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java b/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java index 0703215f3..17db87f0a 100644 --- a/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java +++ b/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/bugs/CflowBelowStackTest.java b/tests/java5/ataspectj/ataspectj/bugs/CflowBelowStackTest.java index bdedca569..a8a46195d 100644 --- a/tests/java5/ataspectj/ataspectj/bugs/CflowBelowStackTest.java +++ b/tests/java5/ataspectj/ataspectj/bugs/CflowBelowStackTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/hierarchy/AppContainerTest.java b/tests/java5/ataspectj/ataspectj/hierarchy/AppContainerTest.java index 5bd2330f4..bf697bc90 100644 --- a/tests/java5/ataspectj/ataspectj/hierarchy/AppContainerTest.java +++ b/tests/java5/ataspectj/ataspectj/hierarchy/AppContainerTest.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/hierarchy/app/SubApp.java b/tests/java5/ataspectj/ataspectj/hierarchy/app/SubApp.java index e724c486d..90908e872 100644 --- a/tests/java5/ataspectj/ataspectj/hierarchy/app/SubApp.java +++ b/tests/java5/ataspectj/ataspectj/hierarchy/app/SubApp.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/Aspect1.java b/tests/java5/ataspectj/ataspectj/ltwlog/Aspect1.java index 6accd8624..550a65a9b 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/Aspect1.java +++ b/tests/java5/ataspectj/ataspectj/ltwlog/Aspect1.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/Main.java b/tests/java5/ataspectj/ataspectj/ltwlog/Main.java index 7bbffd74b..9b7b19b5f 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/Main.java +++ b/tests/java5/ataspectj/ataspectj/ltwlog/Main.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/MainSilent.java b/tests/java5/ataspectj/ataspectj/ltwlog/MainSilent.java index ecf404e66..1929a16ef 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/MainSilent.java +++ b/tests/java5/ataspectj/ataspectj/ltwlog/MainSilent.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/MainVerbose.java b/tests/java5/ataspectj/ataspectj/ltwlog/MainVerbose.java index feda514ff..00ddafdce 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/MainVerbose.java +++ b/tests/java5/ataspectj/ataspectj/ltwlog/MainVerbose.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java b/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java index 32d7398e8..4f2160cd6 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java +++ b/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ @@ -23,7 +23,7 @@ public class MainVerboseAndShow { public static void main(String args[]) throws Throwable { new MainVerboseAndShow().target(); - + if (!MessageHolder.startsAs(Arrays.asList(new String[]{ "info weaving 'ataspectj/ltwlog/MainVerboseAndShow'", "info weaver operating in reweavable mode. Need to verify any required types exist.", diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/MessageHolder.java b/tests/java5/ataspectj/ataspectj/ltwlog/MessageHolder.java index 03983cfc4..63a840f5f 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/MessageHolder.java +++ b/tests/java5/ataspectj/ataspectj/ltwlog/MessageHolder.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwreweavable/Advisable.java b/tests/java5/ataspectj/ataspectj/ltwreweavable/Advisable.java index bec7654d7..b61f91012 100644 --- a/tests/java5/ataspectj/ataspectj/ltwreweavable/Advisable.java +++ b/tests/java5/ataspectj/ataspectj/ltwreweavable/Advisable.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ @@ -16,5 +16,5 @@ package ataspectj.ltwreweavable; */ public interface Advisable { - public void addJoinPoint (String name); + public void addJoinPoint (String name); } diff --git a/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect1.java b/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect1.java index 5ec5508c2..32a7da470 100644 --- a/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect1.java +++ b/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect1.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect2.java b/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect2.java index c1f609f5d..04708bfe4 100644 --- a/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect2.java +++ b/tests/java5/ataspectj/ataspectj/ltwreweavable/Aspect2.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwreweavable/AspectReweavableLogging.java b/tests/java5/ataspectj/ataspectj/ltwreweavable/AspectReweavableLogging.java index e921147ba..842cf44bb 100644 --- a/tests/java5/ataspectj/ataspectj/ltwreweavable/AspectReweavableLogging.java +++ b/tests/java5/ataspectj/ataspectj/ltwreweavable/AspectReweavableLogging.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ @@ -28,4 +28,3 @@ public class AspectReweavableLogging { a.addJoinPoint(thisJoinPoint.getSignature().getName()); } } -
\ No newline at end of file diff --git a/tests/java5/ataspectj/ataspectj/ltwreweavable/Main.java b/tests/java5/ataspectj/ataspectj/ltwreweavable/Main.java index 13f16d127..23498b16a 100644 --- a/tests/java5/ataspectj/ataspectj/ltwreweavable/Main.java +++ b/tests/java5/ataspectj/ataspectj/ltwreweavable/Main.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java b/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java index 3bb30da74..f421e6ce8 100644 --- a/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java +++ b/tests/java5/ataspectj/ataspectj/ltwreweavable/MainReweavableLogging.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/ataspectj/misuse/Test100.java b/tests/java5/ataspectj/ataspectj/misuse/Test100.java index 0b91d3bf8..facfdcf7b 100644 --- a/tests/java5/ataspectj/ataspectj/misuse/Test100.java +++ b/tests/java5/ataspectj/ataspectj/misuse/Test100.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/com/foo/bar/Test$$EnhancerByCGLIB$$12345.java b/tests/java5/ataspectj/com/foo/bar/Test$$EnhancerByCGLIB$$12345.java index 6f637c978..350015958 100644 --- a/tests/java5/ataspectj/com/foo/bar/Test$$EnhancerByCGLIB$$12345.java +++ b/tests/java5/ataspectj/com/foo/bar/Test$$EnhancerByCGLIB$$12345.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Matthew Webster - initial implementation *******************************************************************************/ diff --git a/tests/java5/ataspectj/com/foo/bar/Test.java b/tests/java5/ataspectj/com/foo/bar/Test.java index 3fc535d19..495e5fd99 100644 --- a/tests/java5/ataspectj/com/foo/bar/Test.java +++ b/tests/java5/ataspectj/com/foo/bar/Test.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Matthew Webster - initial implementation *******************************************************************************/ diff --git a/tests/ltw/AbstractAspect.aj b/tests/ltw/AbstractAspect.aj index 6a735f268..10c58444a 100644 --- a/tests/ltw/AbstractAspect.aj +++ b/tests/ltw/AbstractAspect.aj @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ @@ -17,12 +17,12 @@ public abstract aspect AbstractAspect { * These should not take effect unless a concrete sub-aspect is defined */ declare parents : TestITDMethod implements Runnable; - + declare soft : InvocationTargetException : execution(public void TestITDMethod.*()); declare warning : execution(public void main(..)) : "AbstractAspect_main"; - + /* * This should always take effect */ diff --git a/tests/ltw/AbstractSuperAspect.aj b/tests/ltw/AbstractSuperAspect.aj index 705085848..9cf0b5d0c 100644 --- a/tests/ltw/AbstractSuperAspect.aj +++ b/tests/ltw/AbstractSuperAspect.aj @@ -1,19 +1,19 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ public abstract aspect AbstractSuperAspect { - + protected abstract pointcut scope (); - + before () : execution(void test1()) && scope() { System.err.println("AbstractSuperAspect.before_" + thisJoinPoint.getSignature().getName()); } diff --git a/tests/ltw/Aspect1.aj b/tests/ltw/Aspect1.aj index 173cb8603..0fa7a8877 100644 --- a/tests/ltw/Aspect1.aj +++ b/tests/ltw/Aspect1.aj @@ -1,18 +1,18 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ import org.aspectj.lang.JoinPoint; public aspect Aspect1 { - + before () : execution(void Main.test1()) { System.err.println("Aspect1.before_" + thisJoinPoint.getSignature().getName()); } diff --git a/tests/ltw/Aspect2.aj b/tests/ltw/Aspect2.aj index 519a47eeb..9c7de2933 100644 --- a/tests/ltw/Aspect2.aj +++ b/tests/ltw/Aspect2.aj @@ -1,18 +1,18 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ import org.aspectj.lang.JoinPoint; public aspect Aspect2 { - + before () : execution(void Main.test2()){ System.err.println("Aspect2.before_" + thisJoinPoint.getSignature().getName()); } diff --git a/tests/ltw/Aspect3.aj b/tests/ltw/Aspect3.aj index 08dff8c45..21fd70702 100644 --- a/tests/ltw/Aspect3.aj +++ b/tests/ltw/Aspect3.aj @@ -1,18 +1,18 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ import org.aspectj.lang.JoinPoint; public aspect Aspect3 { - + before () : execution(void Main.test999()) { System.err.println("Aspect1.before_" + thisJoinPoint.getSignature().getName()); } diff --git a/tests/ltw/Main.java b/tests/ltw/Main.java index 9e53bfb4d..454af1365 100644 --- a/tests/ltw/Main.java +++ b/tests/ltw/Main.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ @@ -32,7 +32,7 @@ public class Main { } } } - + public static void main (String[] args) throws Exception { System.out.println("Main.main"); new Main().test1(); diff --git a/tests/ltw/TestITDMethod.java b/tests/ltw/TestITDMethod.java index 8f8d62268..efd771628 100644 --- a/tests/ltw/TestITDMethod.java +++ b/tests/ltw/TestITDMethod.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ @@ -20,7 +20,7 @@ public class TestITDMethod { method.invoke(this,new Object[] {}); } } - + public static void main (String[] args) throws Exception { System.out.println("TestITDMethod.main"); new TestITDMethod().invokeDeclaredMethods(args); diff --git a/tests/ltw/TestMain.java b/tests/ltw/TestMain.java index b55e94332..548890340 100644 --- a/tests/ltw/TestMain.java +++ b/tests/ltw/TestMain.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ @@ -13,7 +13,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; public class TestMain { - + public static void main (String[] args) throws Exception { Main.main(args); } diff --git a/tests/ltw/folder.jar/Aspect1.aj b/tests/ltw/folder.jar/Aspect1.aj index 173cb8603..0fa7a8877 100644 --- a/tests/ltw/folder.jar/Aspect1.aj +++ b/tests/ltw/folder.jar/Aspect1.aj @@ -1,18 +1,18 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ import org.aspectj.lang.JoinPoint; public aspect Aspect1 { - + before () : execution(void Main.test1()) { System.err.println("Aspect1.before_" + thisJoinPoint.getSignature().getName()); } diff --git a/tests/ltw/folder.jar/Aspect2.aj b/tests/ltw/folder.jar/Aspect2.aj index 519a47eeb..9c7de2933 100644 --- a/tests/ltw/folder.jar/Aspect2.aj +++ b/tests/ltw/folder.jar/Aspect2.aj @@ -1,18 +1,18 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ import org.aspectj.lang.JoinPoint; public aspect Aspect2 { - + before () : execution(void Main.test2()){ System.err.println("Aspect2.before_" + thisJoinPoint.getSignature().getName()); } diff --git a/tests/ltw/folder.jar/Main.java b/tests/ltw/folder.jar/Main.java index 9e53bfb4d..454af1365 100644 --- a/tests/ltw/folder.jar/Main.java +++ b/tests/ltw/folder.jar/Main.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ @@ -32,7 +32,7 @@ public class Main { } } } - + public static void main (String[] args) throws Exception { System.out.println("Main.main"); new Main().test1(); diff --git a/tests/ltw/hier/child/Advisor.aj b/tests/ltw/hier/child/Advisor.aj index d7b6b33ac..76cffacee 100644 --- a/tests/ltw/hier/child/Advisor.aj +++ b/tests/ltw/hier/child/Advisor.aj @@ -2,9 +2,9 @@ * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Ron Bodkin diff --git a/tests/ltw/hier/child/Executor.aj b/tests/ltw/hier/child/Executor.aj index 74a90a07a..f2e28e6b6 100644 --- a/tests/ltw/hier/child/Executor.aj +++ b/tests/ltw/hier/child/Executor.aj @@ -2,9 +2,9 @@ * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Ron Bodkin diff --git a/tests/ltw/hier/top/SimpleMain.aj b/tests/ltw/hier/top/SimpleMain.aj index 1355fb401..affb72cca 100644 --- a/tests/ltw/hier/top/SimpleMain.aj +++ b/tests/ltw/hier/top/SimpleMain.aj @@ -2,9 +2,9 @@ * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Ron Bodkin diff --git a/tests/ltw/hier/util/A.aj b/tests/ltw/hier/util/A.aj index df695c09d..026ddde5e 100644 --- a/tests/ltw/hier/util/A.aj +++ b/tests/ltw/hier/util/A.aj @@ -2,9 +2,9 @@ * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Ron Bodkin diff --git a/tests/ltw/hier/util/T.aj b/tests/ltw/hier/util/T.aj index f87f92d4a..b57095066 100644 --- a/tests/ltw/hier/util/T.aj +++ b/tests/ltw/hier/util/T.aj @@ -2,9 +2,9 @@ * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Ron Bodkin diff --git a/tests/ltw/pakkage/Aspect3.aj b/tests/ltw/pakkage/Aspect3.aj index 08894259e..109523dca 100644 --- a/tests/ltw/pakkage/Aspect3.aj +++ b/tests/ltw/pakkage/Aspect3.aj @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ @@ -14,9 +14,9 @@ package pakkage; import org.aspectj.lang.JoinPoint; public aspect Aspect3 { - + declare precedence : *, Aspect3; - + before () : execution(void Main.test2()){ System.err.println("pakkage.Aspect3.before_" + thisJoinPoint.getSignature().getName()); } diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java index c69ae7121..6b2624c31 100644 --- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java +++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java @@ -1,9 +1,11 @@ /** * Copyright (c) 2009 Collaborative Development Group, C.S. Dept., University of Bari * - * 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 + * 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 it.uniba.di.cdg.penelope.ui.annotation; diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj index 80dd4650d..bd166f04d 100644 --- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj +++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj @@ -1,9 +1,11 @@ /** * Copyright (c) 2009 Collaborative Development Group, C.S. Dept., University of Bari * - * 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 + * 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 it.uniba.di.cdg.penelope.ui.mvp; @@ -16,23 +18,23 @@ import java.util.List; * Augments views with support for View events. */ public abstract aspect AbstractViewEnhancerAspect { - pointcut scope(); - + pointcut scope(); + declare parents: (@View *) implements IManagedView; - private final List<IPresenter> IManagedView.presenters = new ArrayList<IPresenter>(); - + private final List<IPresenter> IManagedView.presenters = new ArrayList<IPresenter>(); + public void IManagedView.fire( Object event ) { for (IPresenter presenter : presenters) { presenter.dispatchEvent( event ); } } - + public void IManagedView.registerPresenter( IPresenter presenter ) { presenters.add( presenter ); } - + public void IManagedView.unregisterPresenter( IPresenter presenter ) { presenters.remove( presenter ); - } + } } diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java index 7be156875..8479dfed2 100644 --- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java +++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java @@ -1,19 +1,21 @@ /** * Copyright (c) 2009 Collaborative Development Group, C.S. Dept., University of Bari * - * 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 + * 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 it.uniba.di.cdg.penelope.ui.mvp; /** - * + * */ public interface IManagedView { void fire( Object event ); - + void registerPresenter( IPresenter presenter ); - + void unregisterPresenter( IPresenter presenter ); } diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java index 6cdb46dfb..1a7add898 100644 --- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java +++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java @@ -1,16 +1,18 @@ /** * Copyright (c) 2009 Collaborative Development Group, C.S. Dept., University of Bari * - * 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 + * 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 it.uniba.di.cdg.penelope.ui.mvp; import java.beans.PropertyChangeListener; /** - * Basic interface for <strong>Presenter</strong> implementations. Within Penelope, a Presenter is a supervising controller + * Basic interface for <strong>Presenter</strong> implementations. Within Penelope, a Presenter is a supervising controller * which reacts to view events (see the View Events mechanism): the view just displays the session state stored within * the <strong>Presentation Model</strong>. */ @@ -18,7 +20,7 @@ public interface IPresenter extends PropertyChangeListener { /** * View has been created. */ - void onViewCreated(); + void onViewCreated(); /** * View has been destroyed. diff --git a/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java b/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java index a10ddd060..74425dee2 100644 --- a/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java +++ b/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java @@ -1,9 +1,11 @@ /** * Copyright (c) 2009 Collaborative Development Group, C.S. Dept., University of Bari * - * 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 + * 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 test; @@ -12,28 +14,28 @@ import it.uniba.di.cdg.penelope.ui.mvp.IManagedView; import it.uniba.di.cdg.penelope.ui.mvp.AbstractViewEnhancerAspect; /** - * + * */ public class ViewEnhancerIntegrationTest { @View public static class MockView { - + } - + static aspect ViewEnhancerAspect extends AbstractViewEnhancerAspect { pointcut scope() : within( test.ViewEnhancerIntegrationTest ); } - + public void simulateViewCreation() { } - + public void shouldAugmentView() { //given @View class has been augmented //when - MockView view = new MockView(); - + MockView view = new MockView(); + //then // assertTrue( view instanceof IManagedView ); } diff --git a/tests/new/pointcutLibrary/langlib/Pointcuts.java b/tests/new/pointcutLibrary/langlib/Pointcuts.java index 70e220624..85be7dd4b 100644 --- a/tests/new/pointcutLibrary/langlib/Pointcuts.java +++ b/tests/new/pointcutLibrary/langlib/Pointcuts.java @@ -1,16 +1,16 @@ /* ******************************************************************* * Copyright (c) 2003 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 - * - * Contributors: - * Wes Isberg initial implementation + * 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 + * + * Contributors: + * Wes Isberg initial implementation * ******************************************************************/ -// START-SAMPLE library-pointcutIdioms Standard pointcut idioms +// START-SAMPLE library-pointcutIdioms Standard pointcut idioms package langlib; import java.io.*; @@ -18,7 +18,7 @@ import java.io.*; /** * Library of pointcut idioms to use in combination with * other pointcuts. - * + * * @author Wes Isberg */ public class Pointcuts { @@ -35,49 +35,49 @@ public class Pointcuts { public pointcut mainExecution() : execution(public static void main(String[])); - + /** staticly-determinable to never match any join point */ - public pointcut never() : if(false) + public pointcut never() : if(false) && execution(ThreadDeath *(ThreadDeath, ThreadDeath)); - - public pointcut anyMethodExecution() : + + public pointcut anyMethodExecution() : execution(* *(..)); - public pointcut anyPublicMethodExecution() : + public pointcut anyPublicMethodExecution() : execution(public * *(..)); - public pointcut anyNonPrivateMethodExecution() : + public pointcut anyNonPrivateMethodExecution() : execution(!private * *(..)); - public pointcut anyConstructorExecution() : + public pointcut anyConstructorExecution() : execution(new(..)); - public pointcut anyPublicConstructorExecution() : + public pointcut anyPublicConstructorExecution() : execution(public new(..)); public pointcut anyNonPrivateConstructorExecution() : execution(!private new(..)); - public pointcut anyPublicFieldGet() : + public pointcut anyPublicFieldGet() : get(public * *); - public pointcut anyNonPrivateFieldGet() : + public pointcut anyNonPrivateFieldGet() : get(!private * *); - public pointcut anyPublicFieldSet() : + public pointcut anyPublicFieldSet() : set(public * *); - public pointcut anyNonPrivateFieldSet() : + public pointcut anyNonPrivateFieldSet() : set(!private * *); // also !transient? - public pointcut withinSetter() : + public pointcut withinSetter() : withincode(* set*(..)); - public pointcut withinGetter() : + public pointcut withinGetter() : withincode(Object+ get*(..)); - - public pointcut anyNonPublicFieldSetOutsideConstructorOrSetter() : - set(!public * *) && !withincode(new(..)) + + public pointcut anyNonPublicFieldSetOutsideConstructorOrSetter() : + set(!public * *) && !withincode(new(..)) && !withinSetter(); public pointcut anyRunnableImplementation() : @@ -88,7 +88,7 @@ public class Pointcuts { public pointcut anySetSystemErrOut() : call(void System.setOut(..)) || call(void System.setErr(..)); - + public pointcut withinAnyJavaCode() : within(java..*) || within(javax..*); @@ -102,15 +102,15 @@ public class Pointcuts { public pointcut anyThreadConstruction() : call(Thread+.new(..)) || execution(Thread+.new(..)); - /** - * Any calls to java.io classes + /** + * Any calls to java.io classes * (but not methods declared only on their subclasses). */ public pointcut anyJavaIOCalls() : call(* java.io..*.*(..)) || call(java.io..*.new(..)); - /** - * Any calls to java.awt or javax.swing classes + /** + * Any calls to java.awt or javax.swing classes * (but not methods declared only on their subclasses). */ public pointcut anyJavaAWTOrSwingCalls() : @@ -119,10 +119,10 @@ public class Pointcuts { public pointcut cloneImplementationsInNonCloneable() : execution(Object !Cloneable+.clone()); - + public pointcut runImplementationsInNonRunnable() : execution(void !Runnable+.run()); - + /** any calls to java.lang.reflect or Class.get* (except getName()) */ public pointcut anySystemReflectiveCalls() : call(* java.lang.reflect..*.*(..)) @@ -146,17 +146,17 @@ public class Pointcuts { public pointcut exceptionWrappingCalls() : (args(Throwable+,..) || args(.., Throwable+)) && (set(Throwable+ Throwable+.*) - || (call(* Throwable+.*(..)) + || (call(* Throwable+.*(..)) || call(Throwable+.new(..)))); private Pointcuts() {} - + } aspect A { private static aspect PointcutsOnly { /** require this library to only contain pointcuts */ declare error : within(Pointcuts) && - (Pointcuts.anyMethodExecution() + (Pointcuts.anyMethodExecution() || Pointcuts.anyNonPrivateConstructorExecution() || set(* *)) : "only pointcuts permitted in Pointcuts"; // does not pick out field definitions -- too costly diff --git a/tests/product/build-aspectj/build.xml b/tests/product/build-aspectj/build.xml index 4046113be..85b0670a6 100644 --- a/tests/product/build-aspectj/build.xml +++ b/tests/product/build-aspectj/build.xml @@ -3,9 +3,9 @@ <!-- Copyright (c) 2003 Contributors. --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Eclipse Public License v1.0 --> +<!-- 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: --> <!-- Isberg initial implementation --> diff --git a/tests/profiling/build.xml b/tests/profiling/build.xml index 45b411fe9..aa7db9d0e 100644 --- a/tests/profiling/build.xml +++ b/tests/profiling/build.xml @@ -5,9 +5,9 @@ All rights reserved. This program and the accompanying materials are made available - under the terms of the Eclipse Public License v1.0 + under the terms of the Eclipse Public License v 2.0 which accompanies this distribution and is available at - http://eclipse.org/legal/epl-v10.html + https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt Contributors: Adrian Colyer --> diff --git a/tests/profiling/ltw-app/src/org/aspectj/profiling/LTWApp.java b/tests/profiling/ltw-app/src/org/aspectj/profiling/LTWApp.java index a247fb10b..af538838c 100644 --- a/tests/profiling/ltw-app/src/org/aspectj/profiling/LTWApp.java +++ b/tests/profiling/ltw-app/src/org/aspectj/profiling/LTWApp.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * 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 + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.profiling; @@ -24,17 +24,17 @@ import java.util.zip.ZipInputStream; * jar file, and performs Class.forName on every class within it. */ public class LTWApp { - + private File inJar; private int numLoaded = 0; - + public static void main(String[] args) throws IOException { if (args.length != 1) { throw new IllegalArgumentException("Expecting a single jar file argument"); } new LTWApp(args[0]).run(); } - + public LTWApp(String jarFileName) { inJar = new File(jarFileName); if (!inJar.exists() || !inJar.canRead()) { @@ -42,33 +42,33 @@ public class LTWApp { "' does not exist or cannot be read"); } } - + public void run() throws IOException { ZipInputStream inStream = new ZipInputStream(new FileInputStream(inJar)); long startTime = System.currentTimeMillis(); while (true) { ZipEntry entry = inStream.getNextEntry(); if (entry == null) break; - + if (entry.isDirectory() || !entry.getName().endsWith(".class")) { continue; } - + loadClass(entry.getName()); } long endTime = System.currentTimeMillis(); System.out.println("Loaded " + numLoaded + " classes in " + (endTime - startTime) + " milliseconds"); } - + private void loadClass(String classFileName) { String className = classFileName.substring(0,(classFileName.length() - ".class".length())); className = className.replace('/','.'); try { Class c = Class.forName(className); - } + } catch(ClassNotFoundException ex) { throw new IllegalStateException("Unable to load class defined in input jar file, check that jar is also on the classpath!"); } numLoaded++; } -}
\ No newline at end of file +} diff --git a/tests/profiling/shadows.xml b/tests/profiling/shadows.xml index e7358d8aa..61430b7b0 100644 --- a/tests/profiling/shadows.xml +++ b/tests/profiling/shadows.xml @@ -2,12 +2,12 @@ <!-- Copyright 2006 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://eclipse.org/legal/epl-v10.html + + 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 Contributors: Adrian Colyer --> @@ -16,21 +16,21 @@ <!-- imported by master build.xml when using the shadows source tree as the basis for profiling the compiler --> - + <target name="shadows-usage"> <echo message="this file contains only path definitions"/> <echo message="these are used to customize the target application used by"/> <echo message="the profiling tests. Set the target.application.definitions.file"/> <echo message="property to point to your own replacement of this file to"/> - <echo message="profile compilation of an alternate project"/> + <echo message="profile compilation of an alternate project"/> </target> - + <!-- any target.application.definitions.file must define the following paths: * source.roots (used for from source and ajdt compilation tests) * build.class.path (the class path needed to build the application) it must also define the copy.source.files target needed by the ajdt build --> - + <!-- the source roots used for compilation. --> <path id="source.roots"> <pathelement location="f:/workspaces/aspectj1/shadows.org.eclipse.jdt.core/antadapter"/> @@ -44,7 +44,7 @@ <pathelement location="f:/workspaces/aspectj1/shadows.org.eclipse.jdt.core/model"/> <pathelement location="f:/workspaces/aspectj1/shadows.org.eclipse.jdt.core/search"/> </path> - + <!-- the classpath needed for compilation --> <path id="build.class.path"> <fileset dir="f:/workspaces/aspectj1/shadows.org.eclipse.jdt.core/lib"> diff --git a/tests/profiling/spacewar.xml b/tests/profiling/spacewar.xml index c48c06273..6bfd15b68 100644 --- a/tests/profiling/spacewar.xml +++ b/tests/profiling/spacewar.xml @@ -2,12 +2,12 @@ <!-- Copyright 2006 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://eclipse.org/legal/epl-v10.html + + 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 Contributors: Andy Clement --> @@ -16,26 +16,26 @@ <!-- imported by master build.xml when using the spacewar source tree as the basis for profiling the compiler --> - + <target name="spacewar-usage"> <echo message="this file contains only path definitions"/> <echo message="these are used to customize the target application used by"/> <echo message="the profiling tests. Set the target.application.definitions.file"/> <echo message="property to point to your own replacement of this file to"/> - <echo message="profile compilation of an alternate project"/> + <echo message="profile compilation of an alternate project"/> </target> - + <!-- any target.application.definitions.file must define the following paths: * source.roots (used for from source and ajdt compilation tests) * build.class.path (the class path needed to build the application) it must also define the copy.source.files target needed by the ajdt build --> - + <!-- the source roots used for compilation. --> <path id="source.roots"> <pathelement location="../../ajdoc/testdata/spacewar"/> </path> - + <!-- the classpath needed for compilation --> <path id="build.class.path"> </path> @@ -48,5 +48,5 @@ includes="**/*.java,**/*.aj"/--> </copy> </target> - + </project> diff --git a/tests/profiling/spring-1.2.6.xml b/tests/profiling/spring-1.2.6.xml index 5b210ab17..f53196cf6 100644 --- a/tests/profiling/spring-1.2.6.xml +++ b/tests/profiling/spring-1.2.6.xml @@ -2,42 +2,42 @@ <!-- Copyright 2006 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://eclipse.org/legal/epl-v10.html + + 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 Contributors: Adrian Colyer --> <project name="spring-1.2.6" default="spring-1.2.6-usage"> - <!-- imported by master build.xml when using the springframework 1.2.6 + <!-- imported by master build.xml when using the springframework 1.2.6 source tree as the basis for profiling the compiler --> - + <target name="spring-1.2.6-usage"> <echo message="this file contains only path definitions"/> <echo message="these are used to customize the target application used by"/> <echo message="the profiling tests. Set the target.application.definitions.file"/> <echo message="property to point to your own replacement of this file to"/> - <echo message="profile compilation of an alternate project"/> + <echo message="profile compilation of an alternate project"/> </target> - + <!-- any target.application.definitions.file must define the following paths: * source.roots (used for from source and ajdt compilation tests) * build.class.path (the class path needed to build the application) it must also define the copy.source.files target needed by the ajdt build --> - + <!-- the source roots used for compilation. --> <path id="source.roots"> <pathelement location="${spring.install.dir}/src"/> <pathelement location="${spring.install.dir}/tiger/src"/> <pathelement location="${test.aspects.src.dir}"/> </path> - + <!-- the classpath needed for compilation --> <path id="build.class.path"> <fileset dir="${spring.install.dir}"> @@ -58,5 +58,5 @@ includes="**/*.java,**/*.aj"/> </copy> </target>--> - -</project>
\ No newline at end of file + +</project> diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests.java b/tests/src/test/java/org/aspectj/systemtest/AllTests.java index f4cfe4d2c..2ad05ff1c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests.java @@ -2,9 +2,9 @@ * Copyright (c) 2004-2019 Contributors * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 * * ******************************************************************/ package org.aspectj.systemtest; diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests18.java b/tests/src/test/java/org/aspectj/systemtest/AllTests18.java index 9c2387b0d..cd13c1cf6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests18.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests18.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2013, 2014 Contributors + * Copyright (c) 2013, 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 @@ -30,19 +30,19 @@ public class AllTests18 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ System Test Suite - 1.8"); - // $JUnit-BEGIN$ - suite.addTest(AllTestsAspectJ1811.suite()); - suite.addTest(AllTestsAspectJ1810.suite()); - suite.addTest(AllTestsAspectJ189.suite()); - suite.addTest(AllTestsAspectJ188.suite()); - suite.addTest(AllTestsAspectJ187.suite()); - suite.addTest(AllTestsAspectJ186.suite()); - suite.addTest(AllTestsAspectJ185.suite()); - suite.addTest(AllTestsAspectJ184.suite()); - suite.addTest(AllTestsAspectJ183.suite()); - suite.addTest(AllTestsAspectJ182.suite()); - suite.addTest(AllTestsAspectJ181.suite()); - suite.addTest(AllTestsAspectJ180.suite()); + // $JUnit-BEGIN$ + suite.addTest(AllTestsAspectJ1811.suite()); + suite.addTest(AllTestsAspectJ1810.suite()); + suite.addTest(AllTestsAspectJ189.suite()); + suite.addTest(AllTestsAspectJ188.suite()); + suite.addTest(AllTestsAspectJ187.suite()); + suite.addTest(AllTestsAspectJ186.suite()); + suite.addTest(AllTestsAspectJ185.suite()); + suite.addTest(AllTestsAspectJ184.suite()); + suite.addTest(AllTestsAspectJ183.suite()); + suite.addTest(AllTestsAspectJ182.suite()); + suite.addTest(AllTestsAspectJ181.suite()); + suite.addTest(AllTestsAspectJ180.suite()); suite.addTest(AllTests17.suite()); // suite.addTest(AllTests16.suite()); // suite.addTest(AllTests15.suite()); diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests19.java b/tests/src/test/java/org/aspectj/systemtest/AllTests19.java index 418ecbff5..4a52e8fe4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests19.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests19.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013, 2019 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 *******************************************************************************/ package org.aspectj.systemtest; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java index 8b4cee73e..abf2d1129 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 * * ******************************************************************/ package org.aspectj.systemtest.ajc10x; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java index 5bbfbfbdf..6714eee3e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 * * ******************************************************************/ package org.aspectj.systemtest.ajc11; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java index d4d445a68..d52be5fa1 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 * * ******************************************************************/ package org.aspectj.systemtest.ajc120; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java index 8bc4ad814..1c4f1cb93 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.ajc121; @@ -80,11 +80,11 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test014() { runTest("NPE, Incorrect XLint:unmatchedSuperTypeInCall warning"); } - + public void test015_invalidXlint() { // keywords: "laurie hendren" runTest("invalid warning indicating no match when a match really occurs"); } - + public void test016_ByteConversionInstructions() { runTest("RuntimeException thrown: Could not find instruction: org.apache.bcel.generic.B2I"); String output = getLastRunResult().getStdErr(); @@ -100,35 +100,35 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { assertTrue("Expected to find [s32767] in this output but didn't:"+output, output.contains("[s32767]")); assertTrue("Expected to find [b0] in this output but didn't:"+output, output.contains("[b0]")); } - + public void test017_PrivateMethodCallsInAroundAdvice() { runTest("Cannot advise private method call in around advice"); System.err.println(getLastRunResult().getStdErr()); } - + public void test018_PrivateFieldSetsInAroundAdvice() { runTest("Cannot advise private field sets in around advice"); System.err.println(getLastRunResult().getStdErr()); } - + public void test019_PrivateFieldGetsInAroundAdvice() { runTest("Cannot advise private field gets in around advice"); System.err.println(getLastRunResult().getStdErr()); } - -// test takes over 5 minutes to run, so not included in normal suite run + +// test takes over 5 minutes to run, so not included in normal suite run // public void test020_branchTargetOffsetTooLargeForShort() { // runTest("Branch target offset too large for short"); // } - + // public void test021_BcelFailureWithVeryLargeClasses() { // runTest("Weaver fails in BCEL for large classes"); // } -// +// // public void test022_BcelFailureWithVeryLargeClasses_Binary() { // runTest("Weaver fails in BCEL for large classes (binary)"); // } - + public void test023_proceedInAround1() { runTest("proceed used as method name in around advice (1)"); } @@ -140,15 +140,15 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test025_proceedInAround3() { runTest("proceed used as method name in around advice (3)"); } - + public void test026_bindingThisAndTargetToTheSameFormal() { runTest("ajc crashes when compiling the following program (binding this() and target())"); } - + public void test027_itdsOnInnerClassesAsStatic() { runTest("ITDs on inner classes should be static context"); } - + public void test028_itdsAndInitializers() { runTest("resolution of IT field inits"); } @@ -156,7 +156,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test029_falseInvalidAbsoluteTypeName() { runTest("Valid but inaccessible type names should not be flagged by XLint:invalidAbsoluteTypeName"); } - + public void test030_privateITDinitialisersBeingMatched() { runTest("intertype initialisers should match field set pointcuts"); } @@ -168,7 +168,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { assertTrue("Expected output '"+exp+"' but got "+getLastRunResult().getStdErr(), getLastRunResult().getStdErr().equals(exp)); } - + public void test032_stringConcatForDEOW() { runTest("Compile time declarations (warning and error) do not accept string concatenation (with +)"); } @@ -180,28 +180,28 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test034_scopeForITDS_pr61768() { runTest("scope for inter-type methods"); } - + public void test035_innerAspectCallsPrivateMethod_pr71372() { runTest("NoSuchMethodError calling private method from around advice in inner aspect"); String s = getLastRunResult().getStdErr(); assertTrue("Expected ':before:around' but got "+s, s.equals(":before:around")); } - + public void test036_innerAspectCallsPrivateMethod_pr71372_2() { runTest("NoSuchMethodError calling private method from around advice in inner aspect (2)"); String s = getLastRunResult().getStdErr(); assertTrue("Expected ':before:around' but got "+s, s.equals(":before:around")); } - + public void test037_innerAspectCallsPrivateMethod_pr71372_3() { runTest("NoSuchMethodError calling private method from around advice in inner aspect (3)"); String s = getLastRunResult().getStdErr(); assertTrue("Expected ':before:around' but got "+s, s.equals(":before:around")); } - + public void test038_innerAspectCallsPrivateMethod_pr71372_4() { runTest("NoSuchMethodError calling private method from around advice in inner aspect (4)"); String s = getLastRunResult().getStdErr(); @@ -212,19 +212,19 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test039_privilegedAspectAccessingPrivateMethods_pr67579() { runTest("NPE on privileged aspect error"); } - + public void test040_privilegedAspectAccessingPrivateMethods_pr67579_2() { runTest("NPE on privileged aspect error (2)"); } - + public void test041_ITDaccessingPrivateMethod_pr67578() { runTest("Privileged Aspect Access Problem Across Packages"); } - + public void test042_ITDaccessingPrivateMethod_pr67578_2() { runTest("Privileged Aspect Access Problem Across Packages (2)"); } - + public void test043_pr62642_ExceptionInInitializerError() { runTest("proper handling of ExceptionInIntializer inside clinit in presence of after throwing advice"); String s = getLastRunResult().getStdErr(); @@ -234,15 +234,15 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // assertTrue("Output should contain 'CAUSE=org.aspectj.lang.NoAspectBoundException' but is '"+s+"'", // s.indexOf("CAUSE=org.aspectj.lang.NoAspectBoundException")!=-1); } - + public void test044_ITDnameClashes() { runTest("ITD name clashes with private members"); } - + public void test045_ITDprotectedVisibility() { runTest("Inconsistency in scoping of protected members in ITDs"); } - + public void test045_wrongLineForExecutionJoinPoint() { runTest("wrong line for method execution join point"); } @@ -262,19 +262,19 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test049_interfaceITD_pr70794_4() { runTest("The introduction on interface causes the interface implementation class error (4)"); } - + public void test050_typePatternMatchingWithArrays() { runTest("declare warning warns at wrong points"); } - + public void test052_bogusMessage1() { runTest("Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (1)"); } - + public void test053_bogusMessage2() { runTest("Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (2)"); } - + public void test054_cnfe() { runTest("passing null to array arguments confuzes static join point signature. (1)"); } @@ -282,11 +282,11 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test055_cnfe() { runTest("passing null to array arguments confuzes static join point signature. (2)"); } - + public void test056_arrayCloning() { runTest("around advice throws java.lang.VerifyError at runtime"); } - + public void test057_decSoftWithSuper() { runTest("declare soft can cause programs with invalid exception behaviour to be generated"); } @@ -294,23 +294,23 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test058_npeOnTJPerror() { runTest("NPE on thisJoinPoint mistake"); } - + public void test059_cflowOptimization_counters() { runTest("Optimization of cflow - counters (1)"); } - + public void test060_cflowOptimization_counters() { runTest("Optimization of cflow - shared counters (2)"); } - + public void test061_cflowOptimization_counters() { runTest("Optimization of cflow - shared stacks (3)"); } - + public void test062_cflowOptimization_counters() { runTest("Optimization of cflow - counters (4)"); } - + public void test063_cflowOptimization_countersWithAbstractPcuts() { runTest("Optimization of cflow - counters with abstract pointcuts (5)"); } @@ -318,7 +318,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test064() { runTest("Anonymous classes unaware of introductions into abstract classes"); } - + private int countLines(String s) { int lines = 0; int idx = 0; @@ -328,7 +328,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } return lines; } - + public void test065() { runTest("before,after not (cflow(within(Trace*))) prints nothing"); String s = getLastRunResult().getStdErr(); @@ -338,4 +338,4 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // IF YOU WANT TO SEE THE EXPECTED OUTPUT, LOOK IN THE TEST PROGRAM bugs/WhatsGoingOn.java } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java index a1e7fc648..7b0d0607c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 IBM * 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 @@ -62,4 +62,4 @@ public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase { } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java index 87950db0a..bfa50c8a4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 IBM * 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 @@ -1023,4 +1023,4 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { runTest("override protected pointcut in aop.xml concrete aspect"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java index 47aeae0e8..e3eb1af31 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java index 6c4f21bd5..6be80d52d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 IBM * 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 @@ -398,4 +398,4 @@ public class AnnotationBinding extends XMLBasedAjcTestCase { runTest("AtArgs causes a VerifyError: Unable to pop operand off an empty stack"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java index d21c76c52..a1fd37ddf 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -29,7 +29,7 @@ public class AnnotationPointcutsTests extends XMLBasedAjcTestCase { protected URL getSpecFile() { return getClassResource("ajc150.xml"); } - + // before(): call(@SimpleAnnotation * *(..)) { } public void test001_usingAnnotationsInPointcuts() { runTest("annotation matching on call"); @@ -49,5 +49,5 @@ public class AnnotationPointcutsTests extends XMLBasedAjcTestCase { // TODO extra tests // 3) @annotation on the different join point kinds, matches with inherited annotation - -}
\ No newline at end of file + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java index 9358d9c81..9e64f2df9 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -26,7 +26,7 @@ public class AnnotationRuntimeTests extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + // No longer a limitation ASC 31Jan05 // public void test001_BindingWithAtTargetAllowed() { // CompilationResult cR = binaryWeave("TestingAnnotations.jar","BindingWithAtTarget.aj",0,0); @@ -34,11 +34,11 @@ public class AnnotationRuntimeTests extends XMLBasedAjcTestCase { // RunResult rR = run("TestingAnnotations"); // System.err.println(rR.getStdErr()); // } - + public void test002_MustHaveRuntimeRetention() { runTest("must have runtime retention"); } - + public void test003_InheritableOrNot() { runTest("inheritable or not"); } @@ -46,7 +46,7 @@ public class AnnotationRuntimeTests extends XMLBasedAjcTestCase { public void test004_CantUseinDecEoW() { runTest("use of @this/target in deow"); } - + public void test005_ArgsSuite() { runTest("@args tests"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java index 04797eb9f..7db3ce09a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -25,19 +25,19 @@ public class Annotations extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + public void testCompilingAnnotation() { runTest("compiling an annotation"); } - + public void testCompilingAnnotatedFile() { runTest("compiling annotated file"); } - + public void testCompilingUsingWithinAndAnnotationTypePattern() { runTest("annotations and within (src)"); } - + /** * We had a bug where annotations were not present in the output class file for methods * that got woven. This was due to unpacking bugs in LazyMethodGen. This test compiles @@ -46,7 +46,7 @@ public class Annotations extends XMLBasedAjcTestCase { public void testBugWithAnnotationsLostOnWovenMethods() throws ClassNotFoundException { runTest("losing annotations..."); if (getCurrentTest().canRunOnThisVM()) { - + JavaClass jc = getClassFrom(ajc.getSandboxDirectory(),"Program"); Method[] meths = jc.getMethods(); for (Method method : meths) { @@ -56,24 +56,24 @@ public class Annotations extends XMLBasedAjcTestCase { } } } - + public void testAnnotatedAnnotations() { runTest("annotated annotations (@Target)"); } - + public void testSimpleAnnotatedAspectMembers() { runTest("simple annotated aspect members"); } - + public void testAnnotatedAspectMembersWithWrongAnnotationType() { runTest("simple annotated aspect members with bad target"); } - + // more implementation work needed before this test passes public void testAnnotatedITDs() { runTest("annotated itds"); } - + public void testAnnotatedITDs2() { runTest("annotated public itds"); } @@ -85,84 +85,84 @@ public class Annotations extends XMLBasedAjcTestCase { public void testAnnotatedITDs4() { runTest("annotated public itds - multiple complex annotations"); } - + public void testAnnotatedITDsWithWrongAnnotationType() { runTest("annotated itds with bad target"); } - + public void testAnnotatedAdvice() { runTest("annotated advice"); } - + public void testAnnotatedAdviceWithWrongAnnotationType() { runTest("annotated advice with bad target"); } - + public void testAnnotatedPointcut() { runTest("annotated pointcut"); } - + // FIXME asc uncomment this test when parser is opened up // public void testAnnotatedDeclareStatements() { // runTest("annotated declare statements"); // } - + public void testBasicDeclareAnnotation() { runTest("basic declare annotation parse test"); } - + public void testAJDKAnnotatingAspects() { runTest("ajdk: annotating aspects chapter"); } - + public void testAJDKAnnotatingAspects2() { runTest("ajdk: annotating aspects chapter, ex 2"); } - + public void testAnnotationPatterns() { runTest("ajdk: annotation pattern matching"); } - + public void testAnnotationTypePatterns() { runTest("ajdk: annotation type pattern matching"); } - + public void testAnnotationSigPatterns() { runTest("ajdk: annotations in sig patterns"); } - + public void testAnnotationRuntimeMatching() { runTest("ajdk: runtime annotations"); } - + public void testAnnotationRetentionChecking() { runTest("ajdk: @retention checking"); } - + public void testAnnotationInheritance() { runTest("ajdk: @inherited"); } - + public void testAnnotationDEOW() { runTest("ajdk: deow-ann"); } - + public void testAnnotationDecp() { runTest("ajdk: decp-ann"); } - + public void testAnnotationDecPrecedence() { runTest("ajdk: dec precedence"); } - + public void testAnnotationDecAnnotation() { runTest("ajdk: dec annotation"); } - + public void testAnnotationsAndITDs() { runTest("nasty annotation and itds test"); } - + // helper methods..... -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java index 55f5c9a52..3466d4612 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -17,13 +17,13 @@ import junit.framework.Test; /** * Annotations, the rules/tests: - * + * * 1. cannot make ITD (C,M or F) on an annotation * 2. cannot use declare parents to change the super type of an annotation * 3. cannot use decp to make an annotation type implement an interface * 4. cannot use decp to dec java.lang.annotation.Annotation as the parent of any type * 5. cannot extend set of values in an annotation via an ITD like construct - * 6. Compilation error if you explicitly identify an Annotation type. + * 6. Compilation error if you explicitly identify an Annotation type. * 7. Lint warning if a non-explicit type pattern would match an annotation type. */ public class AnnotationsBinaryWeaving extends XMLBasedAjcTestCase { @@ -35,20 +35,20 @@ public class AnnotationsBinaryWeaving extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + // Cannot make ITD (c/m/f) on an annotation public void test001_itdsOnAnnotationsNotAllowed() { runTest("no itds on annotation types"); } - + // Deals with the cases where an explicit type is specified and it is an annotation type public void test002_decpOnAnnotationNotAllowed_errors() { runTest("no declare parents on annotation types"); } - + //Deals with the cases where an wild type pattern is specified and it hits an annotation type public void test004_decpOnAnnotationNotAllowed_xlints() { runTest("declare parents wildcards matching annotation types"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java index 3ea9afb17..7ae33fbf8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * 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 implementation *******************************************************************************/ @@ -27,11 +27,11 @@ public class Autoboxing extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + public void testSimpleBoxing() { runTest("simple boxing test"); } - + public void testIntegerBoxing() { runTest("integer boxing"); } @@ -47,23 +47,23 @@ public class Autoboxing extends XMLBasedAjcTestCase { public void testFloatBoxing() { runTest("float boxing"); } - + public void testShortBoxing() { runTest("short boxing"); } - + public void testLongBoxing() { runTest("long boxing"); } - + public void testBooleanBoxing() { runTest("boolean boxing"); } - + public void testByteBoxing() { runTest("byte boxing"); } - + public void testBoxingAfterReturning() { runTest("boxing in after returning"); } @@ -73,9 +73,9 @@ public class Autoboxing extends XMLBasedAjcTestCase { // getWeavingMessages(cR.getInfoMessages()).size()==6); // RunResult rR = run("AspectAfterReturning"); // int lines = countLines(rR.getStdErr()); -// assertTrue("Expected 6 lines of output but got: #"+lines+":\n"+rR.getStdErr(),lines==6); +// assertTrue("Expected 6 lines of output but got: #"+lines+":\n"+rR.getStdErr(),lines==6); // } -// +// // public int countLines(String s) { // int count = 0; // while (s.indexOf("\n")!=-1) { @@ -84,9 +84,9 @@ public class Autoboxing extends XMLBasedAjcTestCase { // } // return count; // } -// +// // protected void verify(String output,String lookingFor) { // assertTrue("Didn't find expected string '"+lookingFor+"' in:\n"+output,output.indexOf(lookingFor)!=-1); // } -// +// } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java index f5d18e351..ffcf769df 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. * 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 implementation diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java index 6de83353a..da3328dec 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2005 IBM + * Copyright (c) 2005 IBM * 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 implementation @@ -327,4 +327,4 @@ public class DeclareAnnotationTests extends XMLBasedAjcTestCase { runTest("declare @Type (should be @type)"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java index 0e88d7b3f..55680f041 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -17,16 +17,16 @@ import junit.framework.Test; /** * Enums, the rules/tests: - * + * * 1. cannot make ITDC on an enum * 2. cannot make ITDM or ITDF on an enum * 3. cannot use declare parents to change the super type of an enum * 4. cannot use decp to make an enum type implement an interface * 5. cannot use decp to dec java.lang.Enum as the parent of any type * 6. cannot extend set of values in an enum via an ITD like construct - * 7. Compilation error if you explicitly identify an Enum type. + * 7. Compilation error if you explicitly identify an Enum type. * 8. Lint warning if a non-explicit type pattern would match an enum type. - * + * */ public class Enums extends XMLBasedAjcTestCase { @@ -37,7 +37,7 @@ public class Enums extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + // Cannot make ITDC on an enum public void test001_itdcsOnEnumNotAllowed() { runTest("cant itd constructor on enum"); @@ -67,4 +67,4 @@ public class Enums extends XMLBasedAjcTestCase { // verifyWeavingMessagesOutput(cR,new String[]{}); // } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java index 9a96d31c6..02be16f86 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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: * Adrian Colyer - initial API and implementation @@ -30,21 +30,21 @@ public class HasMember extends XMLBasedAjcTestCase { public void testSimpleDecPHasMethodInherited() { runTest("declare parents : hasmethod(..) - 2"); - } + } public void testSimpleDecPHasMethodInheritedPrivate() { runTest("declare parents : hasmethod(..) - 3"); - } - + } + // this test not passing yet, ITD integration not implemented // public void testDecPHasMethodViaITD() { // runTest("declare parents : hasmethod(..) - 4"); // } - + public void testSimpleDecPHasField() { runTest("declare parents : hasfield(..) - 1"); } - + public void testSimpleDecPHasFieldInherited() { runTest("declare parents : hasfield(..) - 2"); } @@ -53,4 +53,4 @@ public class HasMember extends XMLBasedAjcTestCase { runTest("declare parents : hasfield(..) - 3"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java index 16ba5f286..1d8534cd7 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -16,7 +16,7 @@ import junit.framework.Test; /** - * Checks if we are obeying migration rules. + * Checks if we are obeying migration rules. */ public class MigrationTests extends XMLBasedAjcTestCase { @@ -43,14 +43,14 @@ public class MigrationTests extends XMLBasedAjcTestCase { // assertTrue("Missing class file",f.exists()); // run("Program"); } - + // /** // * We cannot support all aspects built prior to AspectJ 1.2.1 - so we don't support any. // * There are probably many reasons but the first one I've hit is: // * - Changes for cflow optimizations (counters instead of stacks where we can) mean that an aspect // * compiled at AspectJ1.2.0 will contain stack cases but AspectJ1.5.0 will look for counter // * fields in some cases. -// * +// * // * This means we should get a reasonable failure message in this case. // */ // public void testMigrationFrom120_pointcutsAndAdvice() { @@ -58,5 +58,5 @@ public class MigrationTests extends XMLBasedAjcTestCase { // assertTrue("Should have failed",cR.getFailMessages().size()>0); // assertTrue("Should have produced nice message",cR.getFailMessages().get(0).toString().indexOf("Unable to continue")!=-1); // } - -}
\ No newline at end of file + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java index ddd8966a6..5b747bb6d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2005 IBM + * Copyright (c) 2005 IBM * 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 @@ -28,25 +28,25 @@ public class PerTypeWithinTests extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + /** * First few tests: - * + * * Five types p.A, p.B, p.C, q.D, q.E and an aspect a.X. - * + * * The aspect is pertypewithin(p..*) - this should match A,B,C but not D,E. - * + * * Aspect instances should be accessible for A,B,C but not D,E. * The aspect instances for A,B,C should be different. - * + * * hasAspect(), aspectOf() should work. - * - * We test these assumptions in A,B,C,D,E. + * + * We test these assumptions in A,B,C,D,E. */ public void testDoesItWorkAtAll() { runTest("basic ptw test"); } - + public void testCheckHasAspectWorks() { runTest("ptw hasAspect"); } @@ -76,8 +76,8 @@ public class PerTypeWithinTests extends XMLBasedAjcTestCase { assertEquals("Expected same number of messages regardless of perclause", weavingMessagesFromNormalDeploymentModel,weavingMessagesFromPerTypeWithin); } - - + + public void testBinaryWeaving_ClassesAreBinary() { runTest("ptw binary"); } @@ -85,7 +85,7 @@ public class PerTypeWithinTests extends XMLBasedAjcTestCase { public void testBinaryWeaving_AspectsAreBinary() { runTest("ptw binary aspect"); } - + public void testAJDKExamples() { runTest("ajdk: ptw"); } @@ -99,6 +99,6 @@ public class PerTypeWithinTests extends XMLBasedAjcTestCase { // rR.getStdErr().indexOf("advice running")!=-1); // setShouldEmptySandbox(true); // } -// +// // // binary weaving case ... -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/SCCSFixTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/SCCSFixTests.java index 30dba129f..ea53ae6a6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/SCCSFixTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/SCCSFixTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Wes Isberg - initial implementation *******************************************************************************/ @@ -64,7 +64,7 @@ public class SCCSFixTests extends AjcTestCase { String[] args = { "-sourceroots", sourceroot.getPath() }; CompilationResult result = ajc(baseDir, args); assertNoMessages(result); - RunResult r = run("Main"); + RunResult r = run("Main"); String m = r.getStdOut().trim(); assertEquals("I ran", m); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java index 5b970575d..1c3b6fa4a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2005 Contributors + * Copyright (c) 2005 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: * Andrew Huff - initial implementation @@ -23,7 +23,7 @@ public class StaticImports extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + public void testImportStaticSystemDotOut() { runTest("import static java.lang.System.out"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java index 733c946dd..fc510b321 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -23,12 +23,12 @@ public class SuppressedWarnings extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + // Check basic suppression public void testSuppression1() { runTest("suppressing non-matching advice warnings"); } - + // Checks source contexts aren't put out incorrectly // NOTE: Source contexts only come out if the primary source location in a message // matches the file currently being dealt with. Because advice not matching @@ -40,12 +40,12 @@ public class SuppressedWarnings extends XMLBasedAjcTestCase { public void testSuppression2() { runTest("suppressing non-matching advice warnings when multiple source files involved"); } - + public void testSuppressionWithCflow_pr93345() { runTest("XLint warning for advice not applied with cflow(execution)"); } - + public void testSuppressionOfMessagesIssuedDuringMatching() { runTest("SuppressAjWarnings raised during matching"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java index c50c6aa15..63ea6d70a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -17,8 +17,8 @@ import junit.framework.Test; /** * Varargs, the rules/tests: - * - * 1. cannot match on a varargs method by using 'Object[]' in your signature, + * + * 1. cannot match on a varargs method by using 'Object[]' in your signature, * this affects call/execution/initialization/withincode */ public class VarargsTests extends XMLBasedAjcTestCase { @@ -30,9 +30,9 @@ public class VarargsTests extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } - + // check when signature is from a call PCD - // should get message: + // should get message: // "an array type as the last parameter in a signature does not match on the varargs declared method: <blah>" public void test001_cantMatchVarargsWithObjectArray_callPCD() { runTest("varargs not matched by Object[] (call)"); @@ -45,7 +45,7 @@ public class VarargsTests extends XMLBasedAjcTestCase { // check when signature is from an initialization PCD public void test003_cantMatchVarargsWithObjectArray_initPCD() { - runTest("varargs not matched by Object[] (init)"); + runTest("varargs not matched by Object[] (init)"); } // check when signature is from an withincode PCD @@ -62,17 +62,17 @@ public class VarargsTests extends XMLBasedAjcTestCase { public void test_usingVarargsInPointcuts2() { runTest("call with varargs multi-signature"); } - + public void testAJDKExamples() { runTest("ajdk: varargs"); } - + public void testStarVarargs() { runTest("star varargs pattern"); } - + public void testVarargsWithDotDotInPointcut() { runTest("Varargs with .. in pointcut"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java index 796057fa5..13409fb68 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java @@ -1,12 +1,12 @@ /******************************************************************************* * Copyright (c) 2005 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: - * initial development Jonas Bon�r, Alexandre Vasseur + * initial development Jonas Bon�r, Alexandre Vasseur *******************************************************************************/ package org.aspectj.systemtest.ajc150.ataspectj; @@ -22,7 +22,7 @@ import junit.framework.Test; * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> */ public class AtAjAnnotationGenTests extends XMLBasedAjcTestCase { - + public static Test suite() { return XMLBasedAjcTestCase.loadSuite(AtAjAnnotationGenTests.class); } @@ -30,51 +30,51 @@ public class AtAjAnnotationGenTests extends XMLBasedAjcTestCase { protected URL getSpecFile() { return getClassResource("annotationgen.xml"); } - + public void testSimpleAspect() { runTest("annotation gen for simple aspect"); } - + public void testSimpleAspectIn14Mode() { runTest("annotation gen for simple aspect pre 1.5"); } - + public void testAspectAlreadyAnnotated() { - runTest("annotation gen for simple annotated aspect"); + runTest("annotation gen for simple annotated aspect"); } - + public void testPrivilegedAspect() { runTest("annotation gen for privileged aspect"); } - + public void testPerThisAspect() { runTest("annotation gen for perthis aspect"); } - + public void testPerTargetAspect() { runTest("annotation gen for pertarget aspect"); } - + public void testPerCflowAspect() { runTest("annotation gen for percflow aspect"); } - + public void testPerCflowbelowAspect() { runTest("annotation gen for percflowbelow aspect"); } - + public void testPertypewithinAspect() { runTest("annotation gen for pertypewithin aspect"); } - + public void testInnerAspectOfClass() { runTest("annotation gen for inner aspect of aspect"); } - + public void testInnerAspectOfAspect() { runTest("annotation gen for inner aspect of class"); } - + public void testAdvice() { runTest("annotation gen for advice declarations"); } @@ -88,63 +88,63 @@ public class AtAjAnnotationGenTests extends XMLBasedAjcTestCase { } public void testPointcutParams() { - runTest("annotation gen for pointcut params"); + runTest("annotation gen for pointcut params"); } public void testPointcutRefs() { - runTest("annotation gen for pointcut refs"); + runTest("annotation gen for pointcut refs"); } - + public void testBeforeWithBadReturn() { runTest("before ann with non-void return"); } - + public void testTwoAnnotationsOnSameElement() { runTest("two anns on same element"); } - + public void testBadPcutInAdvice() { runTest("bad pcut in after advice"); } - + public void testBadParameterBinding() { runTest("bad parameter binding in advice"); } - + public void testSimpleAtPointcut() { runTest("simple pointcut no params"); } - + public void testPointcutMedley() { runTest("pointcut medley"); } - + public void testAdviceDeclaredInClass() { runTest("advice in a class"); } - + public void testDeows() { runTest("ann gen for deows"); } - + // no reliable way to get around classpath issues for // running this test as part of release script :( // public void testRuntimePointcutsReferencingCompiledPointcuts() { // runTest("runtime pointcut resolution referencing compiled pointcuts"); // } - + public void testDecP() { runTest("ann gen for decp"); } - + public void testDecPAdvanced() { runTest("ann gen for decp 2"); } - + public void testDecS() { runTest("ann gen for decs"); } - + public void testDecPrecedence() { runTest("ann gen for dec precedence"); } @@ -152,7 +152,7 @@ public class AtAjAnnotationGenTests extends XMLBasedAjcTestCase { public void testDecAnnotation() { runTest("ann gen for dec annotation"); } - + public void testITDs() { runTest("ann gen for itds"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java index 15f3f0796..c7be1944c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java index e922075ae..192a84986 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 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: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java index e556be462..3a2e74d03 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -17,7 +17,7 @@ import junit.framework.Test; /** * A suite for @AspectJ aspects located in java5/ataspectj - * + * * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> */ public class AtAjSyntaxTests extends XMLBasedAjcTestCase { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java index 205e0802c..b5ca8901e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * + * 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 + * * Contributors: * Matthew Webster initial implementation *******************************************************************************/ @@ -29,19 +29,19 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ltw.xml"); } - + public void testInclusionAndPattern() { - runTest("Inclusion and patterns"); + runTest("Inclusion and patterns"); } - + public void testExclusionAndPattern() { - runTest("Exclusion and patterns"); + runTest("Exclusion and patterns"); } - + public void testAndPatternsAspects() { - runTest("And patterns aspects"); + runTest("And patterns aspects"); } - + public void test001(){ runTest("Ensure 1st aspect is rewoven when weaving 2nd aspect"); } @@ -52,7 +52,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testOutxmlJar (){ runTest("Ensure valid aop.xml is generated for -outjar"); } - + public void testNoAopxml(){ setSystemProperty(WeavingAdaptor.WEAVING_ADAPTOR_VERBOSE,"true"); runTest("Ensure no weaving without visible aop.xml"); @@ -82,7 +82,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testXsetDisabled () { runTest("Set Xset properties disabled"); } - + public void testXlintfileEmpty () { runTest("Empty Xlint.properties file"); } @@ -106,28 +106,28 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testXlintWarning () { runTest("Override suppressing of warning when advice doesn't match using -Xlint:warning"); } - + public void testNonstandardJarFiles() { - runTest("Nonstandard jar file extensions"); + runTest("Nonstandard jar file extensions"); } - - public void testOddzipOnClasspath() { - runTest("Odd zip on classpath"); + + public void testOddzipOnClasspath() { + runTest("Odd zip on classpath"); } - - public void testJ14LTWWithXML() { + + public void testJ14LTWWithXML() { runTest("JDK14 LTW with XML"); } - -// public void testJ14LTWWithASPECTPATH() { -// runTest("JDK14 LTW with ASPECTPATH"); + +// public void testJ14LTWWithASPECTPATH() { +// runTest("JDK14 LTW with ASPECTPATH"); // } - - //public void testDiscardingWovenTypes() { + + //public void testDiscardingWovenTypes() { // runTest("discarding woven types - 1"); //} - + public void testWeavingTargetOfCallAggressivelyInLTW_DeclareParents_pr133770() { runTest("aggressive ltw - decp"); } @@ -139,23 +139,23 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testWeavingTargetOfCallAggressivelyInLTW_DeclareParents_Nested_pr133770() { runTest("aggressive ltw - decp - 2"); } - + public void testWeavingTargetOfCallAggressivelyInLTW_DeclareParents_Hierarchy_pr133770() { runTest("aggressive ltw - hierarchy"); } - + public void testSeparateCompilationDeclareParentsCall_pr133770() { runTest("separate compilation with ltw: declare parents and call"); } - + public void testConfigurationSystemProperty_pr149289() { runTest("override default path using -Dorg.aspectj.weaver.loadtime.configuration"); } - + public void testSimpleLTW_pr159854 () { runTest("simple LTW"); } - + public void testDumpOnError_pr155033 () { runTest("dump on error"); @@ -164,7 +164,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { dir.listFiles(cff); assertEquals("Missing ajcore file in " + dir.getAbsolutePath(),1,cff.getCount()); } - + public void testMultipleDumpOnError_pr155033 () { runTest("multiple dump on error"); @@ -173,7 +173,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { dir.listFiles(cff); assertEquals("Missing ajcore file in " + dir.getAbsolutePath(),2,cff.getCount()); } - + /* * Allow system properties to be set and restored * TODO maw move to XMLBasedAjcTestCase or RunSpec @@ -181,13 +181,13 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { private final static String NULL = "null"; private Properties savedProperties; - + protected void setSystemProperty (String key, String value) { Properties systemProperties = System.getProperties(); copyProperty(key,systemProperties,savedProperties); systemProperties.setProperty(key,value); } - + private static void copyProperty (String key, Properties from, Properties to) { String value = from.getProperty(key,NULL); to.setProperty(key,value); @@ -200,7 +200,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { protected void tearDown() throws Exception { super.tearDown(); - + /* Restore system properties */ Properties systemProperties = System.getProperties(); for (Enumeration enu = savedProperties.keys(); enu.hasMoreElements(); ) { @@ -210,4 +210,4 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { else systemProperties.setProperty(key,value); } } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java index 5fba25cae..e7e0ab559 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 @@ -278,4 +278,4 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc151.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/AllTestsAspectJ151.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/AllTestsAspectJ151.java index 32a3ed5b3..82bb8465a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/AllTestsAspectJ151.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/AllTestsAspectJ151.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java index 138ffb9f1..a4bc73ebf 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * 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 implementation *******************************************************************************/ @@ -18,7 +18,7 @@ import junit.framework.Test; * This testcode shows what is possible with code style and the current limitations * of @AJ style. Each program is written in both styles and those variations * not currently possible are commented out. - * + * * @author AndyClement * */ @@ -27,7 +27,7 @@ public class AtAroundTests extends XMLBasedAjcTestCase { public void testCodeBasic() { runTest("code style - basic"); } public void testAtBasicNoInline() { runTest("annotation style - basic - noinline"); } public void testAtBasic() { runTest("annotation style - basic"); } - + public void testCodeBindingTarget() { runTest("code style - correct usage, binding and passing same target for call"); } public void testAtBindingTargetNoInline() { runTest("annotation style - correct usage, binding and passing same target for call - noinline"); } public void testAtBindingTarget() { runTest("annotation style - correct usage, binding and passing same target for call"); } @@ -40,7 +40,7 @@ public class AtAroundTests extends XMLBasedAjcTestCase { // Don't think we can report correct errors for @AJ as the parameters are specified as an object array //public void testAtErrorCase1() { runTest("annotation style - forget to pass target");} - public void testCodeBindThisCallChangeProceed() { runTest("code style - bind this on call - change on proceed - no effect");} + public void testCodeBindThisCallChangeProceed() { runTest("code style - bind this on call - change on proceed - no effect");} public void testAtBindThisCallChangeProceedNoInline() { runTest("annotation style - bind this on call - change on proceed - no effect - noinline");} public void testAtBindThisCallChangeProceed() { runTest("annotation style - bind this on call - change on proceed - no effect");} @@ -63,18 +63,18 @@ public class AtAroundTests extends XMLBasedAjcTestCase { public void testCodeBindBothCallChangeProceed() { runTest("code style - bind this and target on call - change on proceed - works");} public void testAtBindBothCallChangeProceedNoInline() { runTest("annotation style - bind this and target on call - change on proceed - works - noinline");} public void testAtBindBothCallChangeProceed() { runTest("annotation style - bind this and target on call - change on proceed - works");} - + public void testBreakingIt1() { runTest("breaking it - one");} public void testBreakingIt2() { runTest("breaking it - two");} - + public void testBugCase1() { runTest("bug case one");} public void testBugCase2() { runTest("bug case two");} public void testMultipleArgs() { runTest("multiple args");} - + public void testCodeSubsetArguments() { runTest("code style - works with subset of arguments in advice");} // cant do this for annotation style //public void testAtSubsetArguments() { runTest("annotation style - works with subset of arguments in advice");} - + // --- public static Test suite() { return XMLBasedAjcTestCase.loadSuite(AtAroundTests.class); @@ -83,5 +83,5 @@ public class AtAroundTests extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ataround.xml"); } - + } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java index 553ce8111..140a3ee1e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * 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 implementation *******************************************************************************/ @@ -21,22 +21,22 @@ import junit.framework.Test; /* * The design: - * + * * There are 3 instructions that create arrays: - * + * * - NEWARRAY for primitive arrays * - ANEWARRAY for object arrays * - MULTIANEWARRAY for multidimensional arrays - * + * * The changes to expose the new joinpoint are in: * BcelClassWeaver.match(LazyMethodGen mg,InstructionHandle ih,BcelShadow enclosingShadow,List shadowAccumulator) - * + * * Determining the type of the array is easy. Determining the size of the array is not easy statically, it is on the stack. - * - * + * + * * What still needs testing: * - structure model - * + * */ public class NewarrayJoinpointTests extends XMLBasedAjcTestCase { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java index a8200876c..2621740d6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. * 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 implementation diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java index edbd540ab..8bcdb63e0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006 IBM * 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 @@ -381,4 +381,4 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc152.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/AllTestsAspectJ152.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/AllTestsAspectJ152.java index 05c311f50..2aea64447 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/AllTestsAspectJ152.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/AllTestsAspectJ152.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java index bb6df5d4c..b7e526aa6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * 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 implementation *******************************************************************************/ @@ -22,20 +22,20 @@ import junit.framework.Test; * points x making the use of lock/unlock conditional on an -Xjoinpoints:synchronization x activating the -Xjoinpoints options from * LTW configurations rather than through batch/AJDT x ensure the lock/unlock joinpoints only appear when * -Xjoinpoints:synchronization specified TAG: Completion of PHASE1 - * - * + * + * * Work items, phase #2: transformation - * + * * Design: transform all synchronized methods: public synchronized void m() { ... } => public void m() { synchronized (this) { ... } * } - * + * * x transforming synchronized methods x matching execution(synchronized * *(..)) for transformed code x warning message for * execution() hitting a synchronized method x ensure verifier runs over generated code (done by just executing the code as part of * the test spec) - Ant task support for -Xjoinpoints TAG: Completion of PHASE2 - * - * + * + * * TAG: Finished - * + * * Future work items: - optimize matching for transformed methods since we *know* the type we are locking on - supporting type * pattern in lock() unlock() - this is not entirely trivial as kinded pointcuts do not usually have any residue - weaving messages * include 'unusual' strings for the join points, not the same as revealed by thisJoinPoint.getSignature() in code - handler is @@ -43,37 +43,37 @@ import junit.framework.Test; * correctly to transformed methods (i.e. inside lock/unlock) - use knowledge of type containing synchronized methods to optimize * matching of (un)lock() - not always needing residue - line number table is incorrect for transformed code (lock joinpoint has no * line number) - * + * * Notes: IllegalMonitorStateException Thrown to indicate that a thread has attempted to wait on an object's monitor or to notify * other threads waiting on an object's monitor without owning the specified monitor. - * + * * around advice won't work on SUN VMs (may be a bug that it does work on other VMs) since the monitor instructions are extracted to * a separate method for proceed() calls and yet the VM seems to want them paired inside a single method. - * + * * Really we only need to restrict the use of around advice on synchronization join points if the advice uses proceed() - but * policing that is a little tough because (DOH) the AdviceAttribute field 'proceedCallSignatures' is never filled in (which records * how many proceeds occur in the advice) - see where it isnt filled in at AdviceDeclaration.resolveStatements() in the loop that * goes over the proceedCalls list. - * - * + * + * * Problems: - Can't run it on a 1.2.1 runtime - just not practical - * - * + * + * * Method transformation, example: - * + * * public synchronized void m(); Code: Stack=2, Locals=1, Args_size=1 0: getstatic #2; //Field * java/lang/System.err:Ljava/io/PrintStream; 3: ldc #3; //String hello 5: invokevirtual #4; //Method * java/io/PrintStream.println:(Ljava/lang/String;)V 8: getstatic #2; //Field java/lang/System.err:Ljava/io/PrintStream; 11: ldc #5; * //String world 13: invokevirtual #4; //Method java/io/PrintStream.println:(Ljava/lang/String;)V 16: return LineNumberTable: line * 4: 0 line 5: 8 line 6: 16 - * + * * public void m2(); Code: Stack=2, Locals=3, Args_size=1 0: aload_0 1: dup 2: astore_1 3: monitorenter 4: getstatic #2; //Field * java/lang/System.err:Ljava/io/PrintStream; 7: ldc #3; //String hello 9: invokevirtual #4; //Method * java/io/PrintStream.println:(Ljava/lang/String;)V 12: getstatic #2; //Field java/lang/System.err:Ljava/io/PrintStream; 15: ldc * #5; //String world 17: invokevirtual #4; //Method java/io/PrintStream.println:(Ljava/lang/String;)V 20: aload_1 21: monitorexit * 22: goto 30 25: astore_2 26: aload_1 27: monitorexit 28: aload_2 29: athrow 30: return Exception table: from to target type 4 22 * 25 any 25 28 25 any - * + * * Factors affecting transformation: - LDC in Java5 supports referring to a class literal, e.g. Foo.class whereas before Java5, it * did not. This means if generating the synchronized() block for a static method from a preJava5 class then we have to generate a * lot of crap to build the class object for locking and unlocking. The object is also stored in a local field of the type (if we diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java index e05662ce8..e7ff69f57 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * 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 implementation *******************************************************************************/ @@ -37,13 +37,13 @@ import junit.framework.Test; /** * Method transformation, example: - * + * * public synchronized void m(); Code: Stack=2, Locals=1, Args_size=1 0: getstatic #2; //Field * java/lang/System.err:Ljava/io/PrintStream; 3: ldc #3; //String hello 5: invokevirtual #4; //Method * java/io/PrintStream.println:(Ljava/lang/String;)V 8: getstatic #2; //Field java/lang/System.err:Ljava/io/PrintStream; 11: ldc #5; * //String world 13: invokevirtual #4; //Method java/io/PrintStream.println:(Ljava/lang/String;)V 16: return LineNumberTable: line * 4: 0 line 5: 8 line 6: 16 - * + * * public void m2(); Code: Stack=2, Locals=3, Args_size=1 0: aload_0 1: dup 2: astore_1 3: monitorenter 4: getstatic #2; //Field * java/lang/System.err:Ljava/io/PrintStream; 7: ldc #3; //String hello 9: invokevirtual #4; //Method * java/io/PrintStream.println:(Ljava/lang/String;)V 12: getstatic #2; //Field java/lang/System.err:Ljava/io/PrintStream; 15: ldc diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java index 84faf9430..98ea6e458 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 @@ -505,4 +505,4 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc153.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java index 2951175f3..4a1936985 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java index 2f473957e..cae886edf 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ package org.aspectj.systemtest.ajc153; @@ -335,7 +335,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase { // ---------- (apart from the prefix) // NOTES: there is no ipe equivalent to a package fragment root or - // + // public void testCompilationUnitSameAsJDT() { // JDT: =TJP Example/src<tjp{Demo.java diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java index 3e384c1fc..f0f5eaa4d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 @@ -20,7 +20,7 @@ import junit.framework.Test; /** * testplan: (x = complete) - * + * * x @AspectJ aspects - are they recognized and sorted correctly ? * x compiling classes (various orderings) * x compiling classes (inheritance relationships) @@ -33,7 +33,7 @@ import junit.framework.Test; * - classes with errors * - aspects with errors * - Xterminate after compilation (now == skip weaving??) - * + * * That this pipeline works OK for large systems is kind of confirmed by using it to build shadows! * */ @@ -45,33 +45,33 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testBuildTwoClassesOneAspect() { runTest("build two classes and one aspect");} public void testBuildTwoAspects() { runTest("build two aspects");} public void testBuildClassAndNestedAspect() { runTest("build one class and deeply nested aspect");} - + public void testAspectExtendsClass() { runTest("aspect extends class"); } - + // verifying the type sorting - public void testRecognizingAnnotationStyleAspects1() { + public void testRecognizingAnnotationStyleAspects1() { AjPipeliningCompilerAdapter.pipelineTesting=true; runTest("recognizing annotation style aspects - 1"); - + String filesContainingAspects = AjPipeliningCompilerAdapter.getPipelineDebugOutput("filesContainingAspects"); assertTrue("Should be one file containing aspects but it thinks there are "+filesContainingAspects,filesContainingAspects.equals("1")); - + String weaveOrder = AjPipeliningCompilerAdapter.getPipelineDebugOutput("weaveOrder"); String expectedOrder="[AtAJAspect.java,ClassOne.java]"; assertTrue("Expected weaving order to be "+expectedOrder+" but was "+weaveOrder,weaveOrder.equals(expectedOrder)); - } - public void testRecognizingAnnotationStyleAspects2() { + } + public void testRecognizingAnnotationStyleAspects2() { AjPipeliningCompilerAdapter.pipelineTesting=true; runTest("recognizing annotation style aspects - 2"); String filesContainingAspects = AjPipeliningCompilerAdapter.getPipelineDebugOutput("filesContainingAspects"); assertTrue("Should be one file containing aspects but it thinks there are "+filesContainingAspects,filesContainingAspects.equals("1")); - + String weaveOrder = AjPipeliningCompilerAdapter.getPipelineDebugOutput("weaveOrder"); String expectedOrder="[AtInnerAJAspect.java,ClassOne.java]"; assertTrue("Expected weaving order to be "+expectedOrder+" but was "+weaveOrder,weaveOrder.equals(expectedOrder)); } - + // verifying the new code for transforming Eclipse Annotations into AspectJ ones public void testAnnotationTransformation() { runTest("annotation transformation"); } @@ -86,4 +86,4 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase { protected URL getSpecFile() { return getClassResource("pipelining.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java index ddf37d42a..d17b0b798 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 @@ -197,7 +197,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { /** * Complex test that attempts to damage a class like a badly behaved bytecode transformer would and checks if AspectJ can cope. - * + * * @throws NoSuchFieldException * @throws SecurityException * @throws IllegalAccessException @@ -226,7 +226,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { * java/io/PrintStream.println:(Ljava/lang/String;)V 12: goto 23 15: pop 16: getstatic #24; //Field * java/lang/System.out:Ljava/io/PrintStream; 19: iload_1 20: invokevirtual #33; //Method java/io/PrintStream.println:(I)V * 23: return Exception table: from to target type 2 15 15 Class java/lang/Exception - * + * * LineNumberTable: line 4: 0 line 6: 2 line 7: 5 line 8: 15 line 9: 16 line 11: 23 LocalVariableTable: Start Length Slot * Name Signature 0 24 0 argv [Ljava/lang/String; 2 22 1 i I 5 10 2 s Ljava/lang/String; */ @@ -368,7 +368,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.PointcutDesignatorHandler#parse(java.lang.String) */ public ContextBasedMatcher parse(String expression) { @@ -397,7 +397,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.ContextBasedMatcher#couldMatchJoinPointsInType(java.lang.Class) */ public boolean couldMatchJoinPointsInType(Class aClass, MatchingContext context) { @@ -410,7 +410,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.ContextBasedMatcher#mayNeedDynamicTest() */ public boolean mayNeedDynamicTest() { @@ -430,7 +430,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.ContextBasedMatcher#matchesDynamically(org.aspectj.weaver.tools.MatchingContext) */ public boolean matchesDynamically(MatchingContext matchContext) { @@ -438,4 +438,4 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc154/AllTestsAspectJ154.java b/tests/src/test/java/org/aspectj/systemtest/ajc154/AllTestsAspectJ154.java index 625327344..415f81a34 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc154/AllTestsAspectJ154.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc154/AllTestsAspectJ154.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc154/CustomMungerExtensionTest.java b/tests/src/test/java/org/aspectj/systemtest/ajc154/CustomMungerExtensionTest.java index 9482c921e..caea6b51b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc154/CustomMungerExtensionTest.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc154/CustomMungerExtensionTest.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2007 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 - * - * 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 + * + * Contributors: * Linton Ye https://bugs.eclipse.org/bugs/show_bug.cgi?id=193065 * ******************************************************************/ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java index 133a11797..627849666 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2007-2008 Contributors + * Copyright (c) 2007-2008 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 @@ -149,4 +149,4 @@ public class Ajc160Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc160.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/AllTestsAspectJ160.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/AllTestsAspectJ160.java index 1a47719e6..7b7f3dd02 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/AllTestsAspectJ160.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/AllTestsAspectJ160.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java index bb5784edc..eee9fcf49 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java @@ -1,27 +1,27 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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 + * * Contributors - * Andy Clement + * Andy Clement * ******************************************************************/ package org.aspectj.systemtest.ajc160; - + import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; /** * Parameter value matching - * + * */ public class AnnotationValueMatchingTests extends XMLBasedAjcTestCase { - + public void testParsing() { runTest("parsing"); } public void testBroken1() { runTest("broken - 1"); } public void testParsingAllAnnotationValueKinds() { runTest("allkinds"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java index fd7afb9f1..eca60d46f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 @@ -29,5 +29,5 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("newfeatures-tests.xml"); } - + } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java index ca377f836..6e9522526 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java @@ -1,46 +1,46 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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 + * * Contributors - * Andy Clement + * Andy Clement * ******************************************************************/ package org.aspectj.systemtest.ajc160; - + import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; /** * Parameter annotation matching - * - * The full implementation will require static matching, binding and possibly runtime + * + * The full implementation will require static matching, binding and possibly runtime * matching (need to check on inheritance of annotations specified in these positions). * The extension to the syntax for method-signatures is to require parentheses when * specifying annotations relating to parameters and parameter types - the position of * the parentheses enable the distinction to be made between annotations attached to * the type of the parameter and annotations attached to the parameter itself. - * + * * For example: - * + * * public void goo(MyType s) {} // where MyType has annotation @B * public void foo(@A String s) {} // String has no annotations, @A is a parameter annotation - * + * * A method signature to match the former would be: - * execution(public void goo(@B MyType)) + * execution(public void goo(@B MyType)) * or execution(public void goo((@B MyType))) * * To match the latter: * execution(public void foo(@A (String))) - * The parentheses around String are telling us that there are no annotations attached to the + * The parentheses around String are telling us that there are no annotations attached to the * parameter type we are interested in, and @A should be treated as an intent to match on * parameter annotation A. - * + * * In a more complex case: * public void hoo(@A MyType s) {} // now there are two potential annotations we are interested in * the match expression is: @@ -51,7 +51,7 @@ import junit.framework.Test; * Testplan: * Test cases for the parameter annotation matching: * DONE: - * 1. Basic pointcut parsing for the new method signature syntax + * 1. Basic pointcut parsing for the new method signature syntax * 2. Expression matching with the new syntax * 3. Real static matching with the new syntax * 4. hasmethod should pick up the new syntax @@ -59,7 +59,7 @@ import junit.framework.Test; * 6. recognizing varargs * 7. constructor matching * 8. binary weaving - * + * * NOT DONE: * . New pointcut designator parsing * . Expression matching with the new syntax @@ -70,10 +70,10 @@ import junit.framework.Test; * . annotation visibility tests * . wildcarded @Ann*1 - broken (not my doing) * . ltw - * + * */ public class ParameterAnnotationMatchingTests extends XMLBasedAjcTestCase { - + public void testDeow() { runTest("deow"); } public void testDeow2() { runTest("deow2"); } public void testNoWarningForWrongType() { runTest("no xlint for wrong target");} @@ -83,8 +83,8 @@ public class ParameterAnnotationMatchingTests extends XMLBasedAjcTestCase { public void testBinaryWeaving() { runTest("binary weaving"); } // this is broken and it was already broken before I added parameter annotation matching ! // public void testWildcardedAnnotationMatching() { runTest("wildcarded matching"); } - - + + ///////////////////////////////////////// public static Test suite() { return XMLBasedAjcTestCase.loadSuite(ParameterAnnotationMatchingTests.class); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java index 41fb83bf2..224e3e599 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java index 8641fcb26..0766faf3e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -199,4 +199,4 @@ public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc161.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/AllTestsAspectJ161.java b/tests/src/test/java/org/aspectj/systemtest/ajc161/AllTestsAspectJ161.java index d5de6f84f..ec6ed0116 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc161/AllTestsAspectJ161.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc161/AllTestsAspectJ161.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java b/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java index 35f3d680e..b1b93d1e5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java @@ -1,16 +1,16 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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 + * * Contributors - * Andy Clement + * Andy Clement * ******************************************************************/ package org.aspectj.systemtest.ajc161; - + import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; @@ -18,10 +18,10 @@ import junit.framework.Test; /** * Optimising Annotation Field Binding - better code gen for the cases where the user just wants a field from the * annotation on a method but not the whole annotation. - * + * */ public class OptimizedAnnotationFieldBinding extends XMLBasedAjcTestCase { - + public void testCaseOne_Syntax() { runTest("case one - syntax"); } @@ -58,7 +58,7 @@ public class OptimizedAnnotationFieldBinding extends XMLBasedAjcTestCase { public void testCaseThirteen_bugNPE() { runTest("case thirteen - bug npe"); } - + ///////////////////////////////////////// public static Test suite() { return XMLBasedAjcTestCase.loadSuite(OptimizedAnnotationFieldBinding.class); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java index 1970aa5c3..e7173f9e8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 @@ -16,11 +16,11 @@ import junit.framework.Test; public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - + public void testNPE_pr363962() { runTest("pr363962"); } - + public void testOffset0_bug324932() { runTest("pr324932"); } @@ -62,4 +62,4 @@ public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc1610.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/AllTestsAspectJ1610.java b/tests/src/test/java/org/aspectj/systemtest/ajc1610/AllTestsAspectJ1610.java index 2dd2ebf1e..b2ec9f68e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/AllTestsAspectJ1610.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1610/AllTestsAspectJ1610.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java index cfed5a765..ed2d22c21 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Lucierna + * Copyright (c) 2010 Lucierna * 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: * Abraham Nevado - initial API and implementation @@ -147,4 +147,4 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("newfeatures-tests.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java index acfcdab87..0cf8be52c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 @@ -104,11 +104,11 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testAnnoStyleAdviceChain_333274() { runTest("anno style advice chain"); } - + public void testAnnoStyleAdviceChain_333274_2() { runTest("code style advice chain"); } - + public void testAnnoStyleAdviceChain_333274_3() { runTest("code style advice chain - no inline"); } @@ -124,4 +124,4 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc1611.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/AllTestsAspectJ1611.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/AllTestsAspectJ1611.java index d52d22ea7..9f6db46a7 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/AllTestsAspectJ1611.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/AllTestsAspectJ1611.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java index e0cfe6dad..a476377ba 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Lucierna + * Copyright (c) 2010 Lucierna * 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: * Abraham Nevado - initial API and implementation @@ -72,4 +72,4 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("newfeatures-tests.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java index d9e52d2b1..53b1edb0b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 @@ -414,4 +414,4 @@ public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc1612.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1612/AllTestsAspectJ1612.java b/tests/src/test/java/org/aspectj/systemtest/ajc1612/AllTestsAspectJ1612.java index 702cfdc39..e2ccc0e09 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1612/AllTestsAspectJ1612.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1612/AllTestsAspectJ1612.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java index 4a6f019d6..702fdcc05 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -204,7 +204,7 @@ public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { /* * test plan execution((..,String,..)) args(..,String,..) - * + * * @args(..,Foo,..) */ // public void testParameterSubsettingMatching_pr233718_Matching() { runTest("parameter subsetting - matching");} @@ -218,4 +218,4 @@ public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc162.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc162/AllTestsAspectJ162.java b/tests/src/test/java/org/aspectj/systemtest/ajc162/AllTestsAspectJ162.java index 409d0d670..64c82921d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc162/AllTestsAspectJ162.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc162/AllTestsAspectJ162.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java index 48d120761..d039b96d0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -105,7 +105,7 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase { /* * public void testInheritedAnnotations_pr128664() { runTest("inherited annotations"); } - * + * * public void testInheritedAnnotations_pr128664_2() { runTest("inherited annotations - 2"); } */ public void testGetMethodNull_pr154427() { @@ -315,4 +315,4 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc163/AllTestsAspectJ163.java b/tests/src/test/java/org/aspectj/systemtest/ajc163/AllTestsAspectJ163.java index f0fbbeaf6..73ae36851 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc163/AllTestsAspectJ163.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc163/AllTestsAspectJ163.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java index c8f6e58b9..affdd6093 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -63,7 +63,7 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase { * was available as source. There are two compile steps in the xml for the test - commenting out the first will allow the source * handles to be seen, leaving it in will switch to binary. Effectively the only difference should be that in the binary case * the handles are prefixed 'binaries'. - * + * * Change due to bug 274558: now AJDT wants (blah.class as the 'source file' for the ITD so that is another difference when * switching. */ @@ -357,7 +357,7 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase { assertEquals("Ljava/lang/Exception; e(3) start=29 len=4", stringify(l, 1)); assertEquals("LFoo2; this(0) start=0 len=34", stringify(l, 4)); assertEquals("Ljava/lang/String; s(2) start=15 len=19", stringify(l, 2)); - // With the 1.8 compiler looks like len=7 and not len=10 here, the goto to jump to the return is no longer included + // With the 1.8 compiler looks like len=7 and not len=10 here, the goto to jump to the return is no longer included // in the variable range assertEquals("Ljava/lang/String; s2(3) start=18 len=7", stringify(l, 3)); } @@ -437,4 +437,4 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } return null; } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/AllTestsAspectJ164.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/AllTestsAspectJ164.java index 1cd45e428..8a8f161c3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/AllTestsAspectJ164.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/AllTestsAspectJ164.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java index 6b366c15d..1f5c135e3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -18,7 +18,7 @@ import junit.framework.Test; * <h4>Design and test coverage</h4><br> * In many ways the design is similar to DeclareParents now - so we have to plug in at the same points, but the code generation for * generating the delegate object and the choice of which interfaces (and methods within those) to mixin is different. - * + * * <h4>Tested:</h4><br> * <ul> * <li>Factory method with void or primitive return value @@ -26,7 +26,7 @@ import junit.framework.Test; * <li>incremental compilation * <li>error message if mixin target instance not compatible with factory method parameter * </ul> - * + * * <h4>Still to test/explore:</h4><br> * <ul> * <li>model relationships @@ -36,7 +36,7 @@ import junit.framework.Test; * <li>Clashing with existing methods * <li>varying parameter type on the factory method * </ul> - * + * * @author Andy Clement */ public class DeclareMixinTests extends org.aspectj.testing.XMLBasedAjcTestCase { @@ -152,4 +152,4 @@ public class DeclareMixinTests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("declareMixin.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java index 80056f9ba..de7037214 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -15,7 +15,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; /** - * + * * @author Andy Clement */ public class JointpointIdTests extends org.aspectj.testing.XMLBasedAjcTestCase { @@ -34,4 +34,4 @@ public class JointpointIdTests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("joinpointid.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java index 46d2c9038..b8ce0afa7 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -120,4 +120,4 @@ public class Ajc165Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc165.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/AllTestsAspectJ165.java b/tests/src/test/java/org/aspectj/systemtest/ajc165/AllTestsAspectJ165.java index f89671e22..8b3c9a32b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc165/AllTestsAspectJ165.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc165/AllTestsAspectJ165.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java index 2e7671ad7..9ca785520 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 @@ -40,4 +40,4 @@ public class WorldTests extends org.aspectj.testing.XMLBasedAjcTestCase { // return new File("../tests/src/org/aspectj/systemtest/ajc165/world.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java index ebf440b3e..537d5a160 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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,4 +100,4 @@ public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc166.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java b/tests/src/test/java/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java index d15a59c0f..e69d69aea 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java index a97708e50..3c519cb83 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java index c587e4e2f..e8966e365 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java index 7f02f0077..4f917e535 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -16,7 +16,7 @@ import junit.framework.Test; /** * Tests for the new all singing all dancing intertype syntax. - * + * * @author Andy Clement */ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { @@ -25,7 +25,7 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSimple() { runTest("simple"); } - + // simple field inside the intertype scope public void testSimpleWithField() { runTest("simple with field"); @@ -35,7 +35,7 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSimpleWithField2() { runTest("simple with field2"); } - + // now a method that new's up an instance of the type targetted by the intertype scope public void testNewInstance() { runTest("new instance"); @@ -45,23 +45,23 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testNewInstanceAndAccess() { runTest("new instance and access"); } - + // two fields public void testNewInstanceAndAccess2() { runTest("new instance and access to two fields"); } - + // more tests: // intertype X { int a,b,c=4; } // intertype X { int a=4,b=3; } // can we say that? // extends/implements on the intertype become declare parents // annotations on the intertype become declare @type - - // what about recovery when we have a problem leaving the scope of the intertype block? How do we make sure + + // what about recovery when we have a problem leaving the scope of the intertype block? How do we make sure // we don't accidentally use the activeScope for ordinary methods? Can we even check that... - - + + // -- public static Test suite() { @@ -73,4 +73,4 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { // return new File("../tests/src/org/aspectj/systemtest/ajc167/intertype.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java index 09d4f2108..b4a2d0f26 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -18,7 +18,7 @@ import junit.framework.Test; * Testing whether AspectJ can overweave. Overweaving is where we attempt to weave something that has already been woven. The simple * rule followed is that aspects that applied to the type before are not applied this time around (if they are visible to the * weaver). - * + * * @author Andy Clement */ public class OverweavingTests extends org.aspectj.testing.XMLBasedAjcTestCase { @@ -79,4 +79,4 @@ public class OverweavingTests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("overweaving.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java index 1f9f18e2d..b1e7ccedf 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -248,4 +248,4 @@ public class Ajc169Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("ajc169.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/AllTestsAspectJ169.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/AllTestsAspectJ169.java index f143fca99..c02a7f97a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/AllTestsAspectJ169.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/AllTestsAspectJ169.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java index 7278a35be..7b9503ceb 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Contributors + * Copyright (c) 2010 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 *******************************************************************************/ package org.aspectj.systemtest.ajc169; @@ -18,7 +18,7 @@ import junit.framework.Test; /** * Tests exploring intertype declared inner types and the new intertype syntax. - * + * * Some design notes.<br> * <p> * Supporting inner types is not quite as straightforward as for the other kinds of ITD like methods, fields and constructors. When @@ -34,7 +34,7 @@ import junit.framework.Test; * Eclipse polices the names of inner types when loading binary type data. The name of the inner is actually maintained as the * aspect name (so an inner type of Foo in an aspect Bar will be called Bar$Foo). The compiler looks after 'attaching' the inner * type to the target type binding when required. - * + * * @author Andy Clement */ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { @@ -45,12 +45,12 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { * 1) we need an innerclass attribute on the target type <br> * 2) we need the name of the innerclass to match its target rather than the declaring aspect<br> * Line 277 in ClassScope:<br> - * + * * memberTypeBindings[count++] = memberScope.buildType(sourceType, sourceType.fPackage, accessRestriction);<br> * which then: builds the name based on the containing aspect. - * + * * TypeDeclaration.generateCode() - * + * */ public void testSeparateCompilation() throws Exception { runTest("separate compilation"); @@ -210,4 +210,4 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassResource("intertype.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java index cea518175..3289e3331 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2008 Contributors + * Copyright (c) 2008 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 @@ -23,28 +23,28 @@ import junit.framework.Test; /** * What would a completely transparent weave be? Is there a minimal subset that makes sense? What is the roadmap to get there? What * needs testing - * + * * --- 'Transparent' here is meaning that the resultant bytecode is more representative of the original declarations, so that it * looks like the intertype declaration and associated constructs have been seamless added to the affected targets. - * - * + * + * * Fully transparent weaving, what would we like to have: - ITDs appear exactly as declared: 'private int A.i' will create 'private * int i' in A - * + * * - What is the benefit? - although this isn't really in keeping with the AspectJ definition of what an ITD represents, having the * end result look like the declaration does make it easier for users simply looking at the resultant class file or attempting * reflection to access what they just ITD'd in place - * - * + * + * * testing For transparent weaving of ITD fields - annotations on new fields - AJDT model - AjType support - what happens to it? - * advice on within() how does that get affected? - visibility - accessors created when required? - handling clashes with existing * fields - handling clashes with other aspects - generic declarations - interface declarations - initializers - static and * non-static - accessibility from advice, for read and write - * + * * Design<br> * The intention will be 'new code' uses the new style whilst old code continues to cause the old code to be built. Whether the code * wants to use the old or new naming should be apparent from the - * + * * @author Andy Clement */ public class TransparentWeavingTests extends org.aspectj.testing.XMLBasedAjcTestCase { @@ -240,4 +240,4 @@ public class TransparentWeavingTests extends org.aspectj.testing.XMLBasedAjcTest return getClassResource("transparentweaving.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java index 42b28c110..a8661038a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008-2012 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/AllTestsAspectJ170.java b/tests/src/test/java/org/aspectj/systemtest/ajc170/AllTestsAspectJ170.java index fbb7cd2c9..a6f1df250 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc170/AllTestsAspectJ170.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc170/AllTestsAspectJ170.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java index b28ddbafa..4aaafa10b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 @@ -18,7 +18,7 @@ import junit.framework.Test; /** * @author Andy Clement - */ + */ public class IndyTests extends org.aspectj.testing.XMLBasedAjcTestCase { // staticinitialization on bytecode containing methodtyperef/methodhandle/bootstrapmethods/invokedynamic @@ -30,12 +30,12 @@ public class IndyTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testInvokeDynamic_execution() throws IOException { runTest("indy - 2"); } - + // call pointcuts on same bytecode public void testInvokeDynamic_call() throws IOException { runTest("indy - 3"); } - + // within(Code1) on same bytecode public void testInvokeDynamic_target() throws IOException { runTest("indy - 4"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java index 53b9aed38..6a4f7fdef 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 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 @@ -16,21 +16,21 @@ import junit.framework.Test; /** * @author Andy Clement - */ + */ public class Ajc171Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - + public void testNpe_pr384401() { runTest("npe"); } - + public void testUnresolvableEnum_pr387568() { runTest("unresolvable enum"); } - + public void testAbstractItds_pr386049() { runTest("itd abstract"); } - + public void testPublicITDFs_pr73507_1() { runTest("public ITDfs - 1"); } @@ -46,15 +46,15 @@ public class Ajc171Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testPublicITDFs_pr73507_4() { runTest("public ITDfs - 4"); } - + public void testPublicITDFs_pr73507_5() { runTest("public ITDfs - 5"); } - + public void testGenerics_384398() { runTest("generics itds"); } - + // public void testGenerics_384398_2() { // runTest("generics itds 2"); // } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java index 68ff45345..f029b5b0f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 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 @@ -16,13 +16,13 @@ import junit.framework.Test; /** * @author Andy Clement - */ + */ public class Ajc171Tests_need17jre extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSoft17_pr387444() { runTest("soft 17"); } - + public void testSoft17_pr387444_2() { runTest("soft 17 2"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java index f9d309794..eda8af4ce 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java index 2637adf97..b3facba82 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2012 Lucierna + * Copyright (c) 2012 Lucierna * 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: * Abraham Nevado (lucierna) - initial implementation @@ -23,7 +23,7 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSharedCache() { this.runTest("Test Shared Cache"); File cacheFolder = new File(ajc.getSandboxDirectory().getAbsolutePath() + File.separator + "panenka.cache"); - assertTrue("Cache folder should be written when using share cache", cacheFolder.exists()); + assertTrue("Cache folder should be written when using share cache", cacheFolder.exists()); //Delete the cache from the ajc sandbox deleteFolder(cacheFolder); } @@ -31,13 +31,13 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { public void testPerClassLoaderCache() { this.runTest("Test Per ClassLoader Cache"); File cacheFolder = new File(ajc.getSandboxDirectory().getAbsolutePath() + File.separator + "panenka.cache"); - assertFalse("Shared Cache Folder should not be present", cacheFolder.exists()); + assertFalse("Shared Cache Folder should not be present", cacheFolder.exists()); } - + public void testDefaultCachePerClassloader() { this.runTest("Test Default Cache Per ClassLoader"); File cacheFolder = new File(ajc.getSandboxDirectory().getAbsolutePath() + File.separator + "panenka.cache"); - assertFalse("By Default Per ClassLoader Cache should be used and not the shared one", cacheFolder.exists()); + assertFalse("By Default Per ClassLoader Cache should be used and not the shared one", cacheFolder.exists()); } // /////////////////////////////////////// @@ -71,4 +71,4 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { // return new File("../tests/src/org/aspectj/systemtest/ajc171/newfeatures-tests.xml"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java index deec8651b..eaf4d86c2 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2012 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 @@ -24,20 +24,20 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testUnsupportedShouldBeNormalError_pr391384() { runTest("unsupported should be normal error"); } - + // if the test is failing because the classes won't run, remove the run blocks from the ajc172.xml entry and re-run to check signatures. public void testSignatures_pr394535() throws Exception { runTest("signatures"); - + JavaClass jc = getClassFrom(ajc.getSandboxDirectory(),"Bug2$ClassA2"); // the working one String sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T::LBug2$Interface12;:LBug2$Interface22;>Ljava/lang/Object;Ljava/io/Serializable;", sss); - + jc = getClassFrom(ajc.getSandboxDirectory(),"Bug$ClassA"); sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T::LBug$Interface1;:LBug$Interface2;>Ljava/lang/Object;Ljava/io/Serializable;", sss); } - + // extends public void testPSignatures_pr399590() throws Exception { runTest("p signatures 1"); @@ -48,7 +48,7 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T:LAnimal2<+LCage2<TT;>;>;>LBar2;Ljava/io/Serializable;", sss); } - + // extends two classes public void testPSignatures_pr399590_2() throws Exception { runTest("p signatures 2"); @@ -59,7 +59,7 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { sss = jc.getSignatureAttribute().getSignature(); assertEquals("<T:LAnimal2<+LCage2<TT;LIntf2;>;LIntf2;>;Q:Ljava/lang/Object;>LBar2;Ljava/io/Serializable;", sss); } - + // super public void testPSignatures_pr399590_3() throws Exception { runTest("p signatures 3"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc172/AllTestsAspectJ172.java b/tests/src/test/java/org/aspectj/systemtest/ajc172/AllTestsAspectJ172.java index b79cc40fa..9a663f12c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc172/AllTestsAspectJ172.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc172/AllTestsAspectJ172.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java index 12fdfd8be..a6ce6f6b4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 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 @@ -25,24 +25,24 @@ public class Ajc173Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testAddRemoveAnnos_407739() throws Exception { runTest("add remove annos"); } - + // public void testOrdering_407966() throws Exception { // runTest("ordering"); // } -// +// // public void testInnerInterfaceMixin_408014() throws Exception { // runTest("inner interface mixin"); // } - + public void testClassAnnoValue_405016_1() throws Exception { // test that class literals allowed runTest("class anno value 1"); } - + public void testInnerNames_407494() throws Exception { runTest("inner names"); } - + public void testInnerNames_407494_2() throws Exception { runTest("inner names 2"); } @@ -54,7 +54,7 @@ public class Ajc173Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testAbstractMethodError_404601() throws Exception { runTest("abstract method error"); } - + public void testDeclareAnnoOnItd() throws Exception { runTest("declare anno on itd"); JavaClass jc = getClassFrom(ajc.getSandboxDirectory(),"C"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc173/AllTestsAspectJ173.java b/tests/src/test/java/org/aspectj/systemtest/ajc173/AllTestsAspectJ173.java index d29869f58..40cea7492 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc173/AllTestsAspectJ173.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc173/AllTestsAspectJ173.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java index 72d7dac08..bd4b734ab 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 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 @@ -18,33 +18,33 @@ import junit.framework.Test; * @author Andy Clement */ public class Ajc174Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - + /* wip public void testAjdtMarkers() throws Exception { runTest("ajdt markers"); } */ - + public void testExtraInserts() throws Exception { runTest("extra inserts"); } - + public void testMoreConfigurableLint_419279() throws Exception { runTest("more configurable lint"); } - + public void testAnnotatedItd_418129() throws Exception { runTest("annotated itd"); } - + public void testAnnotatedItd_418129_2() throws Exception { runTest("annotated itd 2"); } - + public void testAnnotatedItd_418129_3() throws Exception { runTest("annotated itd 3"); } - + public void testAnnotatedItd_418129_4() throws Exception { runTest("annotated itd 4"); } @@ -52,7 +52,7 @@ public class Ajc174Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSuperItdCtor_413378() throws Exception { runTest("super itd ctor"); } - + // no exclusion, this is how it should work public void testCLExclusion_pr368046_1_noskippedloaders() { runTest("classloader exclusion - 1"); @@ -71,7 +71,7 @@ public class Ajc174Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testCLExclusion_pr368046_1_again_noskippedloaders() { runTest("classloader exclusion - 3"); } - + public void testCLExclusion_pr368046_2_usingaopxml() { runTest("classloader exclusion - 4"); } @@ -79,7 +79,7 @@ public class Ajc174Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testCLExclusion_pr368046_2_usingaopxmlReal() { runTest("classloader exclusion - 5"); } - + // --- public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc174/AllTestsAspectJ174.java b/tests/src/test/java/org/aspectj/systemtest/ajc174/AllTestsAspectJ174.java index 01a9525ec..6e7d6b26f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc174/AllTestsAspectJ174.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc174/AllTestsAspectJ174.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java index 9ce61ddab..5fc7dd88e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 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 @@ -18,15 +18,15 @@ import junit.framework.Test; * @author Andy Clement */ public class Ajc175Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - + // public void testIllegalAccessError_430243() throws Exception { // runTest("illegalaccesserror"); // } - + public void testVertxVerifyError_423257() throws Exception { runTest("vertx verify error"); } - + // --- public static Test suite() { @@ -38,6 +38,6 @@ public class Ajc175Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } public static void main(String[] args) { - + } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc175/AllTestsAspectJ175.java b/tests/src/test/java/org/aspectj/systemtest/ajc175/AllTestsAspectJ175.java index 7be7c3bac..c71c5b9d3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc175/AllTestsAspectJ175.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc175/AllTestsAspectJ175.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java index 4ce10c9cd..3710c0a08 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013-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 @@ -22,27 +22,27 @@ public class Ajc180Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testPercflowLtw_432178() { runTest("percflow ltw"); } - + public void testStackmapframe_431976() { runTest("stackmapframe"); } - + public void testThisJoinPointNotInitialized_431976() { runTest("thisJoinPoint not initialized"); } - + public void testNullAnnotationMatching_431541() { runTest("NullAnnotationMatching exception"); } - + public void testAnnosWith18Flags_415957() { runTest("annotations with 1.8 flags"); } - + public void testJava8Code() throws Exception { runTest("first advised java 8 code"); } - + // --- public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc180/AllTestsAspectJ180.java b/tests/src/test/java/org/aspectj/systemtest/ajc180/AllTestsAspectJ180.java index 453c057eb..812d057f3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc180/AllTestsAspectJ180.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc180/AllTestsAspectJ180.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2013 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java index 56955f358..fc939e243 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.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 @@ -19,11 +19,11 @@ import junit.framework.Test; * @author Andy Clement */ public class Ajc181Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - + public void testParameterNamesAttribute_436531() { runTest("parameter names attribute"); } - + public void testVariableNotInitialized_431976() { runTest("variable not initialized"); } @@ -31,21 +31,21 @@ public class Ajc181Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testThisEnclosingJoinPointStaticPartNotInitialized_431976() { runTest("thisEnclosingJoinPointStaticPart not initialized"); } - + public void testLvarTable_435446() throws Exception { runTest("lvartable"); } - + public void testBrokenAnnotations_377096() throws Exception { runTest("broken annotations"); Method method = getMethodFromClass(getClassFrom(ajc.getSandboxDirectory(), "C"), "xxx"); method.getAnnotations(); } - + public void testDefaultMethods_433744() { runTest("default methods"); } - + // --- public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java b/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java index ea1c9a926..3796bd7bd 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java index 89f0e0146..006867372 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 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 @@ -25,7 +25,7 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testBinding_508661() { runTest("various ltw"); } - + public void testBinding_500035() { runTest("ataspectj binding"); } @@ -45,11 +45,11 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testGenericsException_501656() { runTest("generics exception"); } - + public void testAIOOBE_502807() { runTest("unexpected aioobe"); } - + public void testInvokeDynamic_490315() { runTest("indy"); } @@ -65,7 +65,7 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6 public void testInnerClassesAttributeStructure_493554() throws Exception { runTest("pertarget"); - + // Testcode commented out below is for full analysis of the inner class attribute but under // 493554 we are going to remove that attribute for this class JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "example/aspect/FooAspect$ajcMightHaveAspect"); @@ -90,33 +90,33 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // InnerClass innerClass = innerClassArray[0]; // ConstantPool cp = jc.getConstantPool(); // -// // The value of the inner_class_info_index item must be a valid index into the -// // constant_pool table. The constant_pool entry at that index must be a CONSTANT_Class_info +// // The value of the inner_class_info_index item must be a valid index into the +// // constant_pool table. The constant_pool entry at that index must be a CONSTANT_Class_info // // structure representing C. // int innerClassIndex = innerClass.getInnerClassIndex(); // ConstantClass cc = (ConstantClass)cp.getConstant(innerClassIndex); // ConstantUtf8 utf8 = cp.getConstantUtf8(cc.getNameIndex()); // assertEquals("example/aspect/FooAspect$ajcMightHaveAspect",utf8.getStringValue()); -// +// // // The remaining items in the classes array entry give information about C. -// // The value of the outer_class_info_index item must be a valid index into the +// // The value of the outer_class_info_index item must be a valid index into the // // constant_pool table, and the entry at that index must be a CONSTANT_Class_info // // structure representing the class or interface of which C is a member. // int outerClassIndex = innerClass.getOuterClassIndex(); // cc = (ConstantClass)cp.getConstant(outerClassIndex); // utf8 = cp.getConstantUtf8(cc.getNameIndex()); // assertEquals("example/aspect/FooAspect",utf8.getStringValue()); -// -// // The value of the inner_name_index item must be a valid index into the constant_pool table, -// // and the entry at that index must be a CONSTANT_Utf8_info structure (§4.4.7) that represents +// +// // The value of the inner_name_index item must be a valid index into the constant_pool table, +// // and the entry at that index must be a CONSTANT_Utf8_info structure (§4.4.7) that represents // // the original simple name of C, as given in the source code from which this class file was compiled. // int innerNameIndex = innerClass.getInnerNameIndex(); // utf8 = cp.getConstantUtf8(innerNameIndex); // assertEquals("ajcMightHaveAspect",utf8.getStringValue()); -// +// // int innerAccessFlags = innerClass.getInnerAccessFlags(); // assertEquals(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT | Constants.ACC_INTERFACE | Constants.ACC_STATIC,innerAccessFlags); -// +// // // Is InnerClasses attribute well formed for the containing type? // jc = getClassFrom(ajc.getSandboxDirectory(), "example/aspect/FooAspect"); // assertNotNull(jc); @@ -128,13 +128,13 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // innerClass = innerClassArray[0]; // cp = jc.getConstantPool(); // System.out.println(innerClass); -// +// // // inner class name // innerClassIndex = innerClass.getInnerClassIndex(); // cc = (ConstantClass)cp.getConstant(innerClassIndex); // utf8 = cp.getConstantUtf8(cc.getNameIndex()); // assertEquals("example/aspect/FooAspect$ajcMightHaveAspect",utf8.getStringValue()); -// +// // // outer class name // outerClassIndex = innerClass.getOuterClassIndex(); // cc = (ConstantClass)cp.getConstant(outerClassIndex); @@ -145,22 +145,22 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // innerNameIndex = innerClass.getInnerNameIndex(); // utf8 = cp.getConstantUtf8(innerNameIndex); // assertEquals("ajcMightHaveAspect",utf8.getStringValue()); -// +// // // inner modifiers // innerAccessFlags = innerClass.getInnerAccessFlags(); // assertEquals(Constants.ACC_ABSTRACT | Constants.ACC_INTERFACE | Constants.ACC_STATIC,innerAccessFlags); -// +// // // Reflection work getDeclaredClasses? -// +// // // What about other interfaces? } - - - + + + // public void testOverweaving_352389() throws Exception { // runTest("overweaving"); // } - + // --- public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1810/AllTestsAspectJ1810.java b/tests/src/test/java/org/aspectj/systemtest/ajc1810/AllTestsAspectJ1810.java index b4fe6a8f3..fcc60134b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1810/AllTestsAspectJ1810.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1810/AllTestsAspectJ1810.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java index eaa86ad79..61331cdb3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 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 @@ -32,34 +32,34 @@ public class Ajc1811Tests extends org.aspectj.testing.XMLBasedAjcTestCase { ResolvedType outerType = world.resolve(UnresolvedType.forName("Outer")); ResolvedMember m = findMethod(outerType,"m"); - + UnresolvedType type = m.getReturnType(); assertEquals("LOuter$Inner;",type.getSignature()); - + type = m.getGenericReturnType(); assertEquals("LOuter$Inner;",type.getSignature()); - + ResolvedType resolvedType = world.resolve(type); ResolvedType outerResolvedType = resolvedType.getOuterClass(); assertEquals("LOuter;",outerResolvedType.getSignature()); - + ResolvedMember m2 = findMethod(outerType,"m2"); type = m2.getReturnType(); assertEquals("LOuter$Inner;",type.getSignature()); - + type = m2.getGenericReturnType(); assertEquals("LOuter$Inner;",type.getSignature()); - + // public Inner m() { ... } // Method m = findMethod(jc,"m"); // System.out.println(m); // System.out.println(">"+m.getReturnType()); // assertNotNull(returnType); - + // public Outer<String>.Inner m2() { ... } } - -// + +// // public void testMultiArgs_509235() { // runTest("multiargs"); // } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1811/AllTestsAspectJ1811.java b/tests/src/test/java/org/aspectj/systemtest/ajc1811/AllTestsAspectJ1811.java index b8aca6712..d4a6d8e47 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1811/AllTestsAspectJ1811.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1811/AllTestsAspectJ1811.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java index 210d6ee37..a1ae2d7ee 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java b/tests/src/test/java/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java index c0323f0ef..c2bed57ce 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java index e9a168d20..1afdde23c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.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 @@ -26,7 +26,7 @@ public class Ajc183Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSuppressTypeNotFoundAbstract_436653_2() { runTest("suppress type not found - abstract 2"); } - + public void testSuppressTypeNotFoundAbstract_436653_1() { runTest("suppress type not found - abstract 1"); } @@ -42,7 +42,7 @@ public class Ajc183Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSuppressTypeNotFound_436653_3() { runTest("suppress type not found 3"); } - + public void testSuppressTypeNotFound_436653_4() { runTest("suppress type not found 4"); } @@ -58,11 +58,11 @@ public class Ajc183Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testSuppressTypeNotFound_436653_7() { runTest("suppress type not found 7"); } - + public void testSuppressTypeNotFound_436653_8() { runTest("suppress type not found 8"); } - + public void testConstantPool_445395_0() { runTest("constant pool 0"); } @@ -70,15 +70,15 @@ public class Ajc183Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testConstantPool_445395() { runTest("constant pool"); } - + public void testAbstractAspectNPE_444398() { runTest("abstract aspect npe"); } - + public void testVerifyError_443447() { runTest("verifyerror"); } -// +// // public void testAnnoStyleDecp_442425() { // runTest("anno style decp"); // } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java b/tests/src/test/java/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java index 8b68b8e40..8556ff969 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java index 708238746..9d38afe73 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.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 @@ -20,7 +20,7 @@ import junit.framework.Test; public class Ajc184Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // The thisAspectInstance tests here are a copy from Ajc1612Tests but we are compiling with -1.8 and not -1.5 - + public void testThisAspectInstance_239649_1() throws Exception { // simple case runTest("thisAspectInstance - 1"); @@ -95,7 +95,7 @@ public class Ajc184Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // abstract aspects runTest("thisAspectInstance - 15"); } - + public void testIsFinal_449739() { runTest("is final"); } @@ -103,7 +103,7 @@ public class Ajc184Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testIsFinal_449739_2() { runTest("is final - 2"); } - + // --- public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java b/tests/src/test/java/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java index be0b12112..1b04163d0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java index 6d57f64f6..fabe954ee 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.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 @@ -22,7 +22,7 @@ public class Ajc185Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testUnresolvableMember_456357() throws Exception { runTest("unresolvable member"); } - + // Waiting on JDT fix. Second test is a 'variant' that is also causing me issues but not JDT it seems. Let's // see what happens when we pick up the real fixes. // public void testBadAnnos_455608() throws Exception { @@ -33,7 +33,7 @@ public class Ajc185Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // // Will throw ClassFormatException if there is a problem // new ClassFileReader(data, null); // } -// +// // public void testBadAnnos_455608_2() throws Exception { // runTest("bad annos 2"); // JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "Code3"); @@ -42,7 +42,7 @@ public class Ajc185Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // // Will throw ClassFormatException if there is a problem // new ClassFileReader(data, null); // } - + public void testITDInterface_451966() throws Exception { runTest("itd interface"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java b/tests/src/test/java/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java index 0cd580fce..c78847653 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.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 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java index 5c87bd187..2f3726927 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.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 @@ -30,19 +30,19 @@ public class Ajc187Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testMissingJoinpoint_307147_2() throws Exception { runTest("missing joinpoint 2"); } - + public void testInfiniteLoop_475152() throws Exception { runTest("infinite loop"); } - + public void testAnnoConversion_474165() throws Exception { runTest("anno conversion"); } - + public void testLambda_470633() throws Exception { runTest("lambda"); } - + // public void testBrokenJava_469889() throws Exception { // runTest("broken java"); // } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc187/AllTestsAspectJ187.java b/tests/src/test/java/org/aspectj/systemtest/ajc187/AllTestsAspectJ187.java index ef8ff0a1c..ba16247ef 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc187/AllTestsAspectJ187.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc187/AllTestsAspectJ187.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java index 40f4cd4d6..cf9747729 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2015 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 @@ -22,11 +22,11 @@ public class Ajc188Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testClassCast() throws Exception { runTest("classcast"); } - + public void testAnnotationDiscoveryNpe() throws Exception { runTest("annotation discovery npe"); } - + public void testDefaultMethodsWithXnoInline() throws Exception { runTest("default methods 1"); } @@ -34,7 +34,7 @@ public class Ajc188Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testDefaultMethodsWithoutXnoInline() throws Exception { runTest("default methods 2"); } - + public void testCompileError_478003() throws Exception { runTest("compile error"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc188/AllTestsAspectJ188.java b/tests/src/test/java/org/aspectj/systemtest/ajc188/AllTestsAspectJ188.java index 32d3c12bf..62b2c5e7b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc188/AllTestsAspectJ188.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc188/AllTestsAspectJ188.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java index 267f3fdad..055f45c36 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 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 @@ -23,7 +23,7 @@ public class Ajc189Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testJarWeaving_433351() { runTest("jar weaving"); } - + public void testJarWeaving_433351_4() { runTest("jar weaving 4"); } @@ -35,11 +35,11 @@ public class Ajc189Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testJarWeaving_433351_2() { runTest("jar weaving 2"); } - + public void testNPEAtAspectJ() throws Exception { runTest("NPE at aspectj"); } - + public void testLostBounds() throws Exception { runTest("lost bounds"); // This type has I added via declare parents @@ -48,15 +48,15 @@ public class Ajc189Tests extends org.aspectj.testing.XMLBasedAjcTestCase { jc = getClassFrom(ajc.getSandboxDirectory(), "D"); assertEquals("<T::LSomeInterface;:LSomeOtherInterface;>Ljava/lang/Object;LI;",jc.getGenericSignature()); } - + public void testWhileNPE_486203() throws Exception { runTest("while npe"); } - + // public void testOverweaving_352389() throws Exception { // runTest("overweaving"); // } - + // --- public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc189/AllTestsAspectJ189.java b/tests/src/test/java/org/aspectj/systemtest/ajc189/AllTestsAspectJ189.java index 546ef02de..2e902dc1b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc189/AllTestsAspectJ189.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc189/AllTestsAspectJ189.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java index 5157fa8b5..129cfaad8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2016 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 @@ -23,7 +23,7 @@ public class Ajc190Tests extends XMLBasedAjcTestCaseForJava9OrLater { public void testParamAnnosNegative() { runTest("param annos negative"); } - + public void testAnnotMethodHasMember_pr156962_1() { // From similar in Ajc153Tests runTest("Test Annot Method Has Member 1"); } @@ -31,11 +31,11 @@ public class Ajc190Tests extends XMLBasedAjcTestCaseForJava9OrLater { public void testAnnotMethodHasMember_pr156962_2() { // From similar in Ajc153Tests runTest("Test Annot Method Has Member 1"); } - + public void testFunnySignature() { runTest("funny signature with method reference"); } - + // Weave a module with code that isn't in a module public void testWeaveModule() throws Exception { runTest("weave module"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/AllTestsAspectJ190.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/AllTestsAspectJ190.java index d0f7734f3..19e50688f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/AllTestsAspectJ190.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/AllTestsAspectJ190.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java index 557dd0743..89271fbad 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004, 2017 IBM + * Copyright (c) 2004, 2017 IBM * 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 *******************************************************************************/ package org.aspectj.systemtest.ajc190; @@ -16,7 +16,7 @@ import junit.framework.Test; /** * A copy of the 1.5.0 Annotations test but with compliance set to 1.9 * The testdata is referenced in the 150 test folder but the XML file indicates compliance of 1.9. - * + * * @author Andy Clement */ public class Annotations extends XMLBasedAjcTestCase { @@ -170,4 +170,4 @@ public class Annotations extends XMLBasedAjcTestCase { // helper methods..... -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java index 726987f34..dc0392089 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2018 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 *******************************************************************************/ package org.aspectj.systemtest.ajc190; @@ -15,7 +15,7 @@ import org.junit.Assert; import junit.framework.Test; /** - * + * * @author Andy Clement */ public class EfficientTJPTests extends XMLBasedAjcTestCase { @@ -55,24 +55,24 @@ public class EfficientTJPTests extends XMLBasedAjcTestCase { runTest("tjp 4a"); checkPreClinitContains("FourA","Factory.makeMethodESJP"); } - + public void testThisJoinPointFieldGet() { runTest("tjp get fields"); checkPreClinitContains("Fields","Factory.makeFieldSJP"); } - + public void testThisEnclosingJoinPointFieldGet() { - runTest("tjp get fieldsE"); + runTest("tjp get fieldsE"); checkPreClinitContains("FieldsE","Factory.makeMethodESJP"); } - + public void testThisJoinPointFieldSet() { - runTest("tjp set fields"); + runTest("tjp set fields"); checkPreClinitContains("Fields2","Factory.makeFieldSJP"); } public void testThisJoinPointClinit() { - runTest("tjp clinit"); + runTest("tjp clinit"); checkPreClinitContains("Clinit","Factory.makeInitializerSJP"); } @@ -80,13 +80,13 @@ public class EfficientTJPTests extends XMLBasedAjcTestCase { runTest("tejp clinit"); checkPreClinitContains("ClinitE","Factory.makeInitializerESJP"); } - + public void testThisJoinPointAdvice() { // covers enclosing joinpoint too runTest("tjp advice"); checkPreClinitContains("X","Factory.makeAdviceESJP"); } - + public void testThisJoinPointInitialization() { runTest("tjp init"); checkPreClinitContains("A","Factory.makeConstructorESJP"); @@ -102,7 +102,7 @@ public class EfficientTJPTests extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("features190.xml"); } - + public void checkPreClinitContains(String classname, String text) { try { JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), classname); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java index 5937c4423..419e37aad 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2017 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 *******************************************************************************/ package org.aspectj.systemtest.ajc190; @@ -19,11 +19,11 @@ import junit.framework.Test; /** * Building and weaving with modules in the picture. - * + * * Module options from http://openjdk.java.net/jeps/261 - * + * * @author Andy Clement - * + * */ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { @@ -38,7 +38,7 @@ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { public void testRunModuleModulePath() { runTest("run a module - modulepath"); } - + public void testPackageAndRunModuleFromModulePath() { runTest("package and run a module - modulepath"); } @@ -46,7 +46,7 @@ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { public void testBuildModuleIncludingAspects() { runTest("compile module including aspects"); } - + public void testBuildModuleAndApplyAspectsFromAspectPath() { runTest("compile module and apply aspects via aspectpath"); } @@ -63,9 +63,9 @@ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { // public void testModulepathClasspathResolution2() { // runTest("module path vs classpath 2"); // } - + // --add-modules - + // This tests that when using --add-modules with one of the JDK modules (in the jmods subfolder of the JDK) // that it can be found without needing to set --module-path (this seems to be implicitly included by javac too) public void testAddModules1() { @@ -75,7 +75,7 @@ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { } runTest("compile use of java.xml.bind"); } - + // This tests that we can use add-modules to pull in something from the JDK jmods package and that // when subsequently weaving we can see types from those modules public void testWovenAfterAddModules() { @@ -85,7 +85,7 @@ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { } runTest("weave use of java.xml.bind"); } - + // --limit-modules public void testLimitModules1() { if (LangUtil.is11VMOrGreater()) { @@ -103,8 +103,8 @@ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { } runTest("add reads 1"); } - - + + // --- /* For the specified class, check that each method has a stackmap attribute */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java index 46aaddff1..c42a0cc25 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java index 2e1e82e7d..3158a954e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2018 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc191/AllTestsAspectJ191.java b/tests/src/test/java/org/aspectj/systemtest/ajc191/AllTestsAspectJ191.java index 8588b845b..482d61270 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc191/AllTestsAspectJ191.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc191/AllTestsAspectJ191.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2018 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java b/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java index c6d4bc86e..d5505a252 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006, 2081 IBM and 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 *******************************************************************************/ package org.aspectj.systemtest.ajc191; @@ -15,7 +15,7 @@ import junit.framework.Test; * 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 Andy Clement */ public class SanityTestsJava10 extends org.aspectj.testing.XMLBasedAjcTestCase { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java index 8c71266bb..4a227ab05 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2018 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 @@ -25,7 +25,7 @@ public class Ajc192Tests extends XMLBasedAjcTestCase { public void testITDLambdas() throws Exception { runTest("itd lambdas"); } - + public void test11Flags() throws Exception { runTest("11flags"); } @@ -52,11 +52,11 @@ public class Ajc192Tests extends XMLBasedAjcTestCase { NestHost nestHost = (NestHost) getAttributeStartsWith(inner.getAttributes(),"NestHost"); assertEquals("Outer2",nestHost.getHostClassName()); } - + public void testCflowFinal() { runTest("no final on cflow elements"); } - + // TODO Still to be fixed, the workaround to not mix style is good enough for now... public void xtestAroundAdvice_AnnoStyle() { runTest("around advice"); @@ -73,7 +73,7 @@ public class Ajc192Tests extends XMLBasedAjcTestCase { public void testPTW_nonPrivilegedSamePackage() { runTest("ptw - same package"); } - + public void testPTW_privileged() { runTest("ptw - privileged"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/AllTestsAspectJ192.java b/tests/src/test/java/org/aspectj/systemtest/ajc192/AllTestsAspectJ192.java index e47b11632..ef6db6278 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc192/AllTestsAspectJ192.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc192/AllTestsAspectJ192.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2018 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java index 7167249fd..806cdc55b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006, 2018 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 *******************************************************************************/ package org.aspectj.systemtest.ajc192; @@ -16,7 +16,7 @@ import junit.framework.Test; * 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 Andy Clement */ public class SanityTestsJava11 extends XMLBasedAjcTestCaseForJava11OrLater { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java index 6a52df395..4f7bd8047 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2018-2019 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 *******************************************************************************/ -package org.aspectj.systemtest.ajc193; +package org.aspectj.systemtest.ajc193; import java.io.File; @@ -18,7 +18,7 @@ import junit.framework.Test; /** * @author Andy Clement - */ + */ public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater { public void testNestedAroundProceed() { @@ -40,11 +40,11 @@ public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater { public void xtestDeclareMixinOverweaving2() { runTest("overweaving decm - 2"); } - + public void xtestOverweavingDeclareMixinTargetingAspect() { runTest("mood indicator 4"); } - + public void testOverweavingAtDecPControl() { runTest("overweaving atdecp - control"); } @@ -57,18 +57,18 @@ public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater { // This is the same code as the other test but overweaving OFF runTest("overweaving"); } - + public void testComplexOverweaving2() throws Exception { // This is the same code as the other test but overweaving ON runTest("overweaving 2"); // Asserting the weaver state info in the tests that will drive overweaving behaviour: - - // After step 1 of the test, MyAspect will have been applied. + + // After step 1 of the test, MyAspect will have been applied. JavaClass jc = getClassFrom(new File(ajc.getSandboxDirectory(),"ow1.jar"), "Application"); WeaverStateInfo wsi = getWeaverStateInfo(jc); assertEquals("[LMyAspect;]", wsi.getAspectsAffectingType().toString()); assertTrue(wsi.getUnwovenClassFileData().length>0); - + // After overweaving, MyAspect2 should also be getting applied but the unwovenclassfile // data has been blanked out - because we can no longer use it, only overweaving is possible // once one overweaving step is done @@ -77,19 +77,19 @@ public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater { assertEquals("[LMyAspect2;, LMyAspect;]", wsi.getAspectsAffectingType().toString()); assertEquals(0,wsi.getUnwovenClassFileData().length); } - + // Two steps of overweaving public void testComplexOverweaving3() throws Exception { // This is the same code as the other test but overweaving ON runTest("overweaving 3"); // Asserting the weaver state info in the tests that will drive overweaving behaviour: - - // After step 1 of the test, MyAspect will have been applied. + + // After step 1 of the test, MyAspect will have been applied. JavaClass jc = getClassFrom(new File(ajc.getSandboxDirectory(),"ow1.jar"), "Application"); WeaverStateInfo wsi = getWeaverStateInfo(jc); assertEquals("[LMyAspect;]", wsi.getAspectsAffectingType().toString()); assertTrue(wsi.getUnwovenClassFileData().length>0); - + // After overweaving, MyAspect2 should also be getting applied but the unwovenclassfile // data has been blanked out - because we can no longer use it, only overweaving is possible // once one overweaving step is done @@ -109,14 +109,14 @@ public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater { // This is the same code as the other test but overweaving ON runTest("overweaving 4"); // Asserting the weaver state info in the tests that will drive overweaving behaviour: - - // After step 1 of the test, MyAspect will have been applied. + + // After step 1 of the test, MyAspect will have been applied. JavaClass jc = getClassFrom(new File(ajc.getSandboxDirectory(),"ow1.jar"), "Application"); WeaverStateInfo wsi = getWeaverStateInfo(jc); assertEquals("[LMyAspect;]", wsi.getAspectsAffectingType().toString()); - assertTrue(wsi.getUnwovenClassFileData().length>0); + assertTrue(wsi.getUnwovenClassFileData().length>0); } - + // Altered version of this test from org.aspectj.systemtest.ajc150.Enums for 542682 public void testDecpOnEnumNotAllowed_xlints() { runTest("wildcard enum match in itd"); @@ -125,7 +125,7 @@ public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater { public void testEnumDecmixinMessage() { runTest("declare mixin a"); } - + public void testIsAbstractType() { runTest("is abstract"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java index 7f941a3d3..364136be9 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2018-2019 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java index c6a32bcc8..801d99291 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2019 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 *******************************************************************************/ package org.aspectj.systemtest.ajc193; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc195/Ajc195Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc195/Ajc195Tests.java index e629d504b..e85f96f94 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc195/Ajc195Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc195/Ajc195Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2019 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 *******************************************************************************/ package org.aspectj.systemtest.ajc195; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc195/AllTestsAspectJ195.java b/tests/src/test/java/org/aspectj/systemtest/ajc195/AllTestsAspectJ195.java index 81bba9000..e84b6ee4f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc195/AllTestsAspectJ195.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc195/AllTestsAspectJ195.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2018-2019 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java b/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java index 89ac25e07..c3acd04b2 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc195/SanityTestsJava13.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2006, 2018 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 *******************************************************************************/ package org.aspectj.systemtest.ajc195; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java index 045ef6e47..1669f7956 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/Ajc196Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2020 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 *******************************************************************************/ package org.aspectj.systemtest.ajc196; 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 32e95c06b..08013d697 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/AllTestsAspectJ196.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2020 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 *******************************************************************************/ package org.aspectj.systemtest.ajc196; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc196/Java14PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc196/Java14PreviewFeaturesTests.java index 28a2a75c9..6c31f0af2 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc196/Java14PreviewFeaturesTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/Java14PreviewFeaturesTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 *******************************************************************************/ package org.aspectj.systemtest.ajc196; 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 a07e3afa4..554832dd2 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc196/SanityTestsJava14.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2020 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 *******************************************************************************/ package org.aspectj.systemtest.ajc196; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197TestsJava.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197TestsJava.java index 081da9736..5e18926fc 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197TestsJava.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/Ajc197TestsJava.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 *******************************************************************************/ package org.aspectj.systemtest.ajc197; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java index 995cd2976..9aaed7eb8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/AllTestsAspectJ197.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 *******************************************************************************/ package org.aspectj.systemtest.ajc197; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/Java16PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/Java16PreviewFeaturesTests.java index e0c68ccd4..dbcbcf06a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc197/Java16PreviewFeaturesTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/Java16PreviewFeaturesTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 *******************************************************************************/ package org.aspectj.systemtest.ajc197; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java index 8a9d5c3bd..a91d5c240 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava15.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 *******************************************************************************/ package org.aspectj.systemtest.ajc197; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java index ed050f56b..ab28b080f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc197/SanityTestsJava16.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 *******************************************************************************/ package org.aspectj.systemtest.ajc197; diff --git a/tests/src/test/java/org/aspectj/systemtest/apt/AllTestsApt.java b/tests/src/test/java/org/aspectj/systemtest/apt/AllTestsApt.java index fbba0be31..4433a4d5d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/apt/AllTestsApt.java +++ b/tests/src/test/java/org/aspectj/systemtest/apt/AllTestsApt.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 diff --git a/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java b/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java index b459d2a29..fcb9ad596 100644 --- a/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2014,2018 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 diff --git a/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java b/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java index ac8af3a86..593b041bd 100644 --- a/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.aspectpath; diff --git a/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java b/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java index ffccd307c..be13e5b63 100644 --- a/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.base; diff --git a/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java b/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java index 7ef4c838f..762741dee 100644 --- a/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2004 IBM + * Copyright (c) 2004 IBM * 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 @@ -18,7 +18,7 @@ import junit.framework.Test; * These are tests that will run on Java 1.4 and use the old harness format for test specification. */ public class BringUpTests extends org.aspectj.testing.XMLBasedAjcTestCase { - + public static Test suite() { return XMLBasedAjcTestCase.loadSuite(BringUpTests.class); } @@ -31,8 +31,8 @@ public class BringUpTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testEmptyClass() { runTest("empty class"); } - + public void testEmptyAspect() { runTest("empty aspect"); } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java b/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java index d33ef643d..537bc49d3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.design; diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java index 1d0a546dd..4ce172479 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.incremental; @@ -32,12 +32,12 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { super.setUp(); AjState.FORCE_INCREMENTAL_DURING_TESTING = true; } - + protected void tearDown() throws Exception { super.tearDown(); AjState.FORCE_INCREMENTAL_DURING_TESTING = false; } - + public void test001() throws Exception { runTest("expect class added in initial incremental tests"); nextIncrement(false); @@ -97,7 +97,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { deleteFileAndDoIncrementalBuild("src/Target.java",messageSpec); nextIncrement(false); copyFileAndDoIncrementalBuild("changes/Main.50.java","src/Main.java"); - run("Main"); + run("Main"); } public void test007() throws Exception { @@ -113,7 +113,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { copyFileAndDoIncrementalBuild("changes/Main.20.java","src/app/Main.java"); run("app.Main"); } - + /** * See bug report 85297. We plugged a hole so that we check whether the contents of * directories on the classpath have changed when deciding whether we can do an @@ -175,7 +175,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { copyFileAndDoIncrementalBuild("changes/Aspect.20.java","src/Aspect.java",messageSpec); run("Main"); } - + public void testIncrementalResourceAdditionToInPath() throws Exception { runTest("incremental with addition of resource to inpath directory"); RunResult result = run("Hello"); @@ -186,14 +186,14 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { // resources are *NOT* copied from inpath directories assertFalse("Resource file should not exist yet",new File(ajc.getSandboxDirectory(),"AResourceFile.txt").exists()); } - + public void testAdditionOfResourceToInJar() throws Exception { runTest("incremental with addition of resource to inpath jar"); nextIncrement(true); assertFalse("Resource file should not exist yet",new File(ajc.getSandboxDirectory(),"AResourceFile.txt").exists()); copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar"); // resources *are* copied from inpath jars - assertAdded("AResourceFile.txt"); + assertAdded("AResourceFile.txt"); } public void testRemovalOfResourceFromInJar() throws Exception { @@ -202,15 +202,15 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { assertAdded("AResourceFile.txt"); copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar"); // resources *are* copied from inpath jars - assertDeleted("AResourceFile.txt"); + assertDeleted("AResourceFile.txt"); } - + public void testAdditionOfClassToInPathJar() throws Exception { runTest("incremental with addition of class to inpath jar"); nextIncrement(true); assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists()); copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar"); - assertAdded("Hello2.class"); + assertAdded("Hello2.class"); } public void testRemovalOfClassFromInPathJar() throws Exception { @@ -218,15 +218,15 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { nextIncrement(true); assertAdded("Hello2.class"); copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar"); - assertDeleted("Hello2.class"); + assertDeleted("Hello2.class"); } - + public void testAdditionOfClassToInJarJar() throws Exception { runTest("incremental with addition of class to injar jar"); nextIncrement(true); assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists()); copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar"); - assertAdded("Hello2.class"); + assertAdded("Hello2.class"); } public void testRemovalOfClassFromInJarJar() throws Exception { @@ -234,15 +234,15 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { nextIncrement(true); assertAdded("Hello2.class"); copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar"); - assertDeleted("Hello2.class"); + assertDeleted("Hello2.class"); } - + public void testAdditionOfClassToInPathDir() throws Exception { runTest("incremental with addition of class to inpath dir"); nextIncrement(true); assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists()); copyFileAndDoIncrementalBuild("changes/Hello2.20.class", "indir/Hello2.class"); - assertAdded("Hello2.class"); + assertAdded("Hello2.class"); } public void testRemovalOfClassFromInPathDir() throws Exception { @@ -250,9 +250,9 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { nextIncrement(true); assertAdded("Hello2.class"); deleteFileAndDoIncrementalBuild("indir/Hello2.class"); - assertDeleted("Hello2.class"); + assertDeleted("Hello2.class"); } - + public void testUpdateOfClassInInPathDir() throws Exception { runTest("incremental with update of class in inpath dir"); nextIncrement(true); @@ -262,20 +262,20 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { RunResult after = run("Hello"); assertTrue("Should say updated hello",after.getStdOut().startsWith("updated hello")); } - + public void testUsesPointcutRelsWhenReferringToPCTIn2ndFile_pr90806() throws Exception { runTest("NPE in genHandleIdentifier"); nextIncrement(true); copyFileAndDoIncrementalBuild("changes/X.20.aj","src/X.aj"); } - + public void testPersistingDeow_pr84033() throws Exception { runTest("incremental declare error persists after fix"); copyFileAndDoIncrementalBuild("changes/Aspect.20.java", "src/pack/Aspect.java"); nextIncrement(true); RunResult before = run("pack.Main"); } - + public void testIncrementalUpdateOfBodyInAroundAdvice_pr154054() throws Exception { runTest("incremental update of body in around advice"); nextIncrement(true); @@ -288,7 +288,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { assertTrue("value should be 14 but was " + after.getStdOut(), after.getStdOut().startsWith("14")); } - + public void testIncrementalUpdateOfBodyInAroundAdviceWithString_pr154054() throws Exception { runTest("incremental update of body in around advice with string"); nextIncrement(true); diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java index 521248ddb..e7dc2a7c5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.incremental.model; diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java index 0a6538ef9..d9858ce42 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2006 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Adrian Colyer initial implementation diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java index bac2ec86c..0f776db9c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2005 Contributors.All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement initial implementation diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.java index 6b431c1df..92ff1eb06 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbedLauncher.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: + * Copyright (c) 2006 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 + * + * Contributors: * Adrian Colyer Initial implementation * Helen Hawkins Converted to new interface (bug 148190) *******************************************************************/ @@ -18,9 +18,9 @@ package org.aspectj.systemtest.incremental.tools; */ public class AjdeInteractionTestbedLauncher extends MultiProjectIncrementalTests { - + /** - * usage: AjdeInteractionTestbedLauncher srcDir projectName + * usage: AjdeInteractionTestbedLauncher srcDir projectName * @param args workspace_root_dir project_name */ public static void main(String[] args) throws Exception { @@ -31,17 +31,17 @@ public class AjdeInteractionTestbedLauncher extends //launcher.printBuildReport(); launcher.tearDown(); } - + public AjdeInteractionTestbedLauncher(String projectName) { String classPath = System.getProperty("java.class.path"); ((MultiProjTestCompilerConfiguration)getCompilerForProjectWithName(projectName) .getCompilerConfiguration()).setClasspath(classPath); } - + private void buildProject(String projectName) { initialiseProject(projectName); build(projectName); } - - + + } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java index 086c8ce95..4e3416835 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AnnotationProcessingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2014 Contributors + * 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 @@ -19,8 +19,8 @@ import java.util.Map; import org.aspectj.util.FileUtil; public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAjdeInteractionTestbed { - - + + @Override protected void tearDown() throws Exception { super.tearDown(); @@ -35,7 +35,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj new File("../run-all-junit-tests/generated").delete(); } } - + // Basic test: turns on annotation processing and tries to run the DemoProcessor public void testAnnotationProcessing1() throws Exception { createAndBuildAnnotationProcessorProject("ProcessorProject"); @@ -49,7 +49,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj javaOptions.put("org.eclipse.jdt.core.compiler.source", "1.6"); javaOptions.put("org.eclipse.jdt.core.compiler.processAnnotations","enabled"); configureJavaOptionsMap("ProcessorConsumer1", javaOptions); - + configureNewProjectDependency("ProcessorConsumer1", "ProcessorProject"); configureNonStandardCompileOptions("ProcessorConsumer1", "-showWeaveInfo"); build("ProcessorConsumer1"); @@ -59,18 +59,18 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj String out = runMethod("ProcessorConsumer1", "Code", "runner"); assertEquals("aaa running\nccc running\n",out.replace("\r","")); } - + // services file in processor project public void testAnnotationProcessing2() throws Exception { createAndBuildAnnotationProcessorProject("ProcessorProject2"); // This has a META-INF services entry for DemoProcessor - - initialiseProject("ProcessorConsumer2"); + + initialiseProject("ProcessorConsumer2"); // Paths here are the path to DemoProcessor (compiled into the output folder of the ProcessorProject2) and the path to // the META-INF file declaring DemoProcessor (since it is not copied to that same output folder) - this exists in the test src // folder for ProcessorProject2 configureProcessorPath("ProcessorConsumer2", getCompilerForProjectWithName("ProcessorProject2").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString()+File.pathSeparator+ new File(testdataSrcDir + File.separatorChar + "ProcessorProject2" + File.separatorChar + "base"+File.separatorChar+"src").toString()); - + Map<String, String> javaOptions = new Hashtable<>(); javaOptions.put("org.eclipse.jdt.core.compiler.compliance", "1.6"); javaOptions.put("org.eclipse.jdt.core.compiler.codegen.targetPlatform", "1.6"); @@ -81,29 +81,29 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj configureNewProjectDependency("ProcessorConsumer2", "ProcessorProject"); configureNonStandardCompileOptions("ProcessorConsumer2", "-showWeaveInfo"); build("ProcessorConsumer2"); - checkWasFullBuild(); + checkWasFullBuild(); checkCompiledFiles("ProcessorConsumer2","Advise_ccc.java","Advise_aaa.java","Code.java"); assertEquals(2,getWeavingMessages("ProcessorConsumer2").size()); String out = runMethod("ProcessorConsumer2", "Code", "runner"); assertEquals("aaa running\nccc running\n",out.replace("\r","")); } - + // Two processors public void testAnnotationProcessing3() throws Exception { createAndBuildAnnotationProcessorProject("ProcessorProject2"); createAndBuildAnnotationProcessorProject("ProcessorProject3"); initialiseProject("ProcessorConsumer1"); // Paths here are the path to DemoProcessor/DemoProcessor2 compiled code and the path to - // the META-INF file declaring DemoProcessor/DemoProcessor2 (since they are not copied to that same output folder) - + // the META-INF file declaring DemoProcessor/DemoProcessor2 (since they are not copied to that same output folder) - // these exists in the test src folders for ProcessorProject2/ProcessorProject3 - configureProcessorPath("ProcessorConsumer1", + configureProcessorPath("ProcessorConsumer1", getCompilerForProjectWithName("ProcessorProject3").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString()+File.pathSeparator+ new File(testdataSrcDir + File.separatorChar + "ProcessorProject3" + File.separatorChar + "base"+File.separatorChar+"src").toString() +File.pathSeparator+ getCompilerForProjectWithName("ProcessorProject2").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString()+File.pathSeparator+ new File(testdataSrcDir + File.separatorChar + "ProcessorProject2" + File.separatorChar + "base"+File.separatorChar+"src").toString() ); - + // The order here is DemoProcessor2 then DemoProcessor - to get the second one to run I changed DemoProcessor2 to operate on a // specific annotation (java.lang.SuppressWarnings) and return false at the end @@ -115,7 +115,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj javaOptions.put("org.eclipse.jdt.core.compiler.source", "1.6"); javaOptions.put("org.eclipse.jdt.core.compiler.processAnnotations","enabled"); configureJavaOptionsMap("ProcessorConsumer1", javaOptions); - + configureNewProjectDependency("ProcessorConsumer1", "ProcessorProject"); configureNonStandardCompileOptions("ProcessorConsumer1", "-showWeaveInfo"); build("ProcessorConsumer1"); @@ -125,7 +125,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj String out = runMethod("ProcessorConsumer1", "Code", "runner"); assertEquals("aaa running\nAround advice on aaa running\nccc running\nAround advice on ccc running\n",out.replace("\r","")); } - + // Tests: // TODO Incremental compilation - what does that mean with annotation processors? @@ -143,7 +143,7 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj // Assume all processors from processor project configureProcessorPath(projectName, getCompilerForProjectWithName("ProcessorProject").getCompilerConfiguration().getOutputLocationManager().getDefaultOutputLocation().toString()); } - + private void checkCompiledFiles(String projectName, String... expectedCompiledFiles) { List<String> compiledFiles = new ArrayList<>(getCompiledFiles(projectName)); if (compiledFiles.size()!=expectedCompiledFiles.length) { @@ -165,6 +165,6 @@ public class AnnotationProcessingTests extends AbstractMultiProjectIncrementalAj fail("These were not expected to be compiled: "+compiledFiles); } } - - + + } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java index 78caba4ea..52d1540c4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.systemtest.incremental.tools; @@ -22,7 +22,7 @@ import org.aspectj.ajde.core.AjCompiler; public class CompilerFactory { private static Map<String,AjCompiler> compilerMap = new Hashtable<>(); - + /** * If an AjCompiler exists for the given projectDir then returns * that, otherwise creates a new one. @@ -31,7 +31,7 @@ public class CompilerFactory { if (compilerMap.containsKey(projectDir)) { return (AjCompiler) compilerMap.get(projectDir); } - + AjCompiler compiler = new AjCompiler( projectDir, new MultiProjTestCompilerConfiguration(projectDir), @@ -40,9 +40,9 @@ public class CompilerFactory { compilerMap.put(projectDir,compiler); return compiler; } - + /** - * Clears the current map - before doing so clears the state of + * Clears the current map - before doing so clears the state of * each compiler (this ensures everything is cleaned up in the * IncrementalStateManager) */ @@ -53,5 +53,5 @@ public class CompilerFactory { } compilerMap.clear(); } - + } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java index e0a7c2437..54cfa7bec 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2010 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement (SpringSource) initial implementation diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.java index 3f2afc409..588b9dbce 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalOutputLocationManagerTests.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ package org.aspectj.systemtest.incremental.tools; @@ -52,7 +52,7 @@ public class IncrementalOutputLocationManagerTests extends AbstractMultiProjectI public void reportFileRemove(String outputfile, int filetype) { } - + public Map<File,String> getInpathMap() { return Collections.emptyMap(); } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java index c4076fc97..a29b502a3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/IncrementalPerformanceTests.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2008 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://eclipse.org/legal/epl-v10.html - * - * Contributors: + * Copyright (c) 2008 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 + * + * Contributors: * Andy Clement initial implementation *******************************************************************/ package org.aspectj.systemtest.incremental.tools; @@ -16,7 +16,7 @@ import org.aspectj.ajde.core.ICompilerConfiguration; /** * Testing the performance of incremental compilation as it would be in AJDT. - * + * * @author AndyClement */ public class IncrementalPerformanceTests extends AbstractMultiProjectIncrementalAjdeInteractionTestbed { @@ -28,7 +28,7 @@ public class IncrementalPerformanceTests extends AbstractMultiProjectIncremental * <li>Second build is an incremental build with no changes at all. * <li>Third build is an incremental build with just a source file touched (not changed). * </ul> - * + * * <p> * 162-dev, 28Aug08 times: Thinkpad T61p: 3203/3140/3234/3156 173/172/172/172 313/297/297/312 */ @@ -170,4 +170,4 @@ public class IncrementalPerformanceTests extends AbstractMultiProjectIncremental testdataSrcDir = "../tests/multiIncremental"; } -}
\ No newline at end of file +} diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.java index dc19e2993..7da7447dc 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MoreOutputLocationManagerTests.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ package org.aspectj.systemtest.incremental.tools; @@ -28,9 +28,9 @@ import org.aspectj.weaver.bcel.UnwovenClassFile; /** * Similar to OutputLocationManagerTests, however, tests the different scenarios when no outputDir is set but instead there is an * OutputLocationManager which returns the same output location for all files and resources. - * + * * There are eight places where AjBuildConfig.getOutputDir() is called that are tested here: - * + * * AjBuildManager.getOutputClassFileName(..) - testCorrectInfoWhenNoOutputPath AjBuildManager.initBcelWorld(..) - * testPathResolutionWithInpathDirAndNoOutputPath testPathResolutionWithInpathJarAndNoOutputPath AjBuildManager.writeManifest(..) - * testCopyManifest AjBuildManager.writeOutxml(..) - testOutxml - testOutXmlForAspectsWithDifferentOutputDirs @@ -38,9 +38,9 @@ import org.aspectj.weaver.bcel.UnwovenClassFile; * testAjStateDeleteResources AjState.maybeDeleteResources(..) - testAjStateDeleteResourcesInInputDir * AjState.removeAllResultsOfLastBuild(..) - testAllResourcesAreDeletedCorrectlyOnPathChange * IncrementalStateManager.findStateManagingOutputLocation(..) - testFindStateManagingOutputLocation - * + * * The other three places are not tested here because they were implemented when OutputLocationManager was introduced. - * + * */ public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncrementalAjdeInteractionTestbed { @@ -211,11 +211,11 @@ public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncremen // public void testAjStateDeleteResources() { // String inpathDir = inpathTestingDir + File.separator + "inpathJar.jar"; // addInpathEntry(inpathDir); - // + // // build("inpathTesting"); - // + // // AjState state = getState(); - // + // // String resource = expectedOutputDir + File.separator + "inpathResource.txt"; // File f = new File(resource); // assertTrue("expected file " + resource + " to exist but it did not",f.exists()); @@ -250,7 +250,7 @@ public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncremen // } finally { // AjBuildManager.COPY_INPATH_DIR_RESOURCES = false; // } - // + // // } /** * Changing inpath entry from a jar to a directory between builds means that AjState should realise somethings changed. This @@ -336,7 +336,7 @@ public class MoreOutputLocationManagerTests extends AbstractMultiProjectIncremen public File getOutputLocationForClass(File compilationUnit) { return outputLoc; } - + @Override public Map<File,String> getInpathMap() { return Collections.emptyMap(); diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.java index bbdb4a379..002af0073 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestBuildProgressMonitor.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.systemtest.incremental.tools; diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java index a4af3112d..f3dd09c4d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2007 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java index 24018e001..5e293daa0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.systemtest.incremental.tools; diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.java index bb04e515b..d48fab523 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestOutputLocationManager.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.systemtest.incremental.tools; @@ -41,7 +41,7 @@ public class MultiProjTestOutputLocationManager implements IOutputLocationManage initLocations(); return classOutputLoc; } - + public Map getInpathMap() { return Collections.EMPTY_MAP; } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java index 8e5db450f..b132bfc92 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2005 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement initial implementation diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.java index 6f6be1256..6fe5d0bd2 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/OutputLocationManagerTests.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: + * Copyright (c) 2006 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 + * + * Contributors: * Adrian Colyer initial implementation * Helen Hawkins Converted to new interface (bug 148190) *******************************************************************/ @@ -105,7 +105,7 @@ public class OutputLocationManagerTests extends AbstractMultiProjectIncrementalA public void reportFileRemove(String outputfile, int filetype) { } - + public Map<File,String> getInpathMap() { return Collections.emptyMap(); } diff --git a/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java b/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java index f858b118b..56395ba9b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.inpath; diff --git a/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java b/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java index f0e65acd2..731abe3be 100644 --- a/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 * * ******************************************************************/ package org.aspectj.systemtest.java14; diff --git a/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java b/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java index 3997291c0..bd3d45204 100644 --- a/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2005 Contributors * All rights reserved. * This program and the accompanying materials are made available -* under the terms of the Eclipse Public License v1.0 +* 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: * Andrew Huff initial implementation * ******************************************************************/ diff --git a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java index 0c0379b58..bc38cedab 100644 --- a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 * * ******************************************************************/ package org.aspectj.systemtest.knownlimitations; diff --git a/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java b/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java index 5222261d5..b7d08e3a1 100644 --- a/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ package org.aspectj.systemtest.model; @@ -17,7 +17,7 @@ import junit.framework.Test; /** * Tests the model when there is a requirement on Java5 features. - * + * * @see org.aspectj.systemtest.model.ModelTestCase */ public class Model5Tests extends ModelTestCase { diff --git a/tests/src/test/java/org/aspectj/systemtest/model/ModelTestCase.java b/tests/src/test/java/org/aspectj/systemtest/model/ModelTestCase.java index 550ff759a..242f2b4c4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/model/ModelTestCase.java +++ b/tests/src/test/java/org/aspectj/systemtest/model/ModelTestCase.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ package org.aspectj.systemtest.model; @@ -28,7 +28,7 @@ import org.aspectj.util.FileUtil; * ../tests/model/<testid> and that the expected model against which to do the comparison is in the file * ../tests/model/expected/<testid>.txt. One test ensures that both the model and the relationship map are as expected for the given * testdata. - * + * * To write a testcase, create a testdata directory containing the data for the test run and a file containing the expected model * (this can be generated by setting the regenerate flag to true). Add the required configuration to model.xml. Finally, create a * testcase in either ModelTests or Model5Tests (depending on whether the testcase has a requirement on Java5) and call @@ -48,7 +48,7 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase { /* * (non-Javadoc) - * + * * @see junit.framework.TestCase#setUp() */ protected void setUp() throws Exception { @@ -97,7 +97,7 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase { /* * (non-Javadoc) - * + * * @see junit.framework.TestCase#tearDown() */ protected void tearDown() throws Exception { diff --git a/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java b/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java index 86cb1c1df..177c2522b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2006 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://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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 + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ package org.aspectj.systemtest.model; @@ -17,7 +17,7 @@ import junit.framework.Test; /** * Tests the model when there is no requirement on Java5 features. - * + * * @see org.aspectj.systemtest.model.ModelTestCase */ public class ModelTests extends ModelTestCase { diff --git a/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java b/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java index 6b67bc0d7..0420f4060 100644 --- a/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.options; diff --git a/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java b/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java index 38f9ae97b..8b267e995 100644 --- a/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java @@ -2,9 +2,9 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 * * ******************************************************************/ package org.aspectj.systemtest.pre10x; diff --git a/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java b/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java index 7802f4c93..d71806b34 100644 --- a/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.purejava; diff --git a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java index 08c291a56..c915a5c44 100644 --- a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.serialVerUID; diff --git a/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java b/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java index 249953069..5cabdf4ae 100644 --- a/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * 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 - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Matthew Webster - initial implementation *******************************************************************************/ @@ -25,27 +25,27 @@ public class TracingTests extends org.aspectj.testing.XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("tracing.xml"); } - + public void testTracing () { runTest("Tracing"); } - + public void testDefaultTracing () { runTest("Default tracing"); } - + public void testTraceMessages () { runTest("Trace messages"); } - + public void testTraceEverything () { runTest("Trace everything"); } - + public void testJDK14Tracing_pr159854 () { runTest("JDK 1.4 tracing"); } - + public void testTracingFileSystemProperty () { runTest("Tracing file System Property"); diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java b/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java index 51f225ba2..01959edaf 100644 --- a/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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: * Matthew Webster Move Java 5 dependent tests @@ -23,7 +23,7 @@ public class XLint5Tests extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("xlint.xml"); } - + public void testBug99136(){ runTest("Two Xlint warnings wth cflow?"); if(ajc.getLastCompilationResult().getWarningMessages().size() != 1){ diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java b/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java index b14ba5882..39f37d33d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java @@ -2,10 +2,10 @@ * Copyright (c) 2004 IBM Corporation * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * 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 + * * ******************************************************************/ package org.aspectj.systemtest.xlint; @@ -100,63 +100,63 @@ public class XLintTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void test019(){ runTest("XLint warning for call PCD's using subtype of defining type (-1.3 -Xlint:ignore)"); } - + // the following five tests check various scenarios around the lazyTjp XLint message public void test020(){ runTest("no XLint warning: thisJoinPoint potentially lazy and nothing stopping it"); assertTrue("Something prevented the lazytjp optimization from working??",BcelShadow.appliedLazyTjpOptimization); } - + public void test021(){ runTest("XLint warning: thisJoinPoint potentially lazy but stopped by around advice which doesn't use tjp"); assertFalse("lazytjp optimization should have failed to be applied because of around advice at the jp", BcelShadow.appliedLazyTjpOptimization); } - + public void test022(){ runTest("no XLint warning: thisJoinPoint not lazy (no if PCD) but would have been stopped anyway by around advice"); assertFalse("lazytjp optimization should have failed to be applied because of around advice *and* before advice has no if() at the jp", BcelShadow.appliedLazyTjpOptimization); } - + public void test023(){ runTest("no XLint warning: thisJoinPoint cannot be built lazily"); assertFalse("lazytjp optimization should have failed to be applied because before advice has no if() at the jp", BcelShadow.appliedLazyTjpOptimization); - } - + } + public void test024(){ runTest("XLint warning: thisJoinPoint potentially lazy but stopped by around advice which uses tjp"); assertFalse("lazytjp optimization should have failed to be applied because around advice uses tjp", BcelShadow.appliedLazyTjpOptimization); } - + public void test025(){ runTest("check for xlazytjp warning if actually supplied"); assertTrue("Something prevented the lazytjp optimization from working??",BcelShadow.appliedLazyTjpOptimization); } - + public void test026(){ runTest("lazytjp: warning when around advice uses tjp"); } - + public void test027() { runTest("lazytjp: warning when if missing on before advice"); } - + public void test028() { runTest("lazytjp: warning when if missing on after advice"); } - + public void test029() { runTest("lazytjp: multiple clashing advice preventing lazytjp"); } - + public void test030() { runTest("lazytjp: interfering before and around"); } - + // FIXME asc put this back in ! // public void test031() { // if (is15VMOrGreater) diff --git a/tests/src/test/java/org/aspectj/testing/Utils.java b/tests/src/test/java/org/aspectj/testing/Utils.java index c2acd649d..0af324710 100644 --- a/tests/src/test/java/org/aspectj/testing/Utils.java +++ b/tests/src/test/java/org/aspectj/testing/Utils.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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 @@ -20,13 +20,13 @@ import org.aspectj.apache.bcel.util.SyntheticRepository; * Not quite the right place for this class.. */ public class Utils { - + private final static boolean debugVerification=false; - + // /** // * Performs verification of a class - the supplied class is expected to exist in the sandbox // * directory so typically this is called after a small compile step has been invoked to build it. -// * @param ajc +// * @param ajc // */ // public static String verifyClass(Ajc ajc, String clazzname) { // JavaClass jc = null; @@ -37,10 +37,10 @@ public class Utils { // } // if (jc==null) return "Could not find class "+clazzname; // Repository.setRepository(jc.getRepository()); -// Verifier v = VerifierFactory.getVerifier("mypackage.MyAspect"); +// Verifier v = VerifierFactory.getVerifier("mypackage.MyAspect"); // VerificationResult vr = v.doPass1(); // if (debugVerification) System.err.println(vr); -// +// // if (vr.getStatus()!=VerificationResult.VERIFIED_OK) // return "Verification not ok: "+vr; // vr = v.doPass2(); @@ -51,7 +51,7 @@ public class Utils { // for (int i = 0; i < ms.length; i++) { // if (debugVerification) System.err.println("Pass3a for "+ms[i]); // vr = v.doPass3a(i); -// if (debugVerification) System.err.println(vr); +// if (debugVerification) System.err.println(vr); // if (vr.getStatus()!=VerificationResult.VERIFIED_OK) // return "Verification not ok: "+vr; // if (debugVerification) System.err.println("Pass3b for "+ms[i]); @@ -62,7 +62,7 @@ public class Utils { // } // return null; // } - + public static JavaClass getClassFrom(String frompath,String clazzname) throws ClassNotFoundException { SyntheticRepository repos = createRepos(frompath); return repos.loadClass(clazzname); @@ -73,5 +73,5 @@ public class Utils { cpentry+File.pathSeparator+ System.getProperty("java.class.path")); return SyntheticRepository.getInstance(cp); - } + } } diff --git a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java b/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java index 351c91f1e..cf07bfd9d 100644 --- a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java +++ b/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java @@ -8,9 +8,9 @@ import org.aspectj.util.LangUtil; * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Wes Isberg initial implementation diff --git a/tests/test-other-systems.xml b/tests/test-other-systems.xml index 224825a01..09c2b82e6 100644 --- a/tests/test-other-systems.xml +++ b/tests/test-other-systems.xml @@ -5,9 +5,9 @@ <!-- Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Eclipse Public License v1.0 --> +<!-- 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: --> <!-- Xerox/PARC initial implementation --> @@ -70,20 +70,20 @@ <!-- Init --> <!-- ============================================================ --> <target name="init" > - <echo message="init ajctest.xml"/> + <echo message="init ajctest.xml"/> <!-- base dir for other-systems test sources --> - <property name="other-systems.base.dir" + <property name="other-systems.base.dir" location="${basedir}"/> - <property name="jdk.tools.jar" + <property name="jdk.tools.jar" location="XXXTODO_DEFINE_TOOLS.jar"/> - <property name="aspectj.modules.dir" + <property name="aspectj.modules.dir" location="${basedir}/.."/> - <property name="aj.build.results.dir" + <property name="aj.build.results.dir" location="${aspectj.modules.dir}/aj-build"/> - <property name="aspectj.modules.lib.dir" + <property name="aspectj.modules.lib.dir" location="${aspectj.modules.dir}/lib"/> - <property name="aspectj.other-systems.lib.dir" + <property name="aspectj.other-systems.lib.dir" location="${aspectj.modules.lib.dir}/test-other-systems"/> <!-- ============================================================ --> @@ -94,50 +94,50 @@ <!-- zip of other-systems test sources --> <!-- temporary base dir for unzipped test data is not in build temp dir b/c costly --> - <property name="aj.otherSystems.dir" + <property name="aj.otherSystems.dir" location="${basedir}/aj-other-systems"/> <!-- source files --> - <property name="aj.otherSystems.src.dir" + <property name="aj.otherSystems.src.dir" location="${aj.otherSystems.dir}/src"/> - <property name="aj.otherSystems.lib.dir" + <property name="aj.otherSystems.lib.dir" location="${aj.otherSystems.dir}/lib"/> <!-- temp classes dir --> - <property name="output.classes.dir" + <property name="output.classes.dir" location="${aj.otherSystems.dir}/classes"/> <!-- run from source files directory --> - <property name="otherSystems.run.dir" + <property name="otherSystems.run.dir" location="${aj.otherSystems.src.dir}"/> <!-- XXX dependency on ../build/build.xml value for jar output position --> - <property name="aj.jar.dir" + <property name="aj.jar.dir" location="${aj.build.results.dir}/jars"/> - <property name="aj.modules.runtime.jar" + <property name="aj.modules.runtime.jar" location="${aj.jar.dir}/runtime.jar"/> - <property name="aj.modules.eajctesting.jar" + <property name="aj.modules.eajctesting.jar" location="${aj.jar.dir}/testing-drivers-all.jar"/> - <property name="ajctest.classpath" + <property name="ajctest.classpath" value="${aj.modules.eajctesting.jar}" /> <!-- unzipped libraries --> - <property name="otherSystems.src.zip" + <property name="otherSystems.src.zip" location="${aspectj.other-systems.lib.dir}/other-systems-src.zip"/> <!-- unused? - <property name="otherSystems.runtime.jar" + <property name="otherSystems.runtime.jar" location="${aj.otherSystems.dir}/lib/rt.jar"/> - <property name="otherSystems.tools.jar" + <property name="otherSystems.tools.jar" location="${aj.otherSystems.dir}/lib/tools.jar"/> --> <!-- sensible alias to combined other-systems test sources --> - <property name="ajctest.src.dir" + <property name="ajctest.src.dir" value="${aj.otherSystems.src.dir}"/> <!-- runtime classes passed to ajctest using classpath --> - <property name="aj.runtime.classes" + <property name="aj.runtime.classes" value="${aj.modules.runtime.jar}"/> <!-- set args applied to ajc when running all tests --> - <property name="ajctest.args" + <property name="ajctest.args" value="" /> <!-- sources installed? assume everything else is... --> @@ -145,19 +145,19 @@ file="${aj.otherSystems.src.dir}/rsa/src/JCETest.java" /> <!-- check if testing classes are available --> - <available property="aj.modules.runtime.jar.available" + <available property="aj.modules.runtime.jar.available" file="${aj.modules.runtime.jar}" /> - <available property="aj.modules.eajctesting.jar.available" + <available property="aj.modules.eajctesting.jar.available" file="${aj.modules.eajctesting.jar}" /> - <available property="otherSystems.src.zip.available" + <available property="otherSystems.src.zip.available" file="${otherSystems.src.zip}" /> <!-- XXX properties used in testing..Ajctest.java --> - <property name="ajctest.pathelement" + <property name="ajctest.pathelement" location="${aj.modules.eajctesting.jar}" /> <!-- todo: testing.jar for wrapper - only need MainWrapper classes --> - <property name="ajctest.wrapper.jar" - location="${aj.modules.eajctesting.jar}" /> + <property name="ajctest.wrapper.jar" + location="${aj.modules.eajctesting.jar}" /> <!-- echo settings that affect running --> @@ -171,10 +171,10 @@ "## ajctest -----------------------------------" </echo> - <taskdef name="ajctest" + <taskdef name="ajctest" classname="org.aspectj.internal.tools.ant.taskdefs.Ajctest" classpath="${ajctest.classpath}" /> - + <!-- setup needed directories --> <mkdir dir="${output.classes.dir}"/> <mkdir dir="${ajctest.src.dir}"/> @@ -187,7 +187,7 @@ <fail unless="aj.modules.runtime.jar.available" message="build runtime: ${aj.modules.runtime.jar}"/> <fail unless="aj.modules.eajctesting.jar.available" - message="build ${aj.modules.eajctesting.jar} using + message="build ${aj.modules.eajctesting.jar} using ant build.xml build-testing-drivers "/> <fail unless="otherSystems.src.zip.available" @@ -202,14 +202,14 @@ <copy todir="${aj.otherSystems.src.dir}" > <fileset dir="${basedir}/other-systems"/> </copy> - <unzip dest="${aj.otherSystems.src.dir}" + <unzip dest="${aj.otherSystems.src.dir}" src="${otherSystems.src.zip}"/> </target> <!-- ============================================================ --> <!-- Tests that pass - before refactoring (todo remove when done) --> <!-- ============================================================ --> - <target name="temp-pass-tests" + <target name="temp-pass-tests" depends="rsa,biojava,jato,kawa, gnuprolog,jarp,jiu, tt-bytecode,xc4j,jmeter,bcel, @@ -219,7 +219,7 @@ <!-- ============================================================ --> <!-- Tests that pass --> <!-- ============================================================ --> - <target name="pass-tests" + <target name="pass-tests" depends="rsa,biojava,jato,kawa, gnuprolog,jarp,jiu, tt-bytecode,xc4j,jmeter,bcel, @@ -272,7 +272,7 @@ <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> - </classpath> + </classpath> <java classname="TestWrap"/> <java classname="TestWrapException"/> <!-- testset argfiles="testwrapCompileError.lst" / --> @@ -285,7 +285,7 @@ <!-- ============================================================ --> <target name="rsa" depends="prepare"> <ajctest testId="rsa" - dir="${ajctest.src.dir}/rsa" + dir="${ajctest.src.dir}/rsa" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -309,7 +309,7 @@ <target name="biojava" depends="prepare"> <ajctest testId="biojava" - dir="${ajctest.src.dir}/biojava" + dir="${ajctest.src.dir}/biojava" args="${ajctest.args}" destdir="${output.classes.dir}" depends="biojava.depends"> @@ -367,7 +367,7 @@ <target name="jato" depends="prepare"> <ajctest testId="jato" - dir="${ajctest.src.dir}/jato" + dir="${ajctest.src.dir}/jato" args="${ajctest.args}" destdir="${output.classes.dir}" depends="jato.depends"> @@ -422,7 +422,7 @@ </ajctest> </target> - + <target name="gnuprolog.depends" depends="prepare"> <copy todir="${output.classes.dir}"> <fileset dir="${ajctest.src.dir}/gnuprolog/src" includes="**/*.pro"/> @@ -431,7 +431,7 @@ <target name="gnuprolog" depends="prepare"> <ajctest testId="gnuprolog" - dir="${ajctest.src.dir}/gnuprolog" + dir="${ajctest.src.dir}/gnuprolog" args="${ajctest.args},lenient" destdir="${output.classes.dir}" depends="gnuprolog.depends"> @@ -451,7 +451,7 @@ <target name="nsuml" depends="prepare"> <ajctest testId="nsuml" - dir="${ajctest.src.dir}/nsuml" + dir="${ajctest.src.dir}/nsuml" args="JXmx256M,${ajctest.args}" destdir="${output.classes.dir}" depends="nsuml.depends"> @@ -482,7 +482,7 @@ <target name="jarp" depends="prepare"> <ajctest testId="jarp" - dir="${ajctest.src.dir}/jarp" + dir="${ajctest.src.dir}/jarp" args="${ajctest.args}" destdir="${output.classes.dir}" depends="jarp.depends"> @@ -506,7 +506,7 @@ <target name="jiu" depends="prepare"> <ajctest testId="jiu" - dir="${ajctest.src.dir}/jiu" + dir="${ajctest.src.dir}/jiu" args="${ajctest.args}" destdir="${output.classes.dir}" depends="jiu.depends"> @@ -515,7 +515,7 @@ <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <arg value="-i"/> + <arg value="-i"/> <arg value="${ajctest.src.dir}/jiu/test-images/in/airplane.ras"/> <arg value="-o"/> <arg value="${ajctest.src.dir}/jiu/test-images/out/airplane.ras"/> @@ -525,7 +525,7 @@ <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <arg value="-i"/> + <arg value="-i"/> <arg value="${ajctest.src.dir}/jiu/test-images/in/airplane.ras"/> <arg value="-c"/> </java> @@ -535,7 +535,7 @@ <target name="tt-bytecode" depends="prepare"> <ajctest testId="tt-bytecode" - dir="${ajctest.src.dir}/tt-bytecode" + dir="${ajctest.src.dir}/tt-bytecode" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -557,7 +557,7 @@ <target name="xc4j" depends="prepare"> <ajctest testId="xc4j" - dir="${ajctest.src.dir}/xc4j" + dir="${ajctest.src.dir}/xc4j" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -579,7 +579,7 @@ <target name="jmeter" depends="prepare"> <ajctest testId="jmeter" - dir="${ajctest.src.dir}/jmeter" + dir="${ajctest.src.dir}/jmeter" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -596,7 +596,7 @@ <target name="bcel" depends="prepare"> <ajctest testId="bcel" - dir="${ajctest.src.dir}/bcel" + dir="${ajctest.src.dir}/bcel" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -637,7 +637,7 @@ <target name="jedit" depends="prepare"> <ajctest testId="jedit" - dir="${ajctest.src.dir}/jedit" + dir="${ajctest.src.dir}/jedit" args="JXmx256M,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -650,7 +650,7 @@ <target name="jame" depends="prepare"> <ajctest testId="jame" - dir="${ajctest.src.dir}/jame" + dir="${ajctest.src.dir}/jame" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -663,7 +663,7 @@ <target name="sablecc" depends="prepare"> <ajctest testId="sablecc" - dir="${ajctest.src.dir}/sablecc" + dir="${ajctest.src.dir}/sablecc" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -686,8 +686,8 @@ <fileset dir="../docs/dist/doc/examples"/> </copy> <!-- copy to temp.examples.dir --> - <ajctest testId="examples" - dir="${aj.tempExamples.dir}" + <ajctest testId="examples" + dir="${aj.tempExamples.dir}" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -696,38 +696,38 @@ </classpath> <testset argfiles="bean/files.lst" classes="bean.Demo"/> - <testset argfiles="coordination/lib.lst" + <testset argfiles="coordination/lib.lst" classes=""/> <testset argfiles="introduction/files.lst" classes="introduction.CloneablePoint, introduction.ComparablePoint, introduction.HashablePoint, introduction.Point"/> - <testset argfiles="observer/files.lst" + <testset argfiles="observer/files.lst" classes=""/> - <testset argfiles="spacewar/debug.lst" + <testset argfiles="spacewar/debug.lst" classes=""/> - <testset argfiles="spacewar/demo.lst" + <testset argfiles="spacewar/demo.lst" classes=""/> <testset argfiles="telecom/basic.lst" classes="telecom.BasicSimulation"/> - - <testset argfiles="telecom/billing.lst" + + <testset argfiles="telecom/billing.lst" classes="telecom.BillingSimulation" /> - <testset argfiles="telecom/timing.lst" + <testset argfiles="telecom/timing.lst" classes="telecom.TimingSimulation" /> - <testset argfiles="tjp/files.lst" + <testset argfiles="tjp/files.lst" classes="tjp.Demo"/> - <testset argfiles="tracing/notrace.lst" + <testset argfiles="tracing/notrace.lst" classes="tracing.ExampleMain"/> - <testset argfiles="tracing/tracelib.lst" + <testset argfiles="tracing/tracelib.lst" classes="tracing.lib.TraceMyClasses"/> - <testset argfiles="tracing/tracev1.lst" + <testset argfiles="tracing/tracev1.lst" classes="tracing.version1.TraceMyClasses"/> - <testset argfiles="tracing/tracev2.lst" + <testset argfiles="tracing/tracev2.lst" classes="tracing.version2.TraceMyClasses"/> - <testset argfiles="tracing/tracev3.lst" + <testset argfiles="tracing/tracev3.lst" classes="tracing.version3.TraceMyClasses"/> </ajctest> </target> @@ -735,7 +735,7 @@ <target name="ajc" depends="prepare"> <echo message="tools: ${jdk.tools.jar}"/> <ajctest testId="ajc" - dir="${ajctest.src.dir}/ajc-src" + dir="${ajctest.src.dir}/ajc-src" args="time,JXmx256M,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -770,13 +770,13 @@ </target> <target name="java-src.depends" depends="prepare"> - <copy todir="${output.classes.dir}" + <copy todir="${output.classes.dir}" file="${ajctest.src.dir}/java-src/tests/net/HttpTest.java"/> </target> <target name="java-src" depends="prepare"> <ajctest testId="java-src" - dir="${ajctest.src.dir}/java-src" + dir="${ajctest.src.dir}/java-src" args="JXmx256M,time,${ajctest.args}" destdir="${output.classes.dir}" depends="java-src.depends"> @@ -834,7 +834,7 @@ <target name="swing" depends="prepare"> <ajctest testId="swing" - dir="${otherSystems.run.dir}" + dir="${otherSystems.run.dir}" args="JXmx256M,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -873,7 +873,7 @@ <target name="applets" depends="prepare"> <ajctest testId="applets" - dir="${ajctest.src.dir}/applets" + dir="${ajctest.src.dir}/applets" args="${ajctest.args}" destdir="${output.classes.dir}" depends="applets.depends"> @@ -891,7 +891,7 @@ <target name="hard-java-src" depends="prepare" unless="skip.hard.tests" > <ajctest testId="hard-java-src" - dir="${ajctest.src.dir}/java-src" + dir="${ajctest.src.dir}/java-src" args="JXmx400M,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -908,7 +908,7 @@ <target name="jsci" depends="prepare"> <ajctest testId="jsci" - dir="${ajctest.src.dir}/jsci" + dir="${ajctest.src.dir}/jsci" args="${ajctest.args}" destdir="${output.classes.dir}"> <classpath> @@ -928,14 +928,14 @@ <!-- ============================================================ --> <!-- Tests for ajctest taskdef --> <!-- ============================================================ --> - <target name="testAjctest" + <target name="testAjctest" depends="testAjctest.fail,testAjctest.pass"/> - <target name="testAjctest.pass" + <target name="testAjctest.pass" depends="testAjctest.exit.pass,testAjctest.normal.pass"/> - <target name="testAjctest.fail" + <target name="testAjctest.fail" depends="testAjctest.exception.fail,testAjctest.error.fail, testAjctest.exit.fail,testAjctest.compileFailure.fail"/> - <target name="testAjctest.depends" + <target name="testAjctest.depends" depends="prepare"> <property name="testAjctest.src.dir" location="${basedir}/harness/ajctest"/> @@ -943,15 +943,15 @@ <target name="testAjctest.all" depends="testAjctest.depends"> <ajctest testId="testAjctest.all" - dir="${testAjctest.src.dir}" + dir="${testAjctest.src.dir}" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <java classname="Driver"/> - <java classname="Driver"> + <java classname="Driver"/> + <java classname="Driver"> <arg line="-exit 0"/> </java> <java classname="Driver"> @@ -971,14 +971,14 @@ <target name="testAjctest.normal.pass" depends="testAjctest.depends"> <ajctest testId="testAjctest.normal.pass" - dir="${testAjctest.src.dir}" + dir="${testAjctest.src.dir}" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <java classname="Driver"/> + <java classname="Driver"/> <testset argfiles="aspect.lst"/> <testset argfiles="driver.lst"/> </ajctest> @@ -986,14 +986,14 @@ <target name="testAjctest.exception.fail" depends="testAjctest.depends"> <ajctest testId="testAjctest.exception.fail" - dir="${testAjctest.src.dir}" + dir="${testAjctest.src.dir}" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <java classname="Driver"> + <java classname="Driver"> <arg line="-exception exceptionMessage"/> </java> <testset argfiles="aspect.lst"/> @@ -1003,14 +1003,14 @@ <target name="testAjctest.error.fail" depends="testAjctest.depends"> <ajctest testId="testAjctest.error.fail" - dir="${testAjctest.src.dir}" + dir="${testAjctest.src.dir}" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <java classname="Driver"> + <java classname="Driver"> <arg line="-error errorMessage"/> </java> <testset argfiles="aspect.lst"/> @@ -1020,14 +1020,14 @@ <target name="testAjctest.exit.fail" depends="testAjctest.depends"> <ajctest testId="testAjctest.exit.fail" - dir="${testAjctest.src.dir}" + dir="${testAjctest.src.dir}" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <java classname="Driver"> + <java classname="Driver"> <arg line="-exit 1"/> </java> <testset argfiles="aspect.lst"/> @@ -1037,14 +1037,14 @@ <target name="testAjctest.exit.pass" depends="testAjctest.depends"> <ajctest testId="testAjctest.exit.pass" - dir="${testAjctest.src.dir}" + dir="${testAjctest.src.dir}" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <java classname="Driver"> + <java classname="Driver"> <arg line="-exit 0"/> </java> <testset argfiles="aspect.lst"/> @@ -1054,14 +1054,14 @@ <target name="testAjctest.compileFailure.fail" depends="testAjctest.depends"> <ajctest testId="testAjctest.compileFailure.fail" - dir="${testAjctest.src.dir}" + dir="${testAjctest.src.dir}" args="version,${ajctest.args}" destdir="${output.classes.dir}"> <classpath> <pathelement path="${output.classes.dir}"/> <pathelement path="${aj.runtime.classes}"/> </classpath> - <java classname="Driver"/> + <java classname="Driver"/> <testset argfiles="error.lst"/> </ajctest> </target> |