fixed order of join points during initialization to match 1.1

diff --git a/tests/new/Binkley2.java b/tests/new/Binkley2.java
index cc2c513239f934aa23db142b1bafd1993844d533..fe0d27d02a30283827460ed6dbd47ef1b0ffdddd 100644 (file)
--- a/tests/new/Binkley2.java
+++ b/tests/new/Binkley2.java
@@ -32,24 +32,25 @@ class C {
 class Post {
     static List haves = new Vector();
     static String[] wants = new String[] {
+        "preinitialization(C())-Ar-0", 
         "initialization(C())-Ar-0", 
-        "execution(C.<init>)-Ar-0",
-        "set(C.x)-Ar-0",
         "execution(C())-Ar-0", 
+        "set(C.x)-Ar-0",
         "execution(C.foo())-Ar-0", 
         "set(C.x)-Ar-0",
         "set(C.x)-Ar-0",
         
+        "preinitialization(C())-Art-0", 
         "initialization(C())-Art-0", 
-        "execution(C.<init>)-Art-1",
+        "execution(C())-Art-1",
         "set(C.x)-Art-2",
-        "execution(C())-Art-3",
         "execution(C.foo())-Art-0",
         "set(C.x)-Art-1",
         "set(C.x)-Art-2",
         };
 
     static void post(JoinPoint jp, String name, int num) {
+       //System.out.println("have: " + jp.toShortString() + "-" + name + "-" + num);
        haves.add(jp.toShortString() + "-" + name + "-" + num);
     }
     static void checkAll() {