Merge pull request #101 from evolvedbinary/6.x.x/hotfix/surefire-tests

[6.x.x] Ensure that all tests and integration tests run in CI

Author: adamretter

.circleci/config.yml

@@ -530,12 +530,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

@@ -413,6 +413,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>
@@ -424,6 +428,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>
@@ -528,6 +537,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-ant/src/test/resources/log4j2.xml

@@ -231,15 +231,15 @@
             <AppenderRef ref="elemental.scheduler"/>
         </Logger>
 
-        <Logger name="org.exist.storage.SystemTask" additivity="false" level="debug">
+        <Logger name="org.exist.storage.SystemTask" additivity="false" level="info">
             <AppenderRef ref="elemental.scheduler"/>
         </Logger>
 
         <!-- expath pkg repo -->
-        <Logger name="org.expath.pkg" additivity="false" level="trace">
+        <Logger name="org.expath.pkg" additivity="false" level="info">
             <AppenderRef ref="expath.repo"/>
         </Logger>
-        <Logger name="org.exist.repo" additivity="false" level="trace">
+        <Logger name="org.exist.repo" additivity="false" level="info">
             <AppenderRef ref="expath.repo"/>
         </Logger>
         <Logger name="org.exist.launcher" additivity="false" level="warn">