summaryrefslogtreecommitdiffstats
path: root/tests/src/org
diff options
context:
space:
mode:
authoravasseur <avasseur>2005-07-11 15:05:44 +0000
committeravasseur <avasseur>2005-07-11 15:05:44 +0000
commit639b4fd0a436e19726dc9f2a47dc66a726794b3d (patch)
tree0dc463eab5ba20571630940397722bb9d782a78a /tests/src/org
parentb468ecc0132d75fdade0c403f78d99212342176d (diff)
downloadaspectj-639b4fd0a436e19726dc9f2a47dc66a726794b3d.tar.gz
aspectj-639b4fd0a436e19726dc9f2a47dc66a726794b3d.zip
fix 83935 where Jp / Pjp is an arg and bound in a formal binding as well as another (or 2+) used as implicit bindings in @AJ
Diffstat (limited to 'tests/src/org')
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java8
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml11
2 files changed, 15 insertions, 4 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
index 7cec3892b..8d3813021 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
@@ -41,11 +41,11 @@ public class AtAjSyntaxTests extends XMLBasedAjcTestCase {
public void testSingletonAspectBindings() {
//Note AV: uncomment setReporting to get it in modules/tests folder
- org.aspectj.asm.AsmManager.setReporting("debug.txt",true,true,true,true);
+ //org.aspectj.asm.AsmManager.setReporting("debug.txt",true,true,true,true);
runTest("singletonAspectBindings");
// same stuff with AJ
//org.aspectj.asm.AsmManager.setReporting("debug-aj.txt",true,true,true,true);
- //runTest("singletonAspectBindings2");
+ runTest("singletonAspectBindings2");
}
@@ -112,4 +112,8 @@ public class AtAjSyntaxTests extends XMLBasedAjcTestCase {
public void testIfPointcut2() {
runTest("IfPointcut2Test");
}
+
+ public void testMultipleBinding() {
+ runTest("MultipleBinding");
+ }
} \ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
index f4e209b07..212dbd4f9 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
@@ -131,10 +131,17 @@
</ajc-test>
<ajc-test dir="java5/ataspectj" title="perClauseInheritance">
-<!-- <compile files="ataspectj/PerClauseInheritanceTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline"/>-->
-<!-- <run class="ataspectj.PerClauseInheritanceTest"/>-->
+ <compile files="ataspectj/PerClauseInheritanceTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline"/>
+ <run class="ataspectj.PerClauseInheritanceTest"/>
<compile files="ataspectj/PerClauseInheritanceTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline -Xdev:NoAtAspectJProcessing"/>
<run class="ataspectj.PerClauseInheritanceTest"/>
</ajc-test>
+ <ajc-test dir="java5/ataspectj" title="MultipleBinding">
+ <compile files="ataspectj/MultipleBindingTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing -XnoInline"/>
+ <run class="ataspectj.MultipleBindingTest"/>
+ <compile files="ataspectj/MultipleBindingTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
+ <run class="ataspectj.MultipleBindingTest"/>
+ </ajc-test>
+
</suite> \ No newline at end of file