diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ajcTests.xml | 17 | ||||
-rw-r--r-- | tests/ajcTestsFailing.xml | 16 | ||||
-rw-r--r-- | tests/bugs/InterfaceInitializerOrder.java | 26 | ||||
-rw-r--r-- | tests/bugs/SubtypeConstructorCW.java | 4 | ||||
-rw-r--r-- | tests/new/AfterAdviceOnConstructorsOnTheWrongType.java | 4 | ||||
-rw-r--r-- | tests/new/AfterReturningConstructor.java | 8 | ||||
-rw-r--r-- | tests/new/AfterReturningInterfaceConstructor.java | 11 | ||||
-rw-r--r-- | tests/new/AfterReturningInterfaceConstructorCE.java | 33 | ||||
-rw-r--r-- | tests/new/EmptyInterface.java | 2 | ||||
-rw-r--r-- | tests/new/InitializerTest.java | 10 | ||||
-rw-r--r-- | tests/new/NegativeSourceLocation.java | 4 |
11 files changed, 105 insertions, 30 deletions
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml index a853bef28..8d17bd6fe 100644 --- a/tests/ajcTests.xml +++ b/tests/ajcTests.xml @@ -5197,6 +5197,13 @@ <compile files="AfterReturningInterfaceConstructor.java"/> <run class="AfterReturningInterfaceConstructor"/> </ajc-test> + + <ajc-test dir="new" pr="889" + title="after returning advice on interface constructor - error"> + <compile files="AfterReturningInterfaceConstructorCE.java"> + <message kind="error" line="26"/> + </compile> + </ajc-test> <ajc-test dir="bugs" pr="900" title="after advice on static call join point"> @@ -7119,4 +7126,14 @@ </compile> </ajc-test> + <ajc-test dir="bugs" + pr="49295" + title="declare warning on subtype constructor"> + <compile files="SubtypeConstructorCW.java" > + <message kind="warning" line="5" text="String as first"/> + <message kind="warning" line="10" text="String as first"/> + </compile> + <run class="SubtypeConstructorCW"/> + </ajc-test> + </suite> diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml index dca686139..a64b4fb3c 100644 --- a/tests/ajcTestsFailing.xml +++ b/tests/ajcTestsFailing.xml @@ -127,16 +127,6 @@ <run class="AfterReturningParamMatching"/> </ajc-test> - <ajc-test dir="bugs" - pr="49295" - title="declare warning on subtype constructor"> - <compile files="SubtypeConstructorCW.java" > - <message kind="warning" line="5" text="String as first"/> - <message kind="warning" line="10" text="String as first"/> - </compile> - <run class="SubtypeConstructorCW"/> - </ajc-test> - <ajc-test dir="bugs/interAbstract" pr="49784" title="aspect declares interface method (abstract decl, default impl)"> @@ -160,4 +150,10 @@ <run class="Main"/> </ajc-test> + <ajc-test dir="bugs" pr="36787" + title="interface initialization order"> + <compile files="InterfaceInitializerOrder.java"/> + <run class="InterfaceInitializerOrder"/> + </ajc-test> + </suite> diff --git a/tests/bugs/InterfaceInitializerOrder.java b/tests/bugs/InterfaceInitializerOrder.java new file mode 100644 index 000000000..3036bcac9 --- /dev/null +++ b/tests/bugs/InterfaceInitializerOrder.java @@ -0,0 +1,26 @@ +import org.aspectj.testing.Tester; + +public class InterfaceInitializerOrder { + public static void main(String[] args) { + Base base = new Base(); + Tester.checkEqual(InitAspect.inits.toString(), "Super1,Super2,SuperInterface,Base,"); + } +} + +class Super1 {} + +class Super2 extends Super1 {} + +interface SuperInterface {} + +class Base extends Super2 implements SuperInterface { } + +aspect InitAspect { + public static StringBuffer inits = new StringBuffer(); + + pointcut outerMatch() : initialization(new(..)) && !within(InitAspect); + before() : outerMatch() { + inits.append(thisJoinPoint.getSignature().getDeclaringType().getName()); + inits.append(","); + } +} diff --git a/tests/bugs/SubtypeConstructorCW.java b/tests/bugs/SubtypeConstructorCW.java index d3b6a8765..f37ac8b37 100644 --- a/tests/bugs/SubtypeConstructorCW.java +++ b/tests/bugs/SubtypeConstructorCW.java @@ -7,8 +7,8 @@ class C implements Runnable { // CW 5 } } class F implements Runnable { - F(int i) {// CW 10 - } + F(int i) {}// CW 10 + public void run() { } } diff --git a/tests/new/AfterAdviceOnConstructorsOnTheWrongType.java b/tests/new/AfterAdviceOnConstructorsOnTheWrongType.java index e29ee974a..21ab6cb6b 100644 --- a/tests/new/AfterAdviceOnConstructorsOnTheWrongType.java +++ b/tests/new/AfterAdviceOnConstructorsOnTheWrongType.java @@ -10,8 +10,8 @@ public class AfterAdviceOnConstructorsOnTheWrongType { } static { Tester.clearEvents(); - // new(..) for both class and interface - Tester.expectEventsInString("after-c,after-c,c,after-d,after-d,d"); + // new(..) for just class + Tester.expectEventsInString("after-c,c,after-d,d"); } } diff --git a/tests/new/AfterReturningConstructor.java b/tests/new/AfterReturningConstructor.java index e0fad5e0e..3d87758e5 100644 --- a/tests/new/AfterReturningConstructor.java +++ b/tests/new/AfterReturningConstructor.java @@ -32,8 +32,8 @@ class U { static final String afterThrowing = "after() throwing(): "; static final String c = "C()"; static final String i = "I()"; - static final String cjp = "execution(" + c + ")"; - static final String ijp = "execution(" + i + ")"; + static final String cjp = "initialization(" + c + ")"; + static final String ijp = "initialization(" + i + ")"; static void e(String event) { //System.err.println("act event: " + event); // XXX @@ -46,8 +46,8 @@ class U { } aspect A { - /** must pick out both interface and implementor constructor execution */ - pointcut pc(): execution(new(..)) && !within(A); + /** must pick out both interface and implementor initializers */ + pointcut pc(): initialization(new(..)) && !within(A); before(): pc() { U.e(U.before + thisJoinPoint); diff --git a/tests/new/AfterReturningInterfaceConstructor.java b/tests/new/AfterReturningInterfaceConstructor.java index 71e851867..f16f563bf 100644 --- a/tests/new/AfterReturningInterfaceConstructor.java +++ b/tests/new/AfterReturningInterfaceConstructor.java @@ -6,7 +6,10 @@ public class AfterReturningInterfaceConstructor { public static void main (String[] args) { Tester.expectEvent("constructor"); Tester.expectEvent("advice"); - new C(); + I i = new C(); + + Tester.checkEqual(i.i, 2, "i.i"); + Tester.checkAllEvents(); } } @@ -21,10 +24,10 @@ class C implements I { aspect A { int I.i; - I.new() { - i = 2; + after(I i) returning: this(i) && initialization(I.new(..)) { + i.i = 2; } - after() returning: execution(I.new()) { + after() returning: initialization(I.new(..)) { Tester.event("advice"); } } diff --git a/tests/new/AfterReturningInterfaceConstructorCE.java b/tests/new/AfterReturningInterfaceConstructorCE.java new file mode 100644 index 000000000..aec297d2c --- /dev/null +++ b/tests/new/AfterReturningInterfaceConstructorCE.java @@ -0,0 +1,33 @@ + +import org.aspectj.testing.Tester; + +/** @testcase PR#889 after returning advice on interface constructor */ +public class AfterReturningInterfaceConstructorCE { + public static void main (String[] args) { + Tester.expectEvent("constructor"); + Tester.expectEvent("advice"); + I i = new C(); + System.out.println("i.i: " + i.i); + + Tester.checkAllEvents(); + } +} + +interface I {} + +class C implements I { + C() { + Tester.event("constructor"); + } +} + +aspect A { + int I.i; + I.new() { + i = 2; + System.out.println("running I.new()"); + } + after() returning: execution(I.new()) { // ERR: can't define constructor on interface + Tester.event("advice"); + } +} diff --git a/tests/new/EmptyInterface.java b/tests/new/EmptyInterface.java index aca01b6a8..396f7994c 100644 --- a/tests/new/EmptyInterface.java +++ b/tests/new/EmptyInterface.java @@ -20,7 +20,7 @@ aspect Log { interface LoggedType { } declare parents: C implements LoggedType; - after() : within(LoggedType+) + after(): within(LoggedType+) //&& !initialization(new(..)) //&& !preinitialization(new(..)) // 1.1 only { diff --git a/tests/new/InitializerTest.java b/tests/new/InitializerTest.java index 52f2d93af..31b5ca698 100644 --- a/tests/new/InitializerTest.java +++ b/tests/new/InitializerTest.java @@ -81,10 +81,10 @@ aspect A issingleton () { before(I i): initialization(I.new()) && this(i) { Tester.checkEqual(((C)i).state, "C-constructed", thisJoinPoint.toString()); } - before(I i): execution(I.new()) && this(i) { - Tester.checkEqual(((C)i).state, "C-constructed", thisJoinPoint.toString()); - Tester.note("constructed I"); - } +// before(I i): execution(I.new()) && this(i) { +// Tester.checkEqual(((C)i).state, "C-constructed", thisJoinPoint.toString()); +// Tester.note("constructed I"); +// } after(I i): initialization(I.new()) && this(i) { Tester.checkEqual(((C)i).state, "C-constructed", thisJoinPoint.toString()); Tester.note("initialized I"); @@ -100,7 +100,7 @@ public class InitializerTest { Tester.check("constructed SubC"); Tester.check("initialized I"); - Tester.check("constructed I"); + //Tester.check("constructed I"); Tester.check("static initialized C"); Tester.check("static initialized SubC"); diff --git a/tests/new/NegativeSourceLocation.java b/tests/new/NegativeSourceLocation.java index f76ef229a..f27bf3925 100644 --- a/tests/new/NegativeSourceLocation.java +++ b/tests/new/NegativeSourceLocation.java @@ -287,7 +287,7 @@ class Const { , "before AllTargetJoinPoints set(String TargetClass.staticString)" , "before AllTargetJoinPoints preinitialization(TargetClass())" , "before AllTargetJoinPoints initialization(java.lang.Runnable())" - , "before AllTargetJoinPoints execution(java.lang.Runnable())" + //, "before AllTargetJoinPoints execution(java.lang.Runnable())" , "before AllTargetJoinPoints initialization(TargetClass())" //, "before AllTargetJoinPoints execution(TargetClass.<init>)" , "before AllTargetJoinPoints set(String TargetClass.string)" @@ -305,7 +305,7 @@ class Const { , "before AllTargetJoinPoints preinitialization(TargetClass())" , "before AllTargetJoinPoints initialization(TargetClass())" , "before AllTargetJoinPoints initialization(java.lang.Runnable())" - , "before AllTargetJoinPoints execution(java.lang.Runnable())" + //, "before AllTargetJoinPoints execution(java.lang.Runnable())" //, "before AllTargetJoinPoints execution(TargetClass.<init>)" , "before AllTargetJoinPoints set(String TargetClass.string)" , "before AllTargetJoinPoints execution(TargetClass())" |