diff options
| author | aclement <aclement> | 2008-06-10 03:00:01 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2008-06-10 03:00:01 +0000 |
| commit | 6fc9b90ec1ede8f634327bb4f53dfd73a0ee9ca4 (patch) | |
| tree | 9fe237921ac055cc42802319db98088fd7152523 /tests/src | |
| parent | 32afe2f92f2faa183e7f4d1e83d5bf98342be2e2 (diff) | |
| download | aspectj-6fc9b90ec1ede8f634327bb4f53dfd73a0ee9ca4.tar.gz aspectj-6fc9b90ec1ede8f634327bb4f53dfd73a0ee9ca4.zip | |
199130: test and fix - checking aspect bounds for generic aspects
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java | 6 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc161/ajc161.xml | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java index fe45d6daf..34db793c2 100644 --- a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java @@ -23,8 +23,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // AspectJ1.6.1 - //public void testComplexBoundsGenericAspect_pr199130_1() { runTest("complex bounds on generic aspect - 1");} - //public void testComplexBoundsGenericAspect_pr199130_2() { runTest("complex bounds on generic aspect - 2");} +// public void testFinalStringsAnnotationPointcut_pr174385() { runTest("static strings in annotation pointcuts");} + public void testComplexBoundsGenericAspect_pr199130_1() { runTest("complex bounds on generic aspect - 1");} + public void testComplexBoundsGenericAspect_pr199130_2() { runTest("complex bounds on generic aspect - 2");} + public void testComplexBoundsGenericAspect_pr199130_3() { runTest("complex bounds on generic aspect - 3");} public void testGenericAspectAroundAdvice_pr226201() { runTest("generic aspect around advice");} public void testCrazyGenericsInnerTypes_pr235829() { runTest("crazy generics and inner types");} public void testAnnotationExposureGenerics_pr235597() { runTest("annotation exposure and generics");} diff --git a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml index f4bb6f8a3..1eac07aba 100644 --- a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml +++ b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml @@ -3,7 +3,12 @@ <!-- AspectJ v1.6.1 Tests --> <suite> - <ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 1"> + <ajc-test dir="bugs161/pr174385" title="static strings in annotation pointcuts"> + <compile files="StaticFinalStringInPointcutAspect.java" options="-1.5"/> + <run class="bug.StaticFinalStringInPointcutAspect"/> + </ajc-test> + + <ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 1"> <compile files="Simple.java" options="-1.5"/> <run class="Simple"> </run> @@ -15,18 +20,22 @@ </run> </ajc-test> + <ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 3"> + <compile files="Complex2.java" options="-1.5"/> + <run class="Complex2"> + </run> + </ajc-test> + <ajc-test dir="bugs161/pr226201" title="generic aspect around advice"> <compile files="IntAspTest.java" options="-1.5"/> <run class="IntAspTest"> </run> </ajc-test> - <ajc-test dir="bugs161/pr235829" title="crazy generics and inner types"> <compile files="Main.java a/Adapter.java a/b/Adapter.java" options="-1.5"/> <run class="Main"/> - </ajc-test> - + </ajc-test> <ajc-test dir="bugs161/pr235597" title="annotation exposure and generics"> <compile files="AnnotationTest1.java SomeAnnotation.java SomeAspect.java" options="-1.5"/> |