fixed order of join points during initialization to match 1.1

1 files changed, 114 insertions, 77 deletions

diff --git a/tests/new/AroundAll.java b/tests/new/AroundAll.java
index f7e57b5b9..d12205555 100644
--- a/tests/new/AroundAll.java
+++ b/tests/new/AroundAll.java
@@ -48,83 +48,120 @@ class SuperC {
 
 aspect A {
     static String[] expectedSteps = new String[] {
-        "enter staticinitialization(AroundAll.<clinit>)",
-        "exit staticinitialization(AroundAll.<clinit>)",
-        "enter execution(void AroundAll.main(String[]))",
-        "enter call(C())",
-        "enter staticinitialization(SuperC.<clinit>)",
-        "exit staticinitialization(SuperC.<clinit>)",
-        "enter staticinitialization(C.<clinit>)",
-        "enter set(int C.i)",
-        "exit set(int C.i)",
-        "exit staticinitialization(C.<clinit>)",
-        "enter call(Integer java.lang.Integer.valueOf(String))",
-        "exit call(Integer java.lang.Integer.valueOf(String))",
-        "enter call(int java.lang.Integer.intValue())",
-        "exit call(int java.lang.Integer.intValue())",
-        "enter initialization(SuperC(int))",
-        "enter execution(SuperC.<init>)",
-        "exit execution(SuperC.<init>)",
-        "enter execution(SuperC(int))",
-        "SuperC(2)",
-        "exit execution(SuperC(int))",
-        "exit initialization(SuperC(int))",
-        "enter initialization(C())",
-        "enter execution(C.<init>)",
-        "enter set(int C.y)",
-        "exit set(int C.y)",
-        "exit execution(C.<init>)",
-        "enter execution(C(int))",
-        "enter set(int C.x)",
-        "exit set(int C.x)",
-        "enter get(int C.x)",
-        "exit get(int C.x)",
-        "x = 2",
-        "exit execution(C(int))",
-        "enter execution(C(String))",
-        "C(2)",
-        "enter get(int C.y)",
-        "exit get(int C.y)",
-        "y = 42",
-        "exit execution(C(String))",
-        "exit initialization(C())",
-        "enter execution(C())",
-        "C()",
-        "exit execution(C())",
-        "exit call(C())",
-        "enter call(C(String))",
-        "enter call(Integer java.lang.Integer.valueOf(String))",
-        "exit call(Integer java.lang.Integer.valueOf(String))",
-        "enter call(int java.lang.Integer.intValue())",
-        "exit call(int java.lang.Integer.intValue())",
-        "enter initialization(SuperC(int))",
-        "enter execution(SuperC.<init>)",
-        "exit execution(SuperC.<init>)",
-        "enter execution(SuperC(int))",
-        "SuperC(9)",
-        "exit execution(SuperC(int))",
-        "exit initialization(SuperC(int))",
-        "C.new(9)",
-        "enter initialization(C(String))",
-        "enter execution(C.<init>)",
-        "enter set(int C.y)",
-        "exit set(int C.y)",
-        "exit execution(C.<init>)",
-        "enter execution(C(int))",
-        "enter set(int C.x)",
-        "exit set(int C.x)",
-        "enter get(int C.x)",
-        "exit get(int C.x)",
-        "x = 9",
-        "exit execution(C(int))",
-        "enter execution(C(String))",
-        "C(91)",
-        "enter get(int C.y)",
-        "exit get(int C.y)",
-        "y = 42",
-        "exit execution(C(String))",
-        "exit initialization(C(String))",
-        "exit call(C(String))",
+        "enter staticinitialization(AroundAll.<clinit>)", 
+        "exit staticinitialization(AroundAll.<clinit>)", 
+        "enter execution(void AroundAll.main(String[]))", 
+        "enter call(C())", 
+        "enter staticinitialization(SuperC.<clinit>)", 
+        "exit staticinitialization(SuperC.<clinit>)", 
+        "enter staticinitialization(C.<clinit>)", 
+        "exit staticinitialization(C.<clinit>)", 
+        "enter call(Integer java.lang.Integer.valueOf(String))", 
+        "exit call(Integer java.lang.Integer.valueOf(String))", 
+        "enter call(int java.lang.Integer.intValue())", 
+        "exit call(int java.lang.Integer.intValue())", 
+        "enter execution(SuperC(int))", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "SuperC(2)", 
+        "exit execution(SuperC(int))", 
+        "enter execution(C(int))", 
+        "enter set(int C.y)", 
+        "exit set(int C.y)", 
+        "enter set(int C.x)", 
+        "exit set(int C.x)", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter get(int C.x)", 
+        "exit get(int C.x)", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "x = 2", 
+        "exit execution(C(int))", 
+        "enter execution(C(String))", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "C(2)", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter get(int C.y)", 
+        "exit get(int C.y)", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "y = 42", 
+        "exit execution(C(String))", 
+        "enter execution(C())", 
+        "C()", 
+        "exit execution(C())", 
+        "exit call(C())", 
+        "enter call(C(String))", 
+        "enter call(Integer java.lang.Integer.valueOf(String))", 
+        "exit call(Integer java.lang.Integer.valueOf(String))", 
+        "enter call(int java.lang.Integer.intValue())", 
+        "exit call(int java.lang.Integer.intValue())", 
+        "enter execution(SuperC(int))", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "SuperC(9)", 
+        "exit execution(SuperC(int))", 
+        "enter execution(C(int))", 
+        "enter set(int C.y)", 
+        "exit set(int C.y)", 
+        "enter set(int C.x)", 
+        "exit set(int C.x)", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter get(int C.x)", 
+        "exit get(int C.x)", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "x = 9", 
+        "exit execution(C(int))", 
+        "enter execution(C(String))", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(String))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "C(9)", 
+        "enter call(java.lang.StringBuffer(String))", 
+        "exit call(java.lang.StringBuffer(String))", 
+        "enter get(int C.y)", 
+        "exit get(int C.y)", 
+        "enter call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "exit call(StringBuffer java.lang.StringBuffer.append(int))", 
+        "enter call(String java.lang.StringBuffer.toString())", 
+        "exit call(String java.lang.StringBuffer.toString())", 
+        "y = 42", 
+        "exit execution(C(String))", 
+        "exit call(C(String))", 
         };
 
     static List logList = new ArrayList();