Restructure tests to follow the integration tests structure

OndroMih · OndroMih · commit 140cfa40563e · 2025-09-29T23:25:40.000+02:00
diff --git a/src/it/start-admin-commands/invoker.properties b/src/it/start-admin-commands/invoker.properties
@@ -14,5 +14,5 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-invoker.goals=test
+invoker.goals=verify
 
diff --git a/src/it/start-admin-commands/pom.xml b/src/it/start-admin-commands/pom.xml
@@ -32,11 +32,17 @@
                 <version>@project.version@</version>
                 <executions>
                     <execution>
-                        <phase>test</phase>
+                        <id>pre-integration</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
                             <goal>admin</goal>
-                            <goal>stop</goal>
                         </goals>
                         <configuration>
                             <port>8081</port>
@@ -46,6 +52,13 @@
                             </commands>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>post-integration</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/src/it/start-with-dependency/invoker.properties b/src/it/start-with-dependency/invoker.properties
@@ -14,5 +14,5 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-invoker.goals=test
+invoker.goals=verify
 
diff --git a/src/it/start-with-dependency/pom.xml b/src/it/start-with-dependency/pom.xml
@@ -44,17 +44,24 @@
                 <version>@project.version@</version>
                 <executions>
                     <execution>
-                        <phase>test</phase>
+                        <id>pre-integration</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>start</goal>
-                            <goal>stop</goal>
                         </goals>
                         <configuration>
                             <port>8081</port>
                             <!-- Just to test that this version is ignored -->
                             <glassfishVersion>7.0.0</glassfishVersion>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>post-integration</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
                 </executions>
                 <dependencies>
                     <dependency>
diff --git a/src/it/start-with-gf-version/invoker.properties b/src/it/start-with-gf-version/invoker.properties
@@ -14,5 +14,5 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-invoker.goals=test
+invoker.goals=verify
 
diff --git a/src/it/start-with-gf-version/pom.xml b/src/it/start-with-gf-version/pom.xml
@@ -32,16 +32,23 @@
                 <version>@project.version@</version>
                 <executions>
                     <execution>
-                        <phase>test</phase>
+                        <id>pre-integration</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>start</goal>
-                            <goal>stop</goal>
                         </goals>
                         <configuration>
                             <port>8081</port>
                             <glassfishVersion>@tested.glassfish.version@</glassfishVersion>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>post-integration</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/src/it/start-with-version-in-dep-management/invoker.properties b/src/it/start-with-version-in-dep-management/invoker.properties
@@ -14,5 +14,5 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-invoker.goals=test
+invoker.goals=verify
 
diff --git a/src/it/start-with-version-in-dep-management/pom.xml b/src/it/start-with-version-in-dep-management/pom.xml
@@ -42,15 +42,22 @@
                 <version>@project.version@</version>
                 <executions>
                     <execution>
-                        <phase>test</phase>
+                        <id>pre-integration</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>start</goal>
-                            <goal>stop</goal>
                         </goals>
                         <configuration>
                             <port>8081</port>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>post-integration</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/src/it/start/invoker.properties b/src/it/start/invoker.properties
@@ -14,5 +14,5 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-invoker.goals=test
+invoker.goals=verify
 
diff --git a/src/it/start/pom.xml b/src/it/start/pom.xml
@@ -32,15 +32,22 @@
                 <version>@project.version@</version>
                 <executions>
                     <execution>
-                        <phase>test</phase>
+                        <id>integration</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>start</goal>
-                            <goal>stop</goal>
                         </goals>
                         <configuration>
                             <port>8081</port>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>post-integration</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@`
`14`	`14`	`# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0`
`15`	`15`	`#`
`16`	`16`
`17`		`-invoker.goals=test`
	`17`	`+invoker.goals=verify`
`18`	`18`