more overweaving tests and fixes: method call/field get/set

5 files changed, 28 insertions, 0 deletions

diff --git a/tests/features167/overweaving/calls/A.aj b/tests/features167/overweaving/calls/A.aj
new file mode 100644
index 000000000..7ae3e52c5
--- /dev/null
+++ b/tests/features167/overweaving/calls/A.aj
@@ -0,0 +1,3 @@
+public aspect A {
+  before(): !cflow(adviceexecution()) && call(* *(..)) {System.out.println("A:"+thisJoinPointStaticPart);}
+}
diff --git a/tests/features167/overweaving/calls/B.aj b/tests/features167/overweaving/calls/B.aj
new file mode 100644
index 000000000..fa4b334d0
--- /dev/null
+++ b/tests/features167/overweaving/calls/B.aj
@@ -0,0 +1,3 @@
+public aspect B {
+  before(): !cflow(adviceexecution()) && call(* *(..)) {System.out.println("B:"+thisJoinPointStaticPart);}
+}
diff --git a/tests/features167/overweaving/calls/Class1.java b/tests/features167/overweaving/calls/Class1.java
new file mode 100644
index 000000000..c89605ca0
--- /dev/null
+++ b/tests/features167/overweaving/calls/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/calls/Class2.java b/tests/features167/overweaving/calls/Class2.java
new file mode 100644
index 000000000..b602a2fe9
--- /dev/null
+++ b/tests/features167/overweaving/calls/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/calls/aop.xml b/tests/features167/overweaving/calls/aop.xml
new file mode 100644
index 000000000..956854a9e
--- /dev/null
+++ b/tests/features167/overweaving/calls/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>