Fix annotation processing test with pattern declarations

Author: biboudis

test/langtools/tools/javac/processing/model/element/TestPatternDeclarationExecutableElement.java

@@ -29,8 +29,9 @@
  * @modules java.compiler
  *          jdk.compiler
  * @enablePreview
- * @build   JavacTestingAbstractProcessor TestPatternDeclarationExecutableElement
- * @compile --enable-preview --source ${jdk.version} -processor TestPatternDeclarationExecutableElement -proc:only TestPatternDeclarationExecutableElement.java
+ * @build   JavacTestingAbstractProcessor
+ * @compile TestPatternDeclarationExecutableElement.java
+ * @compile --enable-preview --source ${jdk.version} -processor TestPatternDeclarationExecutableElement -proc:only TestPatternDeclarationExecutableElementData.java
  */
 
 import javax.annotation.processing.RoundEnvironment;
@@ -66,7 +67,7 @@ public boolean process(Set<? extends TypeElement> annotations,
                     var bindings   = pattern.getBindings();
                     var type       = pattern.asType();
 
-                    if (!simpleName.contentEquals("TestPatternDeclarationExecutableElement"))
+                    if (!simpleName.contentEquals("TestPatternDeclarationExecutableElementData"))
                         throw new RuntimeException("Unexpected name for deconstructor " + simpleName);
 
                     if (!(returnType instanceof NoType))
@@ -87,20 +88,4 @@ public boolean process(Set<? extends TypeElement> annotations,
         }
         return true;
     }
-
-    public pattern TestPatternDeclarationExecutableElement(String name) {
-        if (capitalize) {
-            match TestPatternDeclarationExecutableElement(this.name.toUpperCase());
-        } else {
-            match TestPatternDeclarationExecutableElement(this.name);
-        }
-    }
-
-    public pattern TestPatternDeclarationExecutableElement(String originalName, String editedName) {
-        if (capitalize) {
-            match TestPatternDeclarationExecutableElement(this.name, this.name.toUpperCase());
-        } else {
-            match TestPatternDeclarationExecutableElement(this.name, this.name);
-        }
-    }
 }

test/langtools/tools/javac/processing/model/element/TestPatternDeclarationExecutableElementData.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+public class TestPatternDeclarationExecutableElementData {
+    private final String name  = "Name";
+    private boolean capitalize = false;
+
+    public pattern TestPatternDeclarationExecutableElementData(String name) {
+        if (capitalize) {
+            match TestPatternDeclarationExecutableElementData(this.name.toUpperCase());
+        } else {
+            match TestPatternDeclarationExecutableElementData(this.name);
+        }
+    }
+
+    public pattern TestPatternDeclarationExecutableElementData(String originalName, String editedName) {
+        if (capitalize) {
+            match TestPatternDeclarationExecutableElementData(this.name, this.name.toUpperCase());
+        } else {
+            match TestPatternDeclarationExecutableElementData(this.name, this.name);
+        }
+    }
+}