From: aclement <aclement>
Date: Thu, 13 May 2010 15:21:38 +0000 (+0000)
Subject: declare precedence to make results more reliable
X-Git-Tag: V1_6_9M2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0fdf5483d94c50119dab88c35dbaaa62650bd7eb;p=aspectj.git

declare precedence to make results more reliable
---

diff --git a/tests/features167/overweaving/calls/B.aj b/tests/features167/overweaving/calls/B.aj
index fa4b334d0..a8b1a7103 100644
--- 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 d35d27477..e1508937e 100644
--- 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 c48f7b0fa..159bcf772 100644
--- 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>