From: aclement <aclement>
Date: Thu, 9 Jun 2005 12:33:19 +0000 (+0000)
Subject: Readded test, order fixed via precedence
X-Git-Tag: PRE_ANDY~185
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=40dbfa989a6849f2fd446ff17f664bf98bb5d1b4;p=aspectj.git

Readded test, order fixed via precedence
---

diff --git a/tests/java5/pertypewithin/Q.java b/tests/java5/pertypewithin/Q.java
index 7c5d05985..8a2fe8f0c 100644
--- a/tests/java5/pertypewithin/Q.java
+++ b/tests/java5/pertypewithin/Q.java
@@ -1,5 +1,7 @@
 aspect Q pertypewithin(P) {
 
+  declare precedence: R,Q;
+
   int ctr = 0;
 
   after(): execution(* runA(..)) {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java b/tests/src/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
index 147e74e22..9abfebe14 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
@@ -58,10 +58,9 @@ public class PerTypeWithinTests extends XMLBasedAjcTestCase {
    * Aspects Q and R match P with a pertypewithin() - they shouldn't clash in any way
    *
    */
-  // TODO test invalid - assumes advise in unrelated aspects are ordered
-//  public void testTwoAspectsHittingOneType() {
-//  	runTest("ptw multi-aspects");
-//  }
+  public void testTwoAspectsHittingOneType() {
+  	runTest("ptw multi-aspects");
+  }
 
   /**
    * Checks the use of pertypewithin() doesn't result in extra join points (i.e. the