[bugfix] Enable some tests that were previously not running under Surefire

Closes eXist-db/exist#5903

Author: adamretter

.circleci/config.yml

@@ -527,12 +527,13 @@ jobs:
                       else
                         export JAVA_TOOL_OPTIONS="<< pipeline.parameters.java_tool_options >>"
                       fi
-                      $MAVEN_BIN test -Dappbundler.skip=true -Ddocker=false -P !mac-dmg-on-mac,!codesign-mac-app,!codesign-mac-dmg,!mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives
+                      $MAVEN_BIN test integration-test -Dappbundler.skip=true -Ddocker=false -P !mac-dmg-on-mac,!codesign-mac-app,!codesign-mac-dmg,!mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives
       - run:
           name: Save test results
           command: |
             mkdir -p ~/test-results/junit/
             /usr/bin/find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \;
+            /usr/bin/find . -type f -regex ".*/target/failsafe-reports/.*xml" -exec cp {} ~/test-results/junit/ \;
           when: always
       - store_test_results:
           path: ~/test-results

build.bat

@@ -95,7 +95,7 @@ if "%TARGET%"=="quick" (
 ) else if "%TARGET%"=="test" (
     set "CMD=%BASE_CMD% clean test -Ddependency-check.skip=true"
 ) else if "%TARGET%"=="site" (
-    set "CMD=%BASE_CMD% clean test -Ddependency-check.skip=true"
+    set "CMD=%BASE_CMD% clean verify site -Ddependency-check.skip=true"
 ) else if "%TARGET%"=="license-check" (
     set "CMD=%BASE_CMD% license:check"
 ) else if "%TARGET%"=="license-format" (

build.sh

@@ -141,7 +141,7 @@ if [ "${TARGET}" == "test" ]; then
 fi
 
 if [ "${TARGET}" == "site" ]; then
-  CMD="${BASE_CMD} clean site -Ddependency-check.skip=true"
+  CMD="${BASE_CMD} clean verify site -Ddependency-check.skip=true"
   $CMD
   exit 0;
 fi
@@ -171,4 +171,4 @@ if [ "${TARGET}" == "dependency-security-check" ]; then
 fi
 
 print-useage
-exit 0;
+exit 0;

elemental-parent/pom.xml

@@ -420,6 +420,10 @@
                             <java.locale.providers>JRE,CLDR,SPI</java.locale.providers>
                             <log4j.configurationFile>${project.build.testOutputDirectory}/log4j2.xml</log4j.configurationFile>
                         </systemPropertyVariables>
+                        <includes>
+                            <include>**/*Test.java</include>
+                            <include>**/*Tests.java</include>
+                        </includes>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -431,6 +435,11 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>3.5.3</version>
+                    <configuration>
+                        <includes>
+                            <include>**/*IT.java</include>
+                        </includes>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>com.github.hazendaz.maven</groupId>
@@ -541,6 +550,26 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>

exist-core/pom.xml

@@ -325,10 +325,10 @@ private void doRecovery(final int txnCount, final Path last, final JournalReader
             } catch (final Exception e) {
                 LOG.error("Exception caught while redoing transactions. Aborting recovery to avoid possible damage. " +
                     "Before starting again, make sure to run a check via the emergency export tool.", e);
-                if (next != null)
-                    {
-                        LOG.info("Log entry that caused the exception: {}", next.dump());}
-                throw new LogException("Recovery aborted. ");
+                if (next != null) {
+                    LOG.info("Log entry that caused the exception: {}", next.dump());
+                }
+                throw new LogException("Recovery aborted: " + e.getMessage(), e);
             } finally {
                 LOG.info("Redo processed {} out of {} transactions.", redoCnt, txnCount);
             }
@@ -375,10 +375,10 @@ private void doRecovery(final int txnCount, final Path last, final JournalReader
                     }
                 } catch (final Exception e) {
                     LOG.warn("Exception caught while undoing dirty transactions. Remaining transactions to be undone: {}. Aborting recovery to avoid possible damage. Before starting again, make sure to run a check via the emergency export tool.", runningTxns.size(), e);
-                    if (next != null)
-                        {
-                            LOG.warn("Log entry that caused the exception: {}", next.dump());}
-                    throw new LogException("Recovery aborted", e);
+                    if (next != null) {
+                        LOG.warn("Log entry that caused the exception: {}", next.dump());
+                    }
+                    throw new LogException("Recovery aborted: " + e.getMessage(), e);
                 }
             }
         } finally {

exist-core/src/main/java/org/exist/storage/recovery/RecoveryManager.java

@@ -84,7 +84,7 @@
  *
  * @author ljo
  */
-public class IndexerTest2 {
+public class Indexer2Test {
 
     private final static String XML =
             "<?xml version=\"1.0\"?>\n" +

…rc/test/java/org/exist/IndexerTest2.java …rc/test/java/org/exist/Indexer2Test.javaexist-core/src/test/java/org/exist/IndexerTest2.java renamed to exist-core/src/test/java/org/exist/Indexer2Test.java exist-core/src/test/java/org/exist/IndexerTest2.java renamed to exist-core/src/test/java/org/exist/Indexer2Test.java

@@ -80,7 +80,7 @@
  *
  * @author ljo
  */
-public class IndexerTest3 {
+public class Indexer3Test {
 
     @ClassRule
     public static final ExistEmbeddedServer existEmbeddedServer = new ExistEmbeddedServer(true, true);

…rc/test/java/org/exist/IndexerTest3.java …rc/test/java/org/exist/Indexer3Test.javaexist-core/src/test/java/org/exist/IndexerTest3.java renamed to exist-core/src/test/java/org/exist/Indexer3Test.java exist-core/src/test/java/org/exist/IndexerTest3.java renamed to exist-core/src/test/java/org/exist/Indexer3Test.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -42,7 +66,7 @@
 /**
  * Test trigger to check if trigger configuration is working properly.
  */
-public class TestTrigger extends SAXTrigger implements DocumentTrigger {
+public class MessagesTrigger extends SAXTrigger implements DocumentTrigger {
 
     protected Logger LOG = LogManager.getLogger(getClass());