Readded test, order fixed via precedence

diff --git a/tests/java5/pertypewithin/Q.java b/tests/java5/pertypewithin/Q.java
index 7c5d059855f3de17d6f2da238de24d9505a839bc..8a2fe8f0cc61b7b4c89a3c5a51d3a05f69275459 100644 (file)
--- 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 147e74e221c6d43b30f3139942e58f5c0e9b7263..9abfebe14172eaf677127659dec50f0977e2ac7a 100644 (file)
--- 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