From 89afc4e1193d10db0e62e1f7712467502fc0ae3a Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Tue, 31 Oct 2023 11:20:25 +0100
Subject: [PATCH] Use WildFly Glow discovery in tests

---
 pom.xml                        |  5 +++
 testsuite/client-vertx/pom.xml | 65 ++++++++++++++++----------------
 testsuite/integration/pom.xml  | 67 +++++++++++++++++----------------
 testsuite/server-tck/pom.xml   | 69 ++++++++++++++++++----------------
 4 files changed, 109 insertions(+), 97 deletions(-)

diff --git a/pom.xml b/pom.xml
index 665b950..6201eeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,6 +584,11 @@
                     <artifactId>galleon-maven-plugin</artifactId>
                     <version>${version.org.jboss.galleon}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.wildfly.glow</groupId>
+                    <artifactId>wildfly-glow-arquillian-plugin</artifactId>
+                    <version>${version.wildfly.glow}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.wildfly.galleon-plugins</groupId>
                     <artifactId>wildfly-galleon-maven-plugin</artifactId>
diff --git a/testsuite/client-vertx/pom.xml b/testsuite/client-vertx/pom.xml
index 9e4ef5c..1a8a36c 100644
--- a/testsuite/client-vertx/pom.xml
+++ b/testsuite/client-vertx/pom.xml
@@ -149,6 +149,36 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.wildfly.glow</groupId>
+                <artifactId>wildfly-glow-arquillian-plugin</artifactId>
+                <configuration>
+                    <feature-packs>
+                        <feature-pack>
+                            <groupId>org.wildfly</groupId>
+                            <artifactId>wildfly-galleon-pack</artifactId>
+                            <version>${version.org.wildfly}</version>
+                        </feature-pack>
+                        <feature-pack>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
+                            <version>${project.version}</version>
+                        </feature-pack>
+                    </feature-packs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>scan-graphql</id>
+                        <goals>
+                            <goal>scan</goal>
+                        </goals>
+                        <phase>test-compile</phase>
+                        <configuration>
+                            <expected-discovery>[cdi, microprofile-config, microprofile-graphql]==>ee-core-profile-server,microprofile-graphql</expected-discovery>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.jboss.galleon</groupId>
                 <artifactId>galleon-maven-plugin</artifactId>
@@ -157,9 +187,9 @@
                     <execution>
                         <id>server-provisioning</id>
                         <goals>
-                            <goal>provision</goal>
+                            <goal>provision-file</goal>
                         </goals>
-                        <phase>compile</phase>
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <install-dir>${project.build.directory}/wildfly</install-dir>
                             <record-state>false</record-state>
@@ -169,36 +199,7 @@
                                 <jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
                                 <optional-packages>passive+</optional-packages>
                             </plugin-options>
-                            <feature-packs>
-                                <feature-pack>
-                                    <transitive>true</transitive>
-                                    <groupId>org.wildfly</groupId>
-                                    <artifactId>wildfly-galleon-pack</artifactId>
-                                    <version>${version.org.wildfly}</version>
-                                    <inherit-packages>false</inherit-packages>
-                                    <inherit-configs>false</inherit-configs>
-                                </feature-pack>
-                                <feature-pack>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
-                                    <version>${project.version}</version>
-                                    <inherit-packages>false</inherit-packages>
-                                    <inherit-configs>false</inherit-configs>
-                                </feature-pack>
-                            </feature-packs>
-                            <configurations>
-                                <config>
-                                    <model>standalone</model>
-                                    <name>standalone.xml</name>
-                                    <layers>
-                                        <layer>jaxrs-server</layer>
-                                        <layer>jmx-remoting</layer>
-                                        <layer>observability</layer>
-                                        <!-- Layers from this FP -->
-                                        <layer>microprofile-graphql</layer>
-                                    </layers>
-                                </config>
-                            </configurations>
+                            <provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index d75c89c..c0ea704 100644
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -204,6 +204,37 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.wildfly.glow</groupId>
+                <artifactId>wildfly-glow-arquillian-plugin</artifactId>
+                <configuration>
+                    <feature-packs>
+                        <feature-pack>
+                            <groupId>org.wildfly</groupId>
+                            <artifactId>wildfly-galleon-pack</artifactId>
+                            <version>${version.org.wildfly}</version>
+                        </feature-pack>
+                        <feature-pack>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
+                            <version>${project.version}</version>
+                        </feature-pack>
+                    </feature-packs>
+                    <config-name>standalone-graphql.xml</config-name>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>scan-graphql</id>
+                        <goals>
+                            <goal>scan</goal>
+                        </goals>
+                        <phase>test-compile</phase>
+                        <configuration>
+                            <expected-discovery>[bean-validation, cdi, microprofile-config, microprofile-graphql]==>ee-core-profile-server,microprofile-graphql</expected-discovery>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.jboss.galleon</groupId>
                 <artifactId>galleon-maven-plugin</artifactId>
@@ -212,9 +243,9 @@
                     <execution>
                         <id>server-provisioning</id>
                         <goals>
-                            <goal>provision</goal>
+                            <goal>provision-file</goal>
                         </goals>
-                        <phase>compile</phase>
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <install-dir>${project.build.directory}/wildfly</install-dir>
                             <record-state>false</record-state>
@@ -224,37 +255,7 @@
                                 <jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
                                 <optional-packages>passive+</optional-packages>
                             </plugin-options>
-                            <feature-packs>
-                                <feature-pack>
-                                    <transitive>true</transitive>
-                                    <groupId>org.wildfly</groupId>
-                                    <artifactId>wildfly-galleon-pack</artifactId>
-                                    <version>${version.org.wildfly}</version>
-                                    <inherit-packages>false</inherit-packages>
-                                    <inherit-configs>false</inherit-configs>
-                                </feature-pack>
-                                <feature-pack>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
-                                    <version>${project.version}</version>
-                                    <inherit-packages>false</inherit-packages>
-                                    <inherit-configs>false</inherit-configs>
-                                </feature-pack>
-                            </feature-packs>
-                            <configurations>
-                                <config>
-                                    <model>standalone</model>
-                                    <name>standalone-graphql.xml</name>
-                                    <layers>
-                                        <!-- jaxrs-server and jmx-remoting are needed by Arquillian -->
-                                        <layer>jaxrs-server</layer>
-                                        <layer>jmx-remoting</layer>
-
-                                        <layer>microprofile-platform</layer>
-                                        <layer>microprofile-graphql</layer>
-                                    </layers>
-                                </config>
-                            </configurations>
+                            <provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/testsuite/server-tck/pom.xml b/testsuite/server-tck/pom.xml
index b1c9909..470029f 100644
--- a/testsuite/server-tck/pom.xml
+++ b/testsuite/server-tck/pom.xml
@@ -69,6 +69,40 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.wildfly.glow</groupId>
+                <artifactId>wildfly-glow-arquillian-plugin</artifactId>
+                <configuration>
+                    <feature-packs>
+                        <feature-pack>
+                            <groupId>org.wildfly</groupId>
+                            <artifactId>wildfly-galleon-pack</artifactId>
+                            <version>${version.org.wildfly}</version>
+                        </feature-pack>
+                        <feature-pack>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
+                            <version>${project.version}</version>
+                        </feature-pack>
+                    </feature-packs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>scan-graphql</id>
+                        <goals>
+                            <goal>scan</goal>
+                        </goals>
+                        <phase>test-compile</phase>
+                        <configuration>
+                            <dependenciesToScan>
+                                <dependency>org.eclipse.microprofile.graphql:microprofile-graphql-server-tck</dependency>
+                                <dependency>org.eclipse.microprofile.graphql:microprofile-graphql-tck</dependency>
+                            </dependenciesToScan>
+                            <expected-discovery>[cdi, jsonb, jsonp, microprofile-config, microprofile-graphql]==>ee-core-profile-server,microprofile-graphql</expected-discovery>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.jboss.galleon</groupId>
                 <artifactId>galleon-maven-plugin</artifactId>
@@ -77,9 +111,9 @@
                     <execution>
                         <id>server-provisioning</id>
                         <goals>
-                            <goal>provision</goal>
+                            <goal>provision-file</goal>
                         </goals>
-                        <phase>compile</phase>
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <install-dir>${project.build.directory}/wildfly</install-dir>
                             <record-state>false</record-state>
@@ -89,36 +123,7 @@
                                 <jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
                                 <optional-packages>passive+</optional-packages>
                             </plugin-options>
-                            <feature-packs>
-                                <feature-pack>
-                                    <transitive>true</transitive>
-                                    <groupId>org.wildfly</groupId>
-                                    <artifactId>wildfly-galleon-pack</artifactId>
-                                    <version>${version.org.wildfly}</version>
-                                    <inherit-packages>false</inherit-packages>
-                                    <inherit-configs>false</inherit-configs>
-                                </feature-pack>
-                                <feature-pack>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
-                                    <version>${project.version}</version>
-                                    <inherit-packages>false</inherit-packages>
-                                    <inherit-configs>false</inherit-configs>
-                                </feature-pack>
-                            </feature-packs>
-                            <configurations>
-                                <config>
-                                    <model>standalone</model>
-                                    <name>standalone.xml</name>
-                                    <layers>
-                                        <layer>jaxrs-server</layer>
-                                        <layer>jmx-remoting</layer>
-                                        <layer>observability</layer>
-                                        <!-- Layers from this FP -->
-                                        <layer>microprofile-graphql</layer>
-                                    </layers>
-                                </config>
-                            </configurations>
+                            <provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
                         </configuration>
                     </execution>
                 </executions>