Testsuite improvements - make the tests repeateable without clean tar…

…get/ dir Currently some of the tests fail when they are run repeatedly without running the clean task. The core reason usually is that by default the provisining is skipped when the server directory already exists, and so the code that was expected to be executed is not executed.
jbossas · Nov 26, 2024 · 3ee98b5 · 3ee98b5
1 parent 67d2589
commit 3ee98b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/tests/bootable-tests/src/test/java/org/wildfly/plugin/bootable/PackageBootableTest.java b/tests/bootable-tests/src/test/java/org/wildfly/plugin/bootable/PackageBootableTest.java
@@ -6,6 +6,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 
 import org.apache.maven.plugin.Mojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -43,7 +44,7 @@ public void testBootableRootPackage() throws Exception {
         String deploymentName = "ROOT.war";
         Path rootWar = AbstractWildFlyMojoTest.getBaseDir().resolve("target").resolve(deploymentName);
         Path testWar = AbstractWildFlyMojoTest.getBaseDir().resolve("target").resolve("test.war");
-        Files.copy(testWar, rootWar);
+        Files.copy(testWar, rootWar, StandardCopyOption.REPLACE_EXISTING);
         Files.delete(testWar);
         packageMojo.execute();
         String[] layers = { "jaxrs-server" };

diff --git a/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml b/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml
@@ -43,6 +43,7 @@
                     <record-provisioning-state>true</record-provisioning-state>
                     <provisioning-dir>packaged-bootable-server</provisioning-dir>
                     <bootable-jar>true</bootable-jar>
+                    <overwrite-provisioned-server>true</overwrite-provisioned-server>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml
@@ -43,6 +43,7 @@
                     </extra-server-content-dirs>
                     <record-provisioning-state>true</record-provisioning-state>
                     <provisioning-dir>packaged-invalid-dep-server</provisioning-dir>
+                    <overwrite-provisioned-server>true</overwrite-provisioned-server>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml
@@ -44,6 +44,7 @@
                     </extra-server-content-dirs>
                     <record-provisioning-state>true</record-provisioning-state>
                     <provisioning-dir>packaged-invalid-dep2-server</provisioning-dir>
+                    <overwrite-provisioned-server>true</overwrite-provisioned-server>
                 </configuration>
             </plugin>
         </plugins>