From d69f1374650e84780358da089e4b220782475107 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 22 Aug 2008 19:53:05 +0000 Subject: [PATCH] 209051: promoted test 154>162 --- tests/bugs162/pr209051/Bug.java | 21 +++++++++++++++++++ .../systemtest/ajc154/Ajc154Tests.java | 1 - .../org/aspectj/systemtest/ajc154/ajc154.xml | 9 -------- .../systemtest/ajc162/Ajc162Tests.java | 1 + .../org/aspectj/systemtest/ajc162/ajc162.xml | 10 +++++++++ 5 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 tests/bugs162/pr209051/Bug.java diff --git a/tests/bugs162/pr209051/Bug.java b/tests/bugs162/pr209051/Bug.java new file mode 100644 index 000000000..ac1bf7b8e --- /dev/null +++ b/tests/bugs162/pr209051/Bug.java @@ -0,0 +1,21 @@ +import org.aspectj.lang.annotation.*; + +public @Aspect class Bug { + @Pointcut("args(i) && if() && within(Foo)") + public static boolean pc(int i) { + return i < 0; + } + + @Before("pc(*)") + public void advice() { System.out.println("advice running");} + + public static void main(String []argv) { + new Foo().trigger(-1); + new Foo().trigger(+1); + } +} + +class Foo { + public void trigger(int i) {} +} + diff --git a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java index 7d94d7966..7908cbb8c 100644 --- a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java @@ -79,7 +79,6 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testArgNamesDoesNotWork_pr148381_2() { runTest("argNames does not work - error1");} public void testArgNamesDoesNotWork_pr148381_3() { runTest("argNames does not work - error2");} public void testArgNamesDoesNotWork_pr148381_4() { runTest("argNames does not work - error3");} - //public void testAsteriskInAtPointcut_pr209051() { runTest("asterisk in at aj pointcut");} public void testDecpProblemWhenTargetAlreadyImplements_pr169432_1() { runTest("declare parents problem when target already implements interface - 1");} public void testDecpProblemWhenTargetAlreadyImplements_pr169432_2() { runTest("declare parents problem when target already implements interface - 2");} public void testDecpProblemWhenTargetAlreadyImplements_pr169432_3() { runTest("declare parents problem when target already implements interface - 3");} diff --git a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml index 5a264299b..6e897fdbd 100644 --- a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml +++ b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml @@ -165,15 +165,6 @@ - - - - - - - - - diff --git a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java index 26678d805..d1c914be3 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -19,6 +19,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // AspectJ1.6.2 +// public void testStarInAnnoStyle_pr209951() { runTest("asterisk in at aj pointcut"); } public void testMissingMarkers_pr197720() { runTest("missing markers on inherited annotated method"); } public void testLostGenericsSigOnItd_pr211146() { runTest("lost generic sig on itd"); } public void testLostGenericsSigOnItd_pr211146_2() { runTest("lost generic sig on itd - 2"); } diff --git a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml index fc6efd5ab..a25c904d7 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml +++ b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml @@ -3,6 +3,16 @@ + + + + + + + + + + -- 2.39.5