From: aclement Date: Fri, 25 Nov 2005 13:42:46 +0000 (+0000) Subject: last bits for 112105 X-Git-Tag: V1_5_0RC1~113 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27f3f0d3b25ecf86880416a509f39e537d4abc7e;p=aspectj.git last bits for 112105 --- diff --git a/docs/adk15ProgGuideDB/generics.xml b/docs/adk15ProgGuideDB/generics.xml index 4b75584b4..65c17a223 100644 --- a/docs/adk15ProgGuideDB/generics.xml +++ b/docs/adk15ProgGuideDB/generics.xml @@ -1171,13 +1171,13 @@ * Matches at an addChild join point for the parent type P and child type C */ public pointcut addingChild(Parent p, Child c) : - execution(* Parent.addChild(Child)) && this(p) && args(c); + execution(* ParentHasChildren.addChild(ChildHasParent)) && this(p) && args(c); /** * Matches at a removeChild join point for the parent type P and child type C */ public pointcut removingChild(Parent p, Child c) : - execution(* Parent.removeChild(Child)) && this(p) && args(c); + execution(* ParentHasChildren.removeChild(ChildHasParent)) && this(p) && args(c); } diff --git a/tests/java5/generics/genericaspects/GenericAspectY.aj b/tests/java5/generics/genericaspects/GenericAspectY.aj index 177344664..b3c5bc451 100644 --- a/tests/java5/generics/genericaspects/GenericAspectY.aj +++ b/tests/java5/generics/genericaspects/GenericAspectY.aj @@ -95,7 +95,7 @@ import org.aspectj.lang.annotation.*; } -aspect GenericAspectX extends ParentChildRelationship { +aspect GenericAspectY extends ParentChildRelationship { // Advice to trigger weave infos before(Top p): /*ParentChildRelationship.*/addingChildSimple(p) {} diff --git a/tests/java5/generics/genericaspects/GenericAspectZ.aj b/tests/java5/generics/genericaspects/GenericAspectZ.aj new file mode 100644 index 000000000..3a6e26b57 --- /dev/null +++ b/tests/java5/generics/genericaspects/GenericAspectZ.aj @@ -0,0 +1,173 @@ +import java.util.*; +import java.lang.reflect.*; +import org.aspectj.lang.annotation.*; + + /** + * a generic aspect, we've used descriptive role names for the type variables + * (Parent and Child) but you could use anything of course + */ + /*public */ abstract aspect ParentChildRelationship { + + /** generic interface implemented by parents */ + interface ParentHasChildren{ + List getChildren(); + void addChild(C child); + void removeChild(C child); + } + + /** generic interface implemented by children */ + interface ChildHasParent

{ + P getParent(); + void setParent(P parent); + } + + /** ensure the parent type implements ParentHasChildren */ + declare parents: Parent implements ParentHasChildren; + + /** ensure the child type implements ChildHasParent */ + declare parents: Child implements ChildHasParent; + + // Inter-type declarations made on the *generic* interface types to provide + // default implementations. + + /** list of children maintained by parent */ + public List ParentHasChildren.children = new ArrayList(); + + /** reference to parent maintained by child */ + public P ChildHasParent

.parent; + + /** Default implementation of getChildren for the generic type ParentHasChildren */ + public List ParentHasChildren.getChildren() { + return Collections.unmodifiableList(children); + } + + /** Default implementation of getParent for the generic type ChildHasParent */ + public P ChildHasParent

.getParent() { + return parent; + } + + /** + * Default implementation of addChild, ensures that parent of child is + * also updated. + */ + public void ParentHasChildren.addChild(C child) { + if (child.parent != null) { + child.parent.removeChild(child); + } + children.add(child); + child.parent = this; + } + + /** + * Default implementation of removeChild, ensures that parent of + * child is also updated. + */ + public void ParentHasChildren.removeChild(C child) { + if (children.remove(child)) { + child.parent = null; + } + } + + /** + * Default implementation of setParent for the generic type ChildHasParent. + * Ensures that this child is added to the children of the parent too. + */ + public void ChildHasParent

.setParent(P parent) { + parent.addChild(this); + } + + /** + * Matches at an addChild join point for the parent type P and child type C + */ + public pointcut addingChild(Parent p, Child c) : + execution(* ParentHasChildren.addChild(ChildHasParent)) && this(p) && args(c); + + /** + * Matches at a removeChild join point for the parent type P and child type C + */ + public pointcut removingChild(Parent p, Child c) : + execution(* ParentHasChildren.removeChild(ChildHasParent)) && this(p) && args(c); + + } + +aspect GenericAspectZ extends ParentChildRelationship { + + before(Top p,Bottom c): addingChild(p,c) {} + before(Top p,Bottom c): removingChild(p,c) {} + + public static void main(String []argv) { + + // Check the state of top + Top t = new Top(); + check(t instanceof ParentHasChildren,"Top should implement ParentHasChildren"); + Type[] intfs = Top.class.getGenericInterfaces(); + check(intfs[0] instanceof ParameterizedType, + "Expected Top to have parameterized interface but found "+intfs[0]); + ParameterizedType pt = (ParameterizedType) intfs[0]; + Type[] tArgs = pt.getActualTypeArguments(); + check(tArgs[0]==Bottom.class, + "Expecting Bottom parameter but found " + tArgs[0]); + + + // Check the state of top + Bottom b = new Bottom(); + check(b instanceof ChildHasParent,"Bottom should implement ChildHasParent"); + intfs = Bottom.class.getGenericInterfaces(); + check(intfs[0] instanceof ParameterizedType, + "Expected Bottom to have parameterized interface but found "+intfs[0]); + pt = (ParameterizedType) intfs[0]; + tArgs = pt.getActualTypeArguments(); + check(tArgs[0]==Top.class, + "Expecting Top parameter but found " + tArgs[0]); + + + + + // Field fiddling + b.parent = t; + List kids = new ArrayList(); + kids.add(b); + t.children = kids; + + + // start using the methods + List kids2 = t.getChildren(); + check(kids2.size()==1, + "Expected one child of the Top but found "+kids2.size()); + check(kids2.get(0).equals(b), + "Expected one child of the Top which was what we put in there!"+kids2.get(0)); + + // and the parent methods + Top retrievedParent = b.getParent(); + check(retrievedParent==t, + "parent check 1 failed "+ + "retrieved="+retrievedParent+" expected="+t); + + + Top top2 = new Top(); + b.setParent(top2); + Top retrievedParent2 = b.getParent(); + check(retrievedParent2==top2, + "parent check 2 failed "+ + "retrieved="+retrievedParent2+" expected="+top2); + + Top top3 = new Top(); + Bottom bot2 = new Bottom(); + top3.addChild(bot2); + Bottom aBottom = top3.getChildren().get(0); + check(aBottom==bot2,"Incorrect child? expected="+bot2+" found="+aBottom); + top3.removeChild(bot2); + int size=top3.getChildren().size(); + check(size==0,"Should be no children but there were "+size); + + + } + + public static void check(boolean b,String msg) { + if (!b) throw new RuntimeException(msg); + } +} + +class Top {} +class Bottom {} + diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java index 2af72359d..34ef3cc42 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java +++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java @@ -395,7 +395,8 @@ public class GenericsTests extends XMLBasedAjcTestCase { public void testSophisticatedAspectsV() {runTest("uberaspects - V");} // casts are gone public void testSophisticatedAspectsW() {runTest("uberaspects - W");} public void testSophisticatedAspectsX() {runTest("uberaspects - X");} // from the AJDK -// public void testSophisticatedAspectsY() {runTest("uberaspects - Y");} // pointcut matching + public void testSophisticatedAspectsY() {runTest("uberaspects - Y");} // pointcut matching + public void testSophisticatedAspectsZ() {runTest("uberaspects - Z");} // FIXME asc these two tests have peculiar error messages - generic aspect related // public void testItdUsingTypeParameter() {runTest("itd using type parameter");} diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index a12482ec2..311903ca1 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -4226,9 +4226,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +