From 49303882a2920465cf8889b7d7975bbe329696c0 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 17 Jul 2008 17:09:54 +0000 Subject: [PATCH] 239441 - testcode and fix --- tests/bugs162/pr233718/ArgsBinding.java | 9 +++++++ tests/bugs162/pr233718/ArgsMatching.java | 9 +++++++ tests/bugs162/pr233718/Matching.java | 9 +++++++ .../systemtest/ajc162/Ajc162Tests.java | 21 ++++++++++++---- .../org/aspectj/systemtest/ajc162/ajc162.xml | 24 +++++++++++++++++++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 tests/bugs162/pr233718/ArgsBinding.java create mode 100644 tests/bugs162/pr233718/ArgsMatching.java create mode 100644 tests/bugs162/pr233718/Matching.java diff --git a/tests/bugs162/pr233718/ArgsBinding.java b/tests/bugs162/pr233718/ArgsBinding.java new file mode 100644 index 000000000..97550ecff --- /dev/null +++ b/tests/bugs162/pr233718/ArgsBinding.java @@ -0,0 +1,9 @@ +public aspect ArgsBinding { +// public void m() {} +// public void m(String a) {} + public void m(String a,String b) {} +// public void m(int a,String b) {} + + + before(String[] p): execution(* m(..)) && args(..,p,..) {} +} diff --git a/tests/bugs162/pr233718/ArgsMatching.java b/tests/bugs162/pr233718/ArgsMatching.java new file mode 100644 index 000000000..b7f29504a --- /dev/null +++ b/tests/bugs162/pr233718/ArgsMatching.java @@ -0,0 +1,9 @@ +public aspect ArgsMatching { +// public void m() {} +// public void m(String a) {} + public void m(String a,String b) {} +// public void m(int a,String b) {} + + + before(): execution(* m(..)) && args(..,String,..) {} +} diff --git a/tests/bugs162/pr233718/Matching.java b/tests/bugs162/pr233718/Matching.java new file mode 100644 index 000000000..9fa60ab33 --- /dev/null +++ b/tests/bugs162/pr233718/Matching.java @@ -0,0 +1,9 @@ +public aspect Matching { + public void m() {} + public void m(String a) {} + public void m(String a,String b) {} + public void m(int a,String b) {} + + + before(): execution(* m(..,String,..)) {} +} diff --git a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java index 2cb1d3826..39563df21 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -19,12 +19,23 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // AspectJ1.6.2 -// public void testAnnotationDecp_pr239441() { runTest("annotation decp"); } - public void testAnnotationValueDecp_pr238992() { runTest("annotation value decp"); } - public void testAnnotationValueDecp_pr238992_2() { runTest("annotation value decp - 2"); } - public void testAnnotationValueDecp_pr238992_3() { runTest("annotation value decp - 3"); } - public void testAnnotationValueDecp_pr238992_4() { runTest("annotation value decp - 4"); } + public void testAnnotationDecp_pr239441() { runTest("annotation decp"); } +// public void testAnnotationValueDecp_pr238992() { runTest("annotation value decp"); } +// public void testAnnotationValueDecp_pr238992_2() { runTest("annotation value decp - 2"); } +// public void testAnnotationValueDecp_pr238992_3() { runTest("annotation value decp - 3"); } +// public void testAnnotationValueDecp_pr238992_4() { runTest("annotation value decp - 4"); } + /* + * test plan + * execution(* *(..,String,..)) + * args(..,String,..) + * @args(..,Foo,..) + * + */ +// public void testParameterSubsettingMatching_pr233718_Matching() { runTest("parameter subsetting - matching");} +// public void testParameterSubsettingMatching_pr233718_ArgsMatching() { runTest("parameter subsetting - args matching");} +// public void testParameterSubsettingMatching_pr233718_ArgsBinding() { runTest("parameter subsetting - args binding");} + public static Test suite() { return XMLBasedAjcTestCase.loadSuite(Ajc162Tests.class); } diff --git a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml index 5b2b599ba..e302c79e1 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml +++ b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml @@ -37,5 +37,29 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- 2.39.5