diff options
author | aclement <aclement> | 2005-06-09 12:33:19 +0000 |
---|---|---|
committer | aclement <aclement> | 2005-06-09 12:33:19 +0000 |
commit | 40dbfa989a6849f2fd446ff17f664bf98bb5d1b4 (patch) | |
tree | e453d4a67223e2955124619edb61272158f338ab | |
parent | ff27a1d81c3e98d11029bfd9f59cf62afb7fdc74 (diff) | |
download | aspectj-40dbfa989a6849f2fd446ff17f664bf98bb5d1b4.tar.gz aspectj-40dbfa989a6849f2fd446ff17f664bf98bb5d1b4.zip |
Readded test, order fixed via precedence
-rw-r--r-- | tests/java5/pertypewithin/Q.java | 2 | ||||
-rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java | 7 |
2 files changed, 5 insertions, 4 deletions
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 |