more overweaving tests and fixes

9 files changed, 32 insertions, 4 deletions

diff --git a/tests/features167/overweaving/cflow/A.aj b/tests/features167/overweaving/cflow/A.aj
index 961f489c1..b7e3fcb91 100644
--- a/tests/features167/overweaving/cflow/A.aj
+++ b/tests/features167/overweaving/cflow/A.aj
@@ -10,7 +10,7 @@ aspect A {
   public void C.m() {}
 
   before(): execution(* C.main(..)) {
-    System.out.println("AspectA>>"+thisJoinPointStaticPart);
+    System.out.println("A:"+thisJoinPointStaticPart);
   }
 
 }
diff --git a/tests/features167/overweaving/cflow/X.aj b/tests/features167/overweaving/cflow/X.aj
index e8fe7dfb0..9c576aeed 100644
--- a/tests/features167/overweaving/cflow/X.aj
+++ b/tests/features167/overweaving/cflow/X.aj
@@ -1,6 +1,6 @@
 aspect X {
 before(): cflow(execution(* main(..))) && execution(* *(..)) {
-  System.out.println("AspectX>>"+thisJoinPointStaticPart);
+  System.out.println("X:"+thisJoinPointStaticPart);
 }
 
 }
diff --git a/tests/features167/overweaving/messy/A.aj b/tests/features167/overweaving/messy/A.aj
index 961f489c1..b7e3fcb91 100644
--- a/tests/features167/overweaving/messy/A.aj
+++ b/tests/features167/overweaving/messy/A.aj
@@ -10,7 +10,7 @@ aspect A {
   public void C.m() {}
 
   before(): execution(* C.main(..)) {
-    System.out.println("AspectA>>"+thisJoinPointStaticPart);
+    System.out.println("A:"+thisJoinPointStaticPart);
   }
 
 }
diff --git a/tests/features167/overweaving/messy/X.aj b/tests/features167/overweaving/messy/X.aj
index 8c51d6072..8eee320b9 100644
--- a/tests/features167/overweaving/messy/X.aj
+++ b/tests/features167/overweaving/messy/X.aj
@@ -1,6 +1,6 @@
 aspect X {
 before(): execution(* *(..)) {
-  System.out.println("AspectX>>"+thisJoinPointStaticPart);
+  System.out.println("X:"+thisJoinPointStaticPart);
 }
 }
 
diff --git a/tests/features167/overweaving/messy2/A.aj b/tests/features167/overweaving/messy2/A.aj
new file mode 100644
index 000000000..78f5b99a2
--- /dev/null
+++ b/tests/features167/overweaving/messy2/A.aj
@@ -0,0 +1,3 @@
+public aspect A {
+  before(): execution(* *(..)) {System.out.println("A:"+thisJoinPointStaticPart);}
+}
diff --git a/tests/features167/overweaving/messy2/B.aj b/tests/features167/overweaving/messy2/B.aj
new file mode 100644
index 000000000..d35d27477
--- /dev/null
+++ b/tests/features167/overweaving/messy2/B.aj
@@ -0,0 +1,3 @@
+public aspect B {
+  before(): execution(* *(..)) {System.out.println("B:"+thisJoinPointStaticPart);}
+}
diff --git a/tests/features167/overweaving/messy2/Class1.java b/tests/features167/overweaving/messy2/Class1.java
new file mode 100644
index 000000000..c89605ca0
--- /dev/null
+++ b/tests/features167/overweaving/messy2/Class1.java
@@ -0,0 +1,5 @@
+public class Class1 {
+  public static void main(String[]argv) {
+    System.out.println("Class1.main");
+  }
+}
diff --git a/tests/features167/overweaving/messy2/Class2.java b/tests/features167/overweaving/messy2/Class2.java
new file mode 100644
index 000000000..b602a2fe9
--- /dev/null
+++ b/tests/features167/overweaving/messy2/Class2.java
@@ -0,0 +1,5 @@
+public class Class2 {
+  public static void main(String[]argv) {
+    System.out.println("Class2.main");
+  }
+}
diff --git a/tests/features167/overweaving/messy2/aop.xml b/tests/features167/overweaving/messy2/aop.xml
new file mode 100644
index 000000000..956854a9e
--- /dev/null
+++ b/tests/features167/overweaving/messy2/aop.xml
@@ -0,0 +1,12 @@
+<aspectj>
+<aspects>
+  <aspect name="A"/>
+  <aspect name="B"/>
+</aspects>
+<weaver options="-verbose -Xset:overWeaving=true -debug -showWeaveInfo">
+<!--
+  <dump within="*" beforeandafter="true"/>
+-->
+</weaver>
+
+</aspectj>