diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2023-01-30 16:32:07 +0100 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2024-04-12 14:19:06 +0200 |
| commit | cb13d8bf4c77d9100ce7cd1674ba3b5e4eb0ff55 (patch) | |
| tree | b28d3e7e6e7452a90ea51136bec5dbb7bd02441f | |
| parent | 59fef88ca15bf9b90758067dee2e3b1e321645f2 (diff) | |
| download | aspectj-cb13d8bf4c77d9100ce7cd1674ba3b5e4eb0ff55.tar.gz aspectj-cb13d8bf4c77d9100ce7cd1674ba3b5e4eb0ff55.zip | |
Fix test after node traversal was improved
Due to the latest improvements, an error which was previously not thrown
unexpectedly according to a source code comment in test aspect
ParameterizedTypesInAnnotationPatterns.aj is now thrown for this kind
of pointcut:
staticinitialization(@(Foo || List<String>) String)
Now the compiler correctly says:
no static initialization join points for parameterized types,
use raw type instead
Relates to #221.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/java5/generics/pointcuts/ParameterizedTypesInAnnotationPatterns.aj b/tests/java5/generics/pointcuts/ParameterizedTypesInAnnotationPatterns.aj index 6f8b25c4f..b3ecc2456 100644 --- a/tests/java5/generics/pointcuts/ParameterizedTypesInAnnotationPatterns.aj +++ b/tests/java5/generics/pointcuts/ParameterizedTypesInAnnotationPatterns.aj @@ -3,10 +3,9 @@ import java.util.List; public aspect ParameterizedTypesInAnnotationPatterns { // CE - not an annotation type pointcut simple() : staticinitialization(@List<String> String); - - // no CE, good enough for now? may improve error reporting for this later + + // CE - no static initialization join points for parameterized types, use raw type instead pointcut combined() : staticinitialization(@(Foo || List<String>) String); - } -@interface Foo {}
\ No newline at end of file +@interface Foo {} diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml index 138ca57ab..5f5ed34d8 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml @@ -5017,6 +5017,7 @@ <ajc-test dir="java5/generics/pointcuts" title="annotation patterns with parameterized types"> <compile files="ParameterizedTypesInAnnotationPatterns.aj" options="-1.5"> <message kind="error" line="5" text="is not an annotation type"/> + <message kind="error" line="8" text="no static initialization join points for parameterized types, use raw type instead"/> </compile> </ajc-test> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml index d21ecf8e6..e9f887d80 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml @@ -5017,6 +5017,7 @@ <ajc-test dir="java5/generics/pointcuts" title="annotation patterns with parameterized types"> <compile files="ParameterizedTypesInAnnotationPatterns.aj" options="-1.9"> <message kind="error" line="5" text="is not an annotation type"/> + <message kind="error" line="8" text="no static initialization join points for parameterized types, use raw type instead"/> </compile> </ajc-test> |