test and fix for 123423: getWithinTypeName() for ptw aspects

5 files changed, 129 insertions, 0 deletions

diff --git a/tests/features153/ptw/CaseFive.java b/tests/features153/ptw/CaseFive.java
new file mode 100644
index 000000000..e95edddd8
--- /dev/null
+++ b/tests/features153/ptw/CaseFive.java
@@ -0,0 +1,27 @@
+import java.lang.reflect.Method;
+
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.*;
+
+class AClass {}
+class BClass {}
+class CClass {}
+
+@Aspect("pertypewithin(*Class)")
+public class CaseFive {
+  public static void main(String []argv) throws Exception {
+    new Runner().run();
+  }
+}
+
+class Runner {
+  public void run() throws Exception {
+    if (Aspects14.hasAspect(CaseFive.class,AClass.class)) {
+      System.out.println("AClass has an aspect instance");
+      CaseFive instance = (CaseFive)Aspects14.aspectOf(CaseFive.class,AClass.class);
+      Method m = CaseFive.class.getDeclaredMethod("getWithinTypeName",null);
+      String s = (String)m.invoke(instance,null);
+      System.out.println("The aspect instance thinks it is for type name "+s);
+    }
+  }
+}
diff --git a/tests/features153/ptw/CaseFour.java b/tests/features153/ptw/CaseFour.java
new file mode 100644
index 000000000..735bbd4e0
--- /dev/null
+++ b/tests/features153/ptw/CaseFour.java
@@ -0,0 +1,28 @@
+// Types in packages
+
+package a.b;
+
+class AClass {}
+class BClass {}
+class CClass {}
+
+public aspect CaseFour pertypewithin(*Class) {
+  public static void main(String []argv) {
+    new Runner().run();
+  }
+}
+
+class Runner {
+  public void run() {
+    CaseFour aInstance = (CaseFour.hasAspect(AClass.class)?CaseFour.aspectOf(AClass.class):null);
+    CaseFour bInstance = (CaseFour.hasAspect(BClass.class)?CaseFour.aspectOf(BClass.class):null);
+    CaseFour cInstance = (CaseFour.hasAspect(CClass.class)?CaseFour.aspectOf(CClass.class):null);
+
+    System.out.println("BClass aspect instance gives a within type name of "+
+                       (bInstance==null?"<null>":bInstance.getWithinTypeName()));
+    System.out.println("CClass aspect instance gives a within type name of "+
+                       (cInstance==null?"<null>":cInstance.getWithinTypeName()));
+    System.out.println("AClass aspect instance gives a within type name of "+
+                       (aInstance==null?"<null>":aInstance.getWithinTypeName()));
+  }
+}
diff --git a/tests/features153/ptw/CaseOne.java b/tests/features153/ptw/CaseOne.java
new file mode 100644
index 000000000..ea310ae70
--- /dev/null
+++ b/tests/features153/ptw/CaseOne.java
@@ -0,0 +1,22 @@
+// Types not in packages
+
+class AClass {}
+class BClass {}
+class CClass {}
+
+public aspect CaseOne pertypewithin(*Class) {
+  public static void main(String []argv) {
+    new Runner().run();
+  }
+}
+
+class Runner {
+  public void run() {
+    if (CaseOne.hasAspect(AClass.class)) {
+      System.out.println("AClass has an aspect instance");
+      CaseOne instance = CaseOne.aspectOf(AClass.class);
+      String name = instance.getWithinTypeName();
+      System.out.println("The aspect instance thinks it is for type name "+name);
+    }
+  }
+}
diff --git a/tests/features153/ptw/CaseThree.java b/tests/features153/ptw/CaseThree.java
new file mode 100644
index 000000000..1a808f662
--- /dev/null
+++ b/tests/features153/ptw/CaseThree.java
@@ -0,0 +1,26 @@
+// Types not in packages - BClass won't get an aspect
+
+class AClass {}
+class BClass {}
+class CClass {}
+
+public aspect CaseThree pertypewithin(*Class && !BClass) {
+  public static void main(String []argv) {
+    new Runner().run();
+  }
+}
+
+class Runner {
+  public void run() {
+    CaseThree aInstance = (CaseThree.hasAspect(AClass.class)?CaseThree.aspectOf(AClass.class):null);
+    CaseThree bInstance = (CaseThree.hasAspect(BClass.class)?CaseThree.aspectOf(BClass.class):null);
+    CaseThree cInstance = (CaseThree.hasAspect(CClass.class)?CaseThree.aspectOf(CClass.class):null);
+
+    System.out.println("BClass aspect instance gives a within type name of "+
+                       (bInstance==null?"<null>":bInstance.getWithinTypeName()));
+    System.out.println("CClass aspect instance gives a within type name of "+
+                       (cInstance==null?"<null>":cInstance.getWithinTypeName()));
+    System.out.println("AClass aspect instance gives a within type name of "+
+                       (aInstance==null?"<null>":aInstance.getWithinTypeName()));
+  }
+}
diff --git a/tests/features153/ptw/CaseTwo.java b/tests/features153/ptw/CaseTwo.java
new file mode 100644
index 000000000..08bd0ed46
--- /dev/null
+++ b/tests/features153/ptw/CaseTwo.java
@@ -0,0 +1,26 @@
+// Types not in packages, and multiple mixed up instances
+
+class AClass {}
+class BClass {}
+class CClass {}
+
+public aspect CaseTwo pertypewithin(*Class) {
+  public static void main(String []argv) {
+    new Runner().run();
+  }
+}
+
+class Runner {
+  public void run() {
+    CaseTwo aInstance = (CaseTwo.hasAspect(AClass.class)?CaseTwo.aspectOf(AClass.class):null);
+    CaseTwo bInstance = (CaseTwo.hasAspect(BClass.class)?CaseTwo.aspectOf(BClass.class):null);
+    CaseTwo cInstance = (CaseTwo.hasAspect(CClass.class)?CaseTwo.aspectOf(CClass.class):null);
+
+    System.out.println("BClass aspect instance gives a within type name of "+
+                       (bInstance==null?"<null>":bInstance.getWithinTypeName()));
+    System.out.println("CClass aspect instance gives a within type name of "+
+                       (cInstance==null?"<null>":cInstance.getWithinTypeName()));
+    System.out.println("AClass aspect instance gives a within type name of "+
+                       (aInstance==null?"<null>":aInstance.getWithinTypeName()));
+  }
+}