declare precedence to make results more reliable

diff --git a/tests/features167/overweaving/calls/B.aj b/tests/features167/overweaving/calls/B.aj
index fa4b334d09e9af819b0e9dd401e4cf6cb66998d3..a8b1a7103d81d0ab750682628116715446f70038 100644 (file)
--- a/tests/features167/overweaving/calls/B.aj
+++ b/tests/features167/overweaving/calls/B.aj
@@ -1,3 +1,4 @@
 public aspect B {
+  declare precedence: B,*;
   before(): !cflow(adviceexecution()) && call(* *(..)) {System.out.println("B:"+thisJoinPointStaticPart);}
 }

diff --git a/tests/features167/overweaving/messy2/B.aj b/tests/features167/overweaving/messy2/B.aj
index d35d274775ed734083beb3c39abeb08df3a548c0..e1508937ee3297ce72a2154c5c4d568078c00c1f 100644 (file)
--- a/tests/features167/overweaving/messy2/B.aj
+++ b/tests/features167/overweaving/messy2/B.aj
@@ -1,3 +1,4 @@
 public aspect B {
+  declare precedence: B,*;
   before(): execution(* *(..)) {System.out.println("B:"+thisJoinPointStaticPart);}
 }

diff --git a/tests/src/org/aspectj/systemtest/ajc167/overweaving.xml b/tests/src/org/aspectj/systemtest/ajc167/overweaving.xml
index c48f7b0fa08228261e2e34971b5d6ec6304e8629..159bcf77289aa58fff72c5957c5349d222ef140d 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc167/overweaving.xml
+++ b/tests/src/org/aspectj/systemtest/ajc167/overweaving.xml
@@ -52,16 +52,16 @@
      <compile files="A.aj B.aj Class1.java Class2.java" options="-1.5"/>
      <run class="Class1">
        <stdout>
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
          <line text="B:call(void java.io.PrintStream.println(String))"/>
+         <line text="A:call(void java.io.PrintStream.println(String))"/>
          <line text="Class1.main"/>
        </stdout>
      </run>
      
      <run class="Class2">
        <stdout>
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
          <line text="B:call(void java.io.PrintStream.println(String))"/>
+         <line text="A:call(void java.io.PrintStream.println(String))"/>
          <line text="Class2.main"/>
        </stdout>
      </run>
@@ -82,8 +82,8 @@
      
      <run class="Class2" ltw="aop.xml">
        <stdout>
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
          <line text="B:call(void java.io.PrintStream.println(String))"/>
+         <line text="A:call(void java.io.PrintStream.println(String))"/>
          <line text="Class2.main"/>
        </stdout>
      </run>
@@ -104,8 +104,8 @@
      
      <run class="Class2" ltw="aop.xml">
        <stdout>
-         <line text="A:execution(void Class2.main(String[]))"/>
          <line text="B:execution(void Class2.main(String[]))"/>
+         <line text="A:execution(void Class2.main(String[]))"/>
          <line text="Class2.main"/>
        </stdout>
      </run>