diff options
Diffstat (limited to 'ajde.core/testdata/WeaveInfoMessagesTest')
48 files changed, 271 insertions, 0 deletions
diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice.aj b/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice.aj new file mode 100644 index 000000000..2cb3abd41 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice.aj @@ -0,0 +1,32 @@ +// Simple aspect that tramples all over Simple.java + +public aspect AspectAdvice { + + // Go through all the kinds of things that might affect a type: + pointcut methodRunning(): execution(* *(..)) && !execution(* main(..)); + + before(): methodRunning() { + System.err.println("BEFORE ADVICE"); + } + + after(): methodRunning() { + System.err.println("AFTER ADVICE"); + } + + after() returning: methodRunning() { + System.err.println("AFTER RETURNING ADVICE"); + } + + after() throwing : methodRunning() { + System.err.println("AFTER THROWING ADVICE"); + } + + void around(): execution(* main(..)) && !cflow(adviceexecution()){ + System.err.println("AROUND ADVICE"); + proceed(); + } + + + interface markerInterface { + } +} diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice.jar Binary files differnew file mode 100644 index 000000000..c8e31eb06 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice_nodebug.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice_nodebug.jar Binary files differnew file mode 100644 index 000000000..37a40992b --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectAdvice_nodebug.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare.aj b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare.aj new file mode 100644 index 000000000..8e6ef0a6a --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare.aj @@ -0,0 +1,24 @@ +// Simple aspect that tramples all over Simple.java + +public aspect AspectDeclare { + + pointcut methodRunning(): execution(* *(..)); + + declare parents: Simple implements MarkerInterface; + +// declare parents: Simple extends InTheWay; + +// declare soft: +// +// declare precedence: +// +// declare warning: +// +// declare error: +// +} + + +interface MarkerInterface {} + +class InTheWay {}
\ No newline at end of file diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare.jar Binary files differnew file mode 100644 index 000000000..f0e7b00ce --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareAnnotations.aj b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareAnnotations.aj new file mode 100644 index 000000000..46bda48f8 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareAnnotations.aj @@ -0,0 +1,25 @@ +// little aspect and class for testing declaration of annotations + +@interface anInterface {} + +public aspect AspectDeclareAnnotations{ + + declare @type : Test : @anInterface; + declare @constructor : Test.new(String,int) : @anInterface; + declare @method : int Test.fac(int) : @anInterface; + declare @field : int Test.a : @anInterface; + +} + +class Test{ + + public Test(String say, int something){ + System.out.println(say + something); + } + + public int fac(int n){ + return (n == 0)? 1 : n * fac(n-1); + } + + public int a = 1; +} diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareExtends.aj b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareExtends.aj new file mode 100644 index 000000000..1b081cc32 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareExtends.aj @@ -0,0 +1,22 @@ +// Simple aspect that tramples all over Simple.java + +public aspect AspectDeclareExtends { + + pointcut methodRunning(): execution(* *(..)); + + declare parents: Simple extends InTheWay; + +// declare soft: +// +// declare precedence: +// +// declare warning: +// +// declare error: +// +} + + +interface MarkerInterface {} + +class InTheWay {} diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.aj b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.aj new file mode 100644 index 000000000..c5adc9539 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.aj @@ -0,0 +1,9 @@ + +public aspect AspectDeclareSoft { + + declare soft: MyException: execution(* main(..)); + + declare soft: Exception+: execution(* main(..)); + +} +class MyException extends Exception {} diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.jar Binary files differnew file mode 100644 index 000000000..cde9a1468 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft_nodebug.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft_nodebug.jar Binary files differnew file mode 100644 index 000000000..a66608b39 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclareSoft_nodebug.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare_nodebug.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare_nodebug.jar Binary files differnew file mode 100644 index 000000000..149f5706d --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectDeclare_nodebug.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.aj b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.aj new file mode 100644 index 000000000..941be481d --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.aj @@ -0,0 +1,17 @@ +// Simple aspect that tramples all over Simple.java + +public aspect AspectITD { + + int Simple.fieldint = 5; + + String Simple.fieldstring = "hello"; + + public int Simple.returnint() { + return 5; + } + + public String Simple.returnstring() { + return "abc"; + } + +}
\ No newline at end of file diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.class b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.class Binary files differnew file mode 100644 index 000000000..8048ad9f7 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.class diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.jar Binary files differnew file mode 100644 index 000000000..f007e0d78 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD_nodebug.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD_nodebug.jar Binary files differnew file mode 100644 index 000000000..f007e0d78 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectITD_nodebug.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectInPackage.aj b/ajde.core/testdata/WeaveInfoMessagesTest/AspectInPackage.aj new file mode 100644 index 000000000..74ff94b1a --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectInPackage.aj @@ -0,0 +1,10 @@ +package pkg; + +public aspect AspectInPackage { + + pointcut p() : execution(* *.*(..)); + + before() : p() { + } + +} diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/AspectInPackage.jar b/ajde.core/testdata/WeaveInfoMessagesTest/AspectInPackage.jar Binary files differnew file mode 100644 index 000000000..a9d117f04 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/AspectInPackage.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Empty.lst b/ajde.core/testdata/WeaveInfoMessagesTest/Empty.lst new file mode 100644 index 000000000..c9e24d32f --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Empty.lst @@ -0,0 +1 @@ +-showWeaveInfo diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Five.lst b/ajde.core/testdata/WeaveInfoMessagesTest/Five.lst new file mode 100644 index 000000000..280a0fb61 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Five.lst @@ -0,0 +1,3 @@ +Simple.java +-showWeaveInfo +AspectDeclareSoft.aj diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Four.lst b/ajde.core/testdata/WeaveInfoMessagesTest/Four.lst new file mode 100644 index 000000000..6280b5199 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Four.lst @@ -0,0 +1,3 @@ +AspectDeclareExtends.aj +Simple.java +-showWeaveInfo diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/One.lst b/ajde.core/testdata/WeaveInfoMessagesTest/One.lst new file mode 100644 index 000000000..311131dff --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/One.lst @@ -0,0 +1,3 @@ +AspectAdvice.aj +Simple.java +-showWeaveInfo diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Seven.lst b/ajde.core/testdata/WeaveInfoMessagesTest/Seven.lst new file mode 100644 index 000000000..b75e472ad --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Seven.lst @@ -0,0 +1,2 @@ +-1.5 +AspectDeclareAnnotations.aj diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Simple.class b/ajde.core/testdata/WeaveInfoMessagesTest/Simple.class Binary files differnew file mode 100644 index 000000000..d6dca7fc3 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Simple.class diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Simple.jar b/ajde.core/testdata/WeaveInfoMessagesTest/Simple.jar Binary files differnew file mode 100644 index 000000000..73d800007 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Simple.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Simple.java b/ajde.core/testdata/WeaveInfoMessagesTest/Simple.java new file mode 100644 index 000000000..934087546 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Simple.java @@ -0,0 +1,21 @@ +// A simple class, interfered with by all sorts of advice ! + +public class Simple { + + public void m1() { + + } + + public String m2() { + return "a"; + } + + public static void main(String[] argv) { + + } + + private void mSecret() { + + } + +}
\ No newline at end of file diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Simple_nodebug.jar b/ajde.core/testdata/WeaveInfoMessagesTest/Simple_nodebug.jar Binary files differnew file mode 100644 index 000000000..b8e45da32 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Simple_nodebug.jar diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Six.lst b/ajde.core/testdata/WeaveInfoMessagesTest/Six.lst new file mode 100644 index 000000000..51eaf0703 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Six.lst @@ -0,0 +1,3 @@ +-showWeaveInfo +-1.5 +AspectDeclareAnnotations.aj diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Three.lst b/ajde.core/testdata/WeaveInfoMessagesTest/Three.lst new file mode 100644 index 000000000..ab4036e12 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Three.lst @@ -0,0 +1,3 @@ +AspectDeclare.aj +Simple.java +-showWeaveInfo diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/Two.lst b/ajde.core/testdata/WeaveInfoMessagesTest/Two.lst new file mode 100644 index 000000000..211ef3e7c --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/Two.lst @@ -0,0 +1,3 @@ +AspectITD.aj +Simple.java +-showWeaveInfo diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/a.lst b/ajde.core/testdata/WeaveInfoMessagesTest/a.lst new file mode 100644 index 000000000..6c17ede94 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/a.lst @@ -0,0 +1,2 @@ +Simple.jar +-showWeaveInfo diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/build.xml b/ajde.core/testdata/WeaveInfoMessagesTest/build.xml new file mode 100644 index 000000000..774291d74 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/build.xml @@ -0,0 +1,18 @@ +<project name="aspectj-examples" default="spacewar" basedir="."> + + <!--target name="init.taskdefs"--> + <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"> + <classpath> + <pathelement path="c:\aspectj1.2\lib\aspectjtools.jar"/> + </classpath> + </taskdef> + <!--/target--> + + <target name="spacewar"> + <iajc destdir="." argfiles="Two.lst" debug="off" + fork="true" forkclasspath="c:\aspectj1.2\lib\aspectjtools.jar" + classpath="c:\aspectj1.2\lib\aspectjrt.jar"/> + + </target> + +</project> diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.nodebug.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.nodebug.txt new file mode 100644 index 000000000..eab1c861a --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.nodebug.txt @@ -0,0 +1,13 @@ +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by before advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:8(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by after advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:12(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:16(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:20(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by before advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:8(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by after advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:12(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:16(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:20(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (no debug info available) advised by around advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:24(from AspectAdvice.aj)) [with runtime test] +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by before advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:8(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by after advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:12(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:16(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:20(from AspectAdvice.aj)) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.jar.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.jar.txt new file mode 100644 index 000000000..1c9e788bb --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.jar.txt @@ -0,0 +1,4 @@ +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj)) +Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj)) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.txt new file mode 100644 index 000000000..d86780069 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.txt @@ -0,0 +1,4 @@ +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj)) +Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj)) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.txt new file mode 100644 index 000000000..9ed2ca073 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.binary.txt @@ -0,0 +1,13 @@ +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:8(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by after advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:12(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:16(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:20(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:8(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by after advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:12(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:16(from AspectAdvice.aj)) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:20(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by around advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:24(from AspectAdvice.aj)) [with runtime test] +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:8(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by after advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:12(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:16(from AspectAdvice.aj)) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:20(from AspectAdvice.aj)) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.txt new file mode 100644 index 000000000..03d6c4574 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/advice.txt @@ -0,0 +1,13 @@ +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'AspectAdvice' (AspectAdvice.aj:8) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by after advice from 'AspectAdvice' (AspectAdvice.aj:12) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.aj:16) +Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.aj:20) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'AspectAdvice' (AspectAdvice.aj:8) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by after advice from 'AspectAdvice' (AspectAdvice.aj:12) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.aj:16) +Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.aj:20) +Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by around advice from 'AspectAdvice' (AspectAdvice.aj:24) [with runtime test] +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'AspectAdvice' (AspectAdvice.aj:8) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by after advice from 'AspectAdvice' (AspectAdvice.aj:12) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.aj:16) +Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.aj:20) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.annotation.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.annotation.txt new file mode 100644 index 000000000..7daacb75d --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.annotation.txt @@ -0,0 +1,4 @@ +'Test' (AspectDeclareAnnotations.aj:14) is annotated with @anInterface type annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:7) +'public void Test.new(String,int)' (AspectDeclareAnnotations.aj:16) is annotated with @anInterface constructor annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:8) +'public int Test.fac(int)' (AspectDeclareAnnotations.aj:20) is annotated with @anInterface method annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:9) +'public int a' of type 'Test' (AspectDeclareAnnotations.aj) is annotated with @anInterface field annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:10) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.annotationNoWeaveInfo.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.annotationNoWeaveInfo.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.annotationNoWeaveInfo.txt diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.extends.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.extends.txt new file mode 100644 index 000000000..29fb45592 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.extends.txt @@ -0,0 +1 @@ +Setting superclass of type 'Simple' (Simple.java) to 'InTheWay' (AspectDeclareExtends.aj) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.nodebug.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.nodebug.txt new file mode 100644 index 000000000..2a326c0e3 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.nodebug.txt @@ -0,0 +1,2 @@ +Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft_nodebug.jar!AspectDeclareSoft.class:4(from AspectDeclareSoft.aj)) +Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft_nodebug.jar!AspectDeclareSoft.class:6(from AspectDeclareSoft.aj)) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.txt new file mode 100644 index 000000000..e1f3522dc --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.txt @@ -0,0 +1,2 @@ +Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.jar!AspectDeclareSoft.class:4(from AspectDeclareSoft.aj)) +Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.jar!AspectDeclareSoft.class:6(from AspectDeclareSoft.aj)) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.nodebug.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.nodebug.txt new file mode 100644 index 000000000..d64a942e3 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.nodebug.txt @@ -0,0 +1,2 @@ +Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:4) +Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:6) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.txt new file mode 100644 index 000000000..234d3228b --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare.soft.txt @@ -0,0 +1,2 @@ +Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:6) +Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:4) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare1.nodebug.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare1.nodebug.txt new file mode 100644 index 000000000..1da4b502c --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare1.nodebug.txt @@ -0,0 +1 @@ +Extending interface set for type 'Simple' (no debug info available) to include 'MarkerInterface' (AspectDeclare.aj) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare1.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare1.txt new file mode 100644 index 000000000..b05cdfb86 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/declare1.txt @@ -0,0 +1 @@ +Extending interface set for type 'Simple' (Simple.java) to include 'MarkerInterface' (AspectDeclare.aj) diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/itd.nodebug.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/itd.nodebug.txt new file mode 100644 index 000000000..0664ed4e0 --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/itd.nodebug.txt @@ -0,0 +1,4 @@ +Type 'Simple' (no debug info available) has intertyped field from 'AspectITD' (AspectITD.aj:'int Simple.fieldint') +Type 'Simple' (no debug info available) has intertyped field from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.fieldstring') +Type 'Simple' (no debug info available) has intertyped method from 'AspectITD' (AspectITD.aj:'int Simple.returnint()') +Type 'Simple' (no debug info available) has intertyped method from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.returnstring()') diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/expected/itd.txt b/ajde.core/testdata/WeaveInfoMessagesTest/expected/itd.txt new file mode 100644 index 000000000..eeb84247e --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/expected/itd.txt @@ -0,0 +1,4 @@ +Type 'Simple' (Simple.java) has intertyped field from 'AspectITD' (AspectITD.aj:'int Simple.fieldint') +Type 'Simple' (Simple.java) has intertyped field from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.fieldstring') +Type 'Simple' (Simple.java) has intertyped method from 'AspectITD' (AspectITD.aj:'int Simple.returnint()') +Type 'Simple' (Simple.java) has intertyped method from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.returnstring()') diff --git a/ajde.core/testdata/WeaveInfoMessagesTest/pkg/AspectInPackage.class b/ajde.core/testdata/WeaveInfoMessagesTest/pkg/AspectInPackage.class Binary files differnew file mode 100644 index 000000000..cc11cd2ca --- /dev/null +++ b/ajde.core/testdata/WeaveInfoMessagesTest/pkg/AspectInPackage.class |