From cb13d8bf4c77d9100ce7cd1674ba3b5e4eb0ff55 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Mon, 30 Jan 2023 16:32:07 +0100
Subject: [PATCH] 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>
---
 .../pointcuts/ParameterizedTypesInAnnotationPatterns.aj    | 7 +++----
 .../resources/org/aspectj/systemtest/ajc150/ajc150.xml     | 1 +
 .../org/aspectj/systemtest/ajc190/ajc190_from150.xml       | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/java5/generics/pointcuts/ParameterizedTypesInAnnotationPatterns.aj b/tests/java5/generics/pointcuts/ParameterizedTypesInAnnotationPatterns.aj
index 6f8b25c4f6..b3ecc24568 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 138ca57ab4..5f5ed34d8a 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 d21ecf8e6e..e9f887d807 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>