Merge pull request #48 from evolvedbinary/6.x.x/hotfix/surefire-run-all-tests

[6.x.x] Address test issues

Author: adamretter

.circleci/config.yml

@@ -540,10 +540,11 @@ jobs:
       - store_test_results:
           path: ~/test-results
       - when:
-          # NOTE(AR) only persist the workspace when it is `large` as we then reuse it for the `code-coverage` jobs
+          # NOTE(AR) only persist the workspace when we are on the `main` branch, and it has a `large` compute, as we then reuse it for the `code-coverage` jobs
           condition:
             and:
               - equal: [ large, << parameters.compute_size >> ]
+              - equal: [ main, << pipeline.git.branch >> ]
           steps:
             - persist_project:
                 compute_size: << parameters.compute_size >>

build.sh

@@ -125,7 +125,7 @@ if [ "${TARGET}" == "test" ]; then
 fi
 
 if [ "${TARGET}" == "site" ]; then
-  CMD="${BASE_CMD} clean test -Ddependency-check.skip=true"
+  CMD="${BASE_CMD} clean site -Ddependency-check.skip=true"
   $CMD
   exit 0;
 fi

elemental-parent/pom.xml

@@ -362,7 +362,8 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.5.3</version>
+                    <!-- NOTE(AR) Rolled back to version 3.5.2 due to https://github.com/apache/maven-surefire/issues/2634#issuecomment-3092462501 -->
+                    <version>3.5.2</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.junit.platform</groupId>

exist-core/src/test/xquery/fn.xql

@@ -91,7 +91,7 @@ function fnt:doc-available-remote($uri as xs:string) {
 
 declare
     %test:args("\adamretter")
-    %test:assertError("FODC0005")
+    %test:assertFalse
 function fnt:doc-available-invalid-uri($uri as xs:string) {
     fn:doc-available($uri)
 };

exist-core/src/test/xquery/xquery3/transform/fnTransform71.xqm

@@ -25,34 +25,34 @@ module namespace testTransform="http://exist-db.org/xquery/test/function_transfo
 
 declare namespace test="http://exist-db.org/xquery/xqsuite";
 
-declare variable $testTransform:transform-71-xsl := document {
+declare variable $testTransform:transform-71-xsl := "
 <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
-            xmlns:xs='http://www.w3.org/2001/XMLSchema'
-            xmlns:chrono='http://chronology.com/' version='2.0'>
-            <xsl:import-schema>
-              <xs:schema targetNamespace='http://chronology.com/'>
-                <xs:simpleType name='c4'>
-                  <xs:restriction base='xs:string'>
-                    <xs:pattern value='....'/>
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:schema>
-            </xsl:import-schema>
-            <xsl:template name='main'>
-              <out><xsl:value-of select="chrono:c4('abcd')"/></out>
-            </xsl:template>
-        </xsl:stylesheet> };
+  xmlns:xs='http://www.w3.org/2001/XMLSchema'
+  xmlns:chrono='http://chronology.com/' version='2.0'>
+  <xsl:import-schema>
+    <xs:schema targetNamespace='http://chronology.com/'>
+      <xs:simpleType name='c4'>
+        <xs:restriction base='xs:string'>
+          <xs:pattern value='....'/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:schema>
+  </xsl:import-schema>
+  <xsl:template name='main'>
+    <out><xsl:value-of select=""chrono:c4('abcd')""/></out>
+  </xsl:template>
+</xsl:stylesheet>";
 
 declare
     %test:assertError("XTSE1650")
 function testTransform:transform-71() {
     let $xsl := $testTransform:transform-71-xsl
-    let $result := fn:transform(map{
-    "stylesheet-node":$xsl,
-                "source-node": parse-xml($xsl),
-                "initial-template": fn:QName('','main'),
-                    "delivery-format" : "serialized",
-                    "requested-properties" : map{fn:QName('http://www.w3.org/1999/XSL/Transform','is-schema-aware'):false()}
-                    })
-    return $result("output")
+    let $result := fn:transform(map {
+            "stylesheet-text": $xsl,
+            "initial-template": fn:QName('','main'),
+            "delivery-format": "serialized",
+            "requested-properties" : map{ fn:QName('http://www.w3.org/1999/XSL/Transform','is-schema-aware'):false() }
+    })
+    return
+        $result("output")
 };