Merge branch 'develop' of github.com:eXist-db/exist into feature/add_function_document-uri0

* 'develop' of github.com:eXist-db/exist:
  [test] Added test supplied by @joewiz
  [bugfix] Make sure the correct context sequence is used with util:eval-with-context Closes #3039

Author: dizzzz

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

@@ -98,7 +98,30 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
         // get statically known documents from the context
         DocumentSet ds = context.getStaticallyKnownDocuments();
         if (ds == null || ds.getDocumentCount() == 0) {return Sequence.EMPTY_SEQUENCE;}
-        
+
+        // fix for util:eval-with-context
+        if (contextSequence != null) {
+            if (!contextSequence.isEmpty()) {
+                final Item item = contextSequence.itemAt(0);
+                // context item must be a node
+                if (!Type.subTypeOf(item.getType(), Type.NODE)) {
+                    throw new XPathException(this, ErrorCodes.XPTY0020, "Context item is not a node");
+                }
+                final NodeValue node = (NodeValue)item;
+                // return fn:root(self::node()) treat as document-node()
+                if (node.getImplementationType() == NodeValue.PERSISTENT_NODE) {
+                    return new NodeProxy(((NodeProxy)item).getOwnerDocument());
+                } else {
+                    if (node.getType() == Type.DOCUMENT) {
+                        return node;
+                    }
+                    return (org.exist.dom.memtree.DocumentImpl) node.getOwnerDocument();
+                }
+            } else {
+                return Sequence.EMPTY_SEQUENCE;
+            }
+        }
+
 //        // if the expression occurs in a nested context, we might have cached the
 //        // document set
 //        // TODO: disabled cache for now as it may cause concurrency issues

exist-core/src/test/java/org/exist/storage/ShutdownTest.java

@@ -90,7 +90,7 @@ public void storeAndShutdown() throws EXistException, PermissionDeniedException,
 
                 final XQuery xquery = pool.getXQueryService();
                 assertNotNull(xquery);
-                final Sequence result = xquery.execute(broker, "//SPEECH[contains(LINE, 'love')]", Sequence.EMPTY_SEQUENCE);
+                final Sequence result = xquery.execute(broker, "//SPEECH[contains(LINE, 'love')]", null);
                 assertNotNull(result);
                 assertEquals(187, result.getItemCount());
 

exist-core/src/test/xquery/util/eval-with-context.xql

@@ -34,4 +34,10 @@ function ut:timeout() {
         </static-context>
     return
         util:eval-with-context("util:wait(2), <ok/>", $context, false() )
-};
+};
+
+declare
+    %test:assertEquals(1)
+function ut:root-node() {
+    util:eval-with-context('count(/)', (), false(), document { <x/> })
+};