398588 fix

10 files changed, 68 insertions, 0 deletions

diff --git a/tests/bugs172/pr398588/Anno.java b/tests/bugs172/pr398588/Anno.java
new file mode 100644
index 000000000..f298cf761
--- /dev/null
+++ b/tests/bugs172/pr398588/Anno.java
@@ -0,0 +1,7 @@
+package a.b.c;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Anno {
+}
diff --git a/tests/bugs172/pr398588/Anno2.java b/tests/bugs172/pr398588/Anno2.java
new file mode 100644
index 000000000..16abf0957
--- /dev/null
+++ b/tests/bugs172/pr398588/Anno2.java
@@ -0,0 +1,7 @@
+package a.b.c;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Anno2 {
+}
diff --git a/tests/bugs172/pr398588/AspectA.java b/tests/bugs172/pr398588/AspectA.java
new file mode 100644
index 000000000..95919fa8f
--- /dev/null
+++ b/tests/bugs172/pr398588/AspectA.java
@@ -0,0 +1,5 @@
+import a.b.c.Anno;
+
+public aspect AspectA {
+  before(): execution(@Anno * *(..)) {System.out.println("A");}
+}
diff --git a/tests/bugs172/pr398588/AspectB.java b/tests/bugs172/pr398588/AspectB.java
new file mode 100644
index 000000000..6f6ac8e62
--- /dev/null
+++ b/tests/bugs172/pr398588/AspectB.java
@@ -0,0 +1,3 @@
+public aspect AspectB {
+  before():staticinitialization(!Aspect*) { System.out.println("staticinitialization");}
+}
diff --git a/tests/bugs172/pr398588/AspectC.java b/tests/bugs172/pr398588/AspectC.java
new file mode 100644
index 000000000..143cd974e
--- /dev/null
+++ b/tests/bugs172/pr398588/AspectC.java
@@ -0,0 +1,5 @@
+import a.b.c.Blah;
+
+public aspect AspectC {
+  before(): execution(@Blah * *(..)) {System.out.println("C");}
+}
diff --git a/tests/bugs172/pr398588/AspectD.java b/tests/bugs172/pr398588/AspectD.java
new file mode 100644
index 000000000..5c14845ee
--- /dev/null
+++ b/tests/bugs172/pr398588/AspectD.java
@@ -0,0 +1,5 @@
+import a.b.c.Anno2;
+
+public aspect AspectD {
+  before(): execution(@Anno2 * *(..)) {System.out.println("D");}
+}
diff --git a/tests/bugs172/pr398588/Blah.java b/tests/bugs172/pr398588/Blah.java
new file mode 100644
index 000000000..6288a2734
--- /dev/null
+++ b/tests/bugs172/pr398588/Blah.java
@@ -0,0 +1,6 @@
+package a.b.c;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Blah {}
diff --git a/tests/bugs172/pr398588/Code.java b/tests/bugs172/pr398588/Code.java
new file mode 100644
index 000000000..a11192728
--- /dev/null
+++ b/tests/bugs172/pr398588/Code.java
@@ -0,0 +1,10 @@
+import java.lang.annotation.*;
+import a.b.c.Blah;
+
+@Blah
+public class Code {
+  @Blah
+  public static void main(String[] argv) {
+    System.out.println("abcde");
+  }
+}
diff --git a/tests/bugs172/pr398588/Code2.java b/tests/bugs172/pr398588/Code2.java
new file mode 100644
index 000000000..bb48df62a
--- /dev/null
+++ b/tests/bugs172/pr398588/Code2.java
@@ -0,0 +1,11 @@
+import java.lang.annotation.*;
+import a.b.c.*;
+
+@Anno
+public class Code2 {
+  @Anno
+  public static void main(String[] argv) {
+    System.out.println("abcde");
+  }
+}
+
diff --git a/tests/bugs172/pr398588/META-INF/aop.xml b/tests/bugs172/pr398588/META-INF/aop.xml
new file mode 100644
index 000000000..a1157bb15
--- /dev/null
+++ b/tests/bugs172/pr398588/META-INF/aop.xml
@@ -0,0 +1,9 @@
+<aspectj>
+  <aspects>
+    <aspect name="AspectA" requires="a.b.c.Anno"/>
+    <aspect name="AspectB"/>
+    <aspect name="AspectC" requires="a.b.c.Blah"/>
+    <aspect name="AspectD" requires="a.b.c.Anno2"/>
+  </aspects>
+  <weaver options="-showWeaveInfo -verbose"/>
+</aspectj>