[feature] Enable lazy loading for unit tests, fix bugs.

Author: rhubner

exist-core/src/main/java/org/exist/xquery/ModuleContext.java

@@ -208,6 +208,11 @@ public Module[] getModules(final String namespaceURI) {
         return modules;
     }
 
+    @Override
+    public void addModule(String namespaceURI, Module module) {
+        parentContext.addModule(namespaceURI, module);
+    }
+
     @Override
     protected void setRootModules(final String namespaceURI, final Module[] modules) {
         parentContext.setRootModules(namespaceURI, modules);

exist-core/src/main/java/org/exist/xquery/XQueryContext.java

@@ -1763,8 +1763,8 @@ Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
                 declareNamespace(module.getDefaultPrefix(), module.getNamespaceURI());
             }
 
-            modules.compute(module.getNamespaceURI(), addToMapValueArray(module));
-            allModules.compute(module.getNamespaceURI(), addToMapValueArray(module));
+            this.addModule(module.getNamespaceURI(), module);
+            this.addRootModule(module.getNamespaceURI(), module);
 
             if (module instanceof InternalModule) {
                 ((InternalModule) module).prepare(this);

exist-core/src/main/resources/org/exist/test/runner/xquery-test-runner.xq

@@ -24,6 +24,8 @@ xquery version "3.1";
 import module namespace test = "http://exist-db.org/xquery/xqsuite"
     at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
+import module namespace inspect = "http://exist-db.org/xquery/inspection";
+
 declare variable $test-module-uri as xs:anyURI external;
 
 (: hooks for sending external notifications about test events :)

exist-core/src/test/resources-filtered/conf.xml

@@ -896,18 +896,18 @@
             <module uri="http://www.w3.org/2005/xpath-functions/math" class="org.exist.xquery.functions.math.MathModule" />
             <module uri="http://www.w3.org/2005/xpath-functions/array" class="org.exist.xquery.functions.array.ArrayModule" />
 
-            <module uri="http://exist-db.org/xquery/inspection" class="org.exist.xquery.functions.inspect.InspectionModule"/>
+            <module uri="http://exist-db.org/xquery/inspection" class="org.exist.xquery.functions.inspect.InspectionModule" load="lazily"/>
             <module uri="http://exist-db.org/xquery/request"    class="org.exist.xquery.functions.request.RequestModule" />
             <module uri="http://exist-db.org/xquery/response"   class="org.exist.xquery.functions.response.ResponseModule" />
-            <module uri="http://exist-db.org/xquery/securitymanager" class="org.exist.xquery.functions.securitymanager.SecurityManagerModule"/>
+            <module uri="http://exist-db.org/xquery/securitymanager" class="org.exist.xquery.functions.securitymanager.SecurityManagerModule" load="lazily"/>
             <module uri="http://exist-db.org/xquery/session"    class="org.exist.xquery.functions.session.SessionModule" />
-            <module uri="http://exist-db.org/xquery/system"     class="org.exist.xquery.functions.system.SystemModule" />
-            <module uri="http://exist-db.org/xquery/transform"  class="org.exist.xquery.functions.transform.TransformModule" />
+            <module uri="http://exist-db.org/xquery/system"     class="org.exist.xquery.functions.system.SystemModule"  load="lazily"/>
+            <module uri="http://exist-db.org/xquery/transform"  class="org.exist.xquery.functions.transform.TransformModule" load="lazily" />
             <module uri="http://exist-db.org/xquery/util"       class="org.exist.xquery.functions.util.UtilModule">
                 <!-- set to true to disable the util:eval functions -->
                 <parameter name="evalDisabled" value="false"/>
             </module>
-            <module uri="http://exist-db.org/xquery/validation" class="org.exist.xquery.functions.validation.ValidationModule" />
+            <module uri="http://exist-db.org/xquery/validation" class="org.exist.xquery.functions.validation.ValidationModule" load="lazily" />
             <module uri="http://exist-db.org/xquery/xmldb"      class="org.exist.xquery.functions.xmldb.XMLDBModule" />
 
         </builtin-modules>

exist-core/src/test/xquery/securitymanager/account.xqm

@@ -24,7 +24,7 @@ xquery version "3.1";
 module namespace account = "http://exist-db.org/test/securitymanager/account";
 
 declare namespace test = "http://exist-db.org/xquery/xqsuite";
-declare namespace sm = "http://exist-db.org/xquery/securitymanager";
+import module namespace sm = "http://exist-db.org/xquery/securitymanager";
 
 declare
     %test:assertFalse

exist-core/src/test/xquery/securitymanager/id.xqm

@@ -25,7 +25,8 @@ module namespace id = "http://exist-db.org/test/securitymanager/id";
 
 declare namespace test = "http://exist-db.org/xquery/xqsuite";
 declare namespace mod1 = "http://module1";
-declare namespace sm = "http://exist-db.org/xquery/securitymanager";
+import module namespace inspect = "http://exist-db.org/xquery/inspection";
+import module namespace sm = "http://exist-db.org/xquery/securitymanager";
 
 declare variable $id:TEST_COLLECTION_NAME := "test-id";
 declare variable $id:TEST_COLLECTION_PATH := "/db/test-id";
@@ -38,6 +39,7 @@ function id:setup() {
     xmldb:store($id:TEST_COLLECTION_PATH, $id:TEST_MODULE_NAME, 'xquery version "3.0";
 
 module namespace mod1 = "http://module1";
+import module namespace sm = "http://exist-db.org/xquery/securitymanager";
 
 declare function mod1:function1() {
     <mod1>{sm:id()}</mod1>

exist-core/src/test/xquery/serialization.xml

@@ -45,7 +45,7 @@ some value
         <task>comments and xsl</task>
         <code><![CDATA[
 xquery version "1.0" encoding "UTF-8";
-
+import module namespace transform = "http://exist-db.org/xquery/transform";
 let $doc as document-node() := document {
   <Root>
     <!-- Comment 1 -->

exist-core/src/test/xquery/validation/jaxv.xql

@@ -25,6 +25,8 @@ module namespace val ="http://exist-db.org/xquery/test/validation";
 
 declare namespace test="http://exist-db.org/xquery/xqsuite";
 
+import module namespace validation = "http://exist-db.org/xquery/validation";
+
 declare variable $val:XML := <root>
                                 <value1>20</value1>
                                 <value2>30</value2>

exist-core/src/test/xquery/xinclude/xinclude.xml

@@ -175,6 +175,7 @@
     <test output="text">
         <task>XInclude applied before XSLT step</task>
         <code><![CDATA[
+            import module namespace transform = "http://exist-db.org/xquery/transform";
             let $stylesheet := doc("/db/test/test.xsl")
             return
                 transform:transform(doc('/db/test/test1.xml'), $stylesheet, (), (),
@@ -185,6 +186,7 @@
     <test output="text">
         <task>XInclude applied before XSLT step 2</task>
         <code><![CDATA[
+            import module namespace transform = "http://exist-db.org/xquery/transform";
             let $stylesheet := doc("/db/test/test.xsl")
             return
                 transform:transform(doc('/db/test/test1.xml'), $stylesheet, ())

exist-core/src/test/xquery/xmldb/copy-tests.xql

@@ -25,6 +25,8 @@ module namespace t="http://exist-db.org/testsuite/copy";
 
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
+import module namespace sm = "http://exist-db.org/xquery/securitymanager";
+
 declare variable $t:collection-name := "copy-test";
 declare variable $t:collection := "/db/" || $t:collection-name;
 declare variable $t:target-collection-name := "copy-target";