Merge lp:~zorba-coders/zorba/bug-1188062 into lp:zorba/queue-module

[Luis Rodriguez Gonzalez]

Update to 3.0 module guidelines; make JSON-ready.

Might as well bring in https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 too.

[Chris Hillery (ceejatec)]

See the updated task description on the bug report. Also, see the updated coding guidelines for <p> and error codes.

review: Needs Fixing

[lp:~zorba-coders/zorba/bug-1188062]

14. By Luis Rodriguez Gonzalez on 2013-06-21

added the ability to manage JSON structures and a new test case

15. By Luis Rodriguez Gonzalez on 2013-07-05

Changes to fix actual problems

[Luis Rodriguez Gonzalez (kuraru)]

> See the updated task description on the bug report. Also, see the updated
> coding guidelines for <p> and error codes.

Documentation and code problems fixed, please check it again.

[lp:~zorba-coders/zorba/bug-1188062]

16. By Luis Rodriguez Gonzalez on 2013-07-05

Forgot to add the new testcases

[Chris Hillery (ceejatec)]

1. Error QNames should not be declared as public constants (see coding guidelines). Declare them as private variables as follows:

declare %private variable $queue:NOT-EXISTS as xs:QName := fn:QName($queue:ERR-NS, "queue:NOT-EXISTS");

2. The current XQDoc for those error QNames is pointless. Either eliminate the XQDoc entirely, or put in some meaningful comment (only for later authors of the module since it won't be part of the public API).

3. The XQDoc for all the queue functions refers to "nodes". It should now say "items" since it works for objects and arrays in addition to nodes.

review: Needs Fixing

[lp:~zorba-coders/zorba/bug-1188062]

17. By Luis Rodriguez Gonzalez on 2013-07-10

Constants declared as private. Removed comments for private variables.

18. By Luis Rodriguez Gonzalez on 2013-07-10

All references to nodes were changed to items.

19. By Chris Hillery on 2013-07-17

Updated header comment.

[Chris Hillery (ceejatec)]

review: Approve

[Luis Rodriguez Gonzalez (kuraru)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946
https://code.launchpad.net/~zorba-coders/zorba/xqdoc-private-variables/+merge/175166
https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946

Stage "TestZorbaUbuntu" failed.
4 tests failed (8355 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/86/testReport/ to view the results.

[lp:~zorba-coders/zorba/bug-1188062]

20. By Chris Hillery on 2013-07-17

Updating error URI.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946
https://code.launchpad.net/~zorba-coders/zorba/xqdoc-private-variables/+merge/175166
https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946

Stage "TestZorbaUbuntu" failed.
2 tests failed (8355 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/87/testReport/ to view the results.

[lp:~zorba-coders/zorba/bug-1188062]

21. By Chris Hillery on 2013-07-17

Updated test results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946
https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-02-29 09:08:58 +0000
+++ src/CMakeLists.txt	2013-07-17 06:14:23 +0000
@@ -15,6 +15,6 @@
 
 ##### Queue data structure
 
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/queue" VERSION 1.0 FILE "queue.xq")
+DECLARE_ZORBA_MODULE (URI "http://zorba.io/modules/queue" VERSION 1.0 FILE "queue.xq")
 
 ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")

=== modified file 'src/queue.xq'
--- src/queue.xq	2013-06-15 19:46:41 +0000
+++ src/queue.xq	2013-07-17 06:14:23 +0000
@@ -17,12 +17,15 @@
 :)
 
 (:~
- : Implementation of queue for node items, using dynamic collections.<br />
+ : Implementation of queue for items, using dynamic collections.<p/>
+ :
+ : Entries in the queue must be structured items - that is, either JSON
+ : Objects or Arrays, or XML Nodes. <p/>
  :
  : @author Daniel Turcanu, Sorin Nasoi
  : @project Zorba/Data Store/Data Structures/Queue
  :)
-module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+module namespace queue = "http://zorba.io/modules/queue";
 
 import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
@@ -31,137 +34,136 @@
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";
 
-(:~
- : Errors namespace URI.
-:)
-declare variable $queue:errNS as xs:string := "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+declare %private variable $queue:ERR-NS as xs:string := "http://zorba.io/modules/queue";
  
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/store/data-structures/queue" and local name "errNA"
-:)
-declare variable $queue:errNA as xs:QName := fn:QName($queue:errNS, "queue:errNA");
-
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/store/data-structures/queue" and local name "errExists"
-:)
-declare variable $queue:errExists as xs:QName := fn:QName($queue:errNS, "queue:errExists");
-
-(:~
- : Create a queue with this name. <br /> If queue exists, an error is raised.
+declare %private variable $queue:NOT-EXISTS as xs:QName := fn:QName($queue:ERR-NS, "queue:NOT-EXISTS");
+
+declare %private variable $queue:EXISTS as xs:QName := fn:QName($queue:ERR-NS, "queue:EXISTS");
+
+(:~
+ : Create a queue with the name given. If a queue with the given name already exists, an error is raised. <p/>
+ :
  : @param $name name of the new queue.
- : @return ()
- : @error queue:errExists if the queue identified by $name already exists.
+ : @return an empty sequence.
+ : @error queue:EXISTS if the queue identified by $name already exists.
  :)
 declare %ann:sequential function queue:create($name as xs:QName) as empty-sequence()
 {
   if(collections-ddl:is-available-collection($name)) then
-    fn:error($queue:errExists, "Queue already exists.");
+    fn:error($queue:EXISTS, "Queue already exists.");
   else
     collections-ddl:create($name);
 };
 
 (:~
- : Return the first node in the queue (the first added), without removing it.
+ : Return the first item in the queue (the first added), without removing it. <p/>
+ :
  : @param $name name of the queue.
- : @return the first node, or empty sequence if queue is empty.
+ : @return the first item, or empty sequence if queue is empty.
  : @example test/Queries/front1.xq
- : @error queue:errNA if the queue identified by $name does not exist.
+ : @error queue:NOT-EXISTS if the queue identified by $name does not exist.
  :)
-declare function queue:front($name as xs:QName) as node()?
+declare function queue:front($name as xs:QName) as structured-item()?
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($queue:errNA, "Queue does not exist.")
+    fn:error($queue:NOT-EXISTS, "Queue does not exist.")
   else
     collections-dml:collection($name)[1]
 };
 
 (:~
- : Return the last node in the queue (the last added), without removing it.
+ : Return the last item in the queue (the last added), without removing it. <p/>
+ :
  : @param $name name of the queue.
- : @return the last node, or empty sequence if queue is empty.
+ : @return the last item, or empty sequence if queue is empty.
  : @example test/Queries/back1.xq
- : @error queue:errNA if the queue identified by $name does not exist.
+ : @error queue:NOT-EXISTS if the queue identified by $name does not exist.
  :)
-declare function queue:back($name as xs:QName) as node()?
+declare function queue:back($name as xs:QName) as structured-item()?
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($queue:errNA, "Queue does not exist.")
+    fn:error($queue:NOT-EXISTS, "Queue does not exist.")
   else
     collections-dml:collection($name)[fn:last()]
 };
 
 (:~
- : Return the first node in the queue, and remove it.
+ : Return the first item in the queue, and remove it. <p/>
+ :
  : @param $name name of the queue.
- : @return the first node, or empty sequence if queue is empty.
+ : @return the first item, or empty sequence if queue is empty.
  : @example test/Queries/pop2.xq
- : @error queue:errNA if the queue identified by $name does not exist.
+ : @error queue:NOT-EXISTS if the queue identified by $name does not exist.
  :)
-declare %ann:sequential function queue:pop($name as xs:QName) as node()?
+declare %ann:sequential function queue:pop($name as xs:QName) as structured-item()?
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($queue:errNA, "Queue does not exist.")
+    fn:error($queue:NOT-EXISTS, "Queue does not exist.")
   else
   {
-    variable $topNode := collections-dml:collection($name)[1];
-    collections-dml:delete-node-first($name);
-    $topNode
+    variable $topItem := collections-dml:collection($name)[1];
+    collections-dml:delete-first($name);
+    $topItem
   }
 };
 
 (:~
- : Add a new node to the queue; the queue will contain a copy of the given node.
+ : Add a new item to the queue; the queue will contain a copy of the given item. <p/>
+ :
  : @param $name name of the queue.
- : @param $value the node to be added.
+ : @param $value the item to be added.
  : @return ()
  : @example test/Queries/push1.xq
- : @error queue:errNA if the queue identified by $name does not exist.
+ : @error queue:NOT-EXISTS if the queue identified by $name does not exist.
  :)
-declare %ann:sequential function queue:push($name as xs:QName, $value as node()) as empty-sequence()
+declare %ann:sequential function queue:push($name as xs:QName, $value as structured-item()) as empty-sequence()
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($queue:errNA, "Queue does not exist.");
+    fn:error($queue:NOT-EXISTS, "Queue does not exist.");
   else
-    collections-dml:apply-insert-nodes-last($name, $value);
+    collections-dml:apply-insert-last($name, $value);
 };
 
 (:~
- : Checks if a queue exists and is empty.
+ : Checks if a queue exists and is empty. <p/>
+ :
  : @param $name name of the queue.
- : @return true is the queue is empty or does not exist.
+ : @return true is the queue is empty, false if it is not empty.
  : @example test/Queries/empty1.xq
- : @error queue:errNA if the queue identified by $name does not exist.
+ : @error queue:NOT-EXISTS if the queue identified by $name does not exist.
  :)
 declare function queue:empty($name as xs:QName) as xs:boolean
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($queue:errNA, "Queue does not exist.")
+    fn:error($queue:NOT-EXISTS, "Queue does not exist.")
   else
     fn:empty(collections-dml:collection($name))
 };
 
 (:~
- : Count of nodes in the queue.
+ : Count of items in the queue. <p/>
+ :
  : @param $name name of the queue.
- : @return the count of nodes.
+ : @return the count of items.
  : @example test/Queries/size1.xq
- : @error queue:errNA if the queue identified by $name does not exist.
+ : @error queue:NOT-EXISTS if the queue identified by $name does not exist.
  :)
 declare function queue:size($name as xs:QName) as xs:integer
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($queue:errNA, "Queue does not exist.")
+    fn:error($queue:NOT-EXISTS, "Queue does not exist.")
   else
     fn:count(collections-dml:collection($name))
 };
 
 (:~
- : Copy all nodes from source queue to a destination queue.<br />
- : If destination queue does not exist, it is created first. <br />
- : If destination queue is not empty, the nodes are appended last.
+ : Copy all items from source queue to a destination queue. <p/>
+ : If destination queue does not exist, it is created first. <p/>
+ : If destination queue is not empty, the items are appended last. <p/>
+ :
  : @param $destName name of the destination queue.
  : @param $sourceName name of the source queue.
- : @return ()
+ : @return an empty sequence.
  : @example test/Queries/copy1.xq
  :)
 declare %ann:sequential function queue:copy($destName as xs:QName, $sourceName as xs:QName) as empty-sequence()
@@ -170,5 +172,5 @@
     collections-ddl:create($destName);
   else
     ();
-  collections-dml:insert-nodes-last($destName, collections-dml:collection($sourceName));
+  collections-dml:insert-last($destName, collections-dml:collection($sourceName));
 };

=== added file 'test/ExpQueryResults/back-json1.xml.res'
--- test/ExpQueryResults/back-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/back-json1.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,1 @@
+{ "b" : 2 }
\ No newline at end of file

=== added file 'test/ExpQueryResults/copy-json1.xml.res'
--- test/ExpQueryResults/copy-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/copy-json1.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,1 @@
+{ "a" : 1 }4
\ No newline at end of file

=== added file 'test/ExpQueryResults/empty-json1.xml.res'
--- test/ExpQueryResults/empty-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/empty-json1.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+false{ "a" : 1 }{ "b" : null }true
\ No newline at end of file

=== added file 'test/ExpQueryResults/front-json1.xml.res'
--- test/ExpQueryResults/front-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/front-json1.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,1 @@
+{ "a" : 1 }
\ No newline at end of file

=== added file 'test/ExpQueryResults/pop-json2.xml.res'
--- test/ExpQueryResults/pop-json2.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/pop-json2.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,1 @@
+{ "pi" : 3.1415927 }
\ No newline at end of file

=== added file 'test/ExpQueryResults/pop-mix.xml.res'
--- test/ExpQueryResults/pop-mix.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/pop-mix.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,1 @@
+{ "pi" : 3.1415927 }{ "e" : 2.7182818 }<a/><b/>
\ No newline at end of file

=== added file 'test/ExpQueryResults/push-json1.xml.res'
--- test/ExpQueryResults/push-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/push-json1.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,1 @@
+{ "a" : 1 }{ "b" : true }
\ No newline at end of file

=== added file 'test/ExpQueryResults/push-json2.xml.res'
--- test/ExpQueryResults/push-json2.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/push-json2.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,1 @@
+{ "a" : 1 }{ "b" : 2.1 }{ "c" : "done" }
\ No newline at end of file

=== added file 'test/ExpQueryResults/size-json1.xml.res'
--- test/ExpQueryResults/size-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/size-json1.xml.res	2013-07-17 06:14:23 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+3
\ No newline at end of file

=== added file 'test/Queries/back-json1.xq'
--- test/Queries/back-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/back-json1.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,7 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+queue:create($name);
+queue:push($name, {"a" : 1});
+queue:push($name, {"b" : 2});
+queue:back($name)

=== modified file 'test/Queries/back1.xq'
--- test/Queries/back1.xq	2012-02-29 09:08:58 +0000
+++ test/Queries/back1.xq	2013-07-17 06:14:23 +0000
@@ -1,7 +1,7 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 queue:create($name);
 queue:push($name, <a/>);
 queue:push($name, <b/>);
-queue:back($name)
\ No newline at end of file
+queue:back($name)

=== added file 'test/Queries/copy-json1.xq'
--- test/Queries/copy-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/copy-json1.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,11 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+variable $nameCopy := fn:QName("", "queue-copy");
+queue:create($name);
+queue:push($name, { "a" : 1 });
+queue:push($name, { "b" : "hi" });
+queue:copy($nameCopy, $name);
+queue:push($nameCopy, { "c" : jn:null() });
+queue:push($nameCopy, { "d" : fn:true() });
+(queue:front($nameCopy), queue:size($nameCopy))

=== modified file 'test/Queries/copy1.xq'
--- test/Queries/copy1.xq	2012-02-29 09:08:58 +0000
+++ test/Queries/copy1.xq	2013-07-17 06:14:23 +0000
@@ -1,4 +1,4 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 variable $nameCopy := fn:QName("", "queue-copy");

=== added file 'test/Queries/empty-json1.xq'
--- test/Queries/empty-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/empty-json1.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,20 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
+import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
+
+variable $name := fn:QName("", "queue1");
+
+(
+  queue:create($name),
+  queue:push($name, { "a" : 1 }),
+  queue:push($name, { "b" : jn:null() }),
+  queue:empty($name),
+  queue:pop($name),
+  queue:pop($name),
+  queue:empty($name),
+  {
+    collections-dml:delete-first($name, queue:size($name));
+    collections-ddl:delete($name);
+    ()
+  }
+)  

=== modified file 'test/Queries/empty1.xq'
--- test/Queries/empty1.xq	2012-04-18 09:42:23 +0000
+++ test/Queries/empty1.xq	2013-07-17 06:14:23 +0000
@@ -1,4 +1,4 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
 

=== added file 'test/Queries/front-json1.xq'
--- test/Queries/front-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/front-json1.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,7 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+queue:create($name);
+queue:push($name, { "a" : 1 });
+queue:push($name, { "b" : fn:false() });
+queue:front($name)

=== modified file 'test/Queries/front1.xq'
--- test/Queries/front1.xq	2012-02-29 09:08:58 +0000
+++ test/Queries/front1.xq	2013-07-17 06:14:23 +0000
@@ -1,7 +1,7 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 queue:create($name);
 queue:push($name, <a/>);
 queue:push($name, <b/>);
-queue:front($name)
\ No newline at end of file
+queue:front($name)

=== added file 'test/Queries/pop-json2.xq'
--- test/Queries/pop-json2.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/pop-json2.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,7 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+queue:create($name);
+queue:push($name, { "pi" : 3.1415927 });
+queue:push($name, { "e"  : 2.7182818 });
+queue:pop($name)

=== added file 'test/Queries/pop-mix.xq'
--- test/Queries/pop-mix.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/pop-mix.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,9 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+queue:create($name);
+queue:push($name, { "pi" : 3.1415927 });
+queue:push($name, { "e"  : 2.7182818 });
+queue:push($name, <a/>);
+queue:push($name, <b/>);
+(queue:pop($name), queue:pop($name), queue:pop($name), queue:pop($name))

=== modified file 'test/Queries/pop1.xq'
--- test/Queries/pop1.xq	2012-02-29 09:08:58 +0000
+++ test/Queries/pop1.xq	2013-07-17 06:14:23 +0000
@@ -1,5 +1,5 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 queue:create($name);
-queue:pop($name)
\ No newline at end of file
+queue:pop($name)

=== modified file 'test/Queries/pop2.xq'
--- test/Queries/pop2.xq	2012-02-29 09:08:58 +0000
+++ test/Queries/pop2.xq	2013-07-17 06:14:23 +0000
@@ -1,7 +1,7 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 queue:create($name);
 queue:push($name, <a/>);
 queue:push($name, <b/>);
-queue:pop($name)
\ No newline at end of file
+queue:pop($name)

=== added file 'test/Queries/push-json1.xq'
--- test/Queries/push-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/push-json1.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,12 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+(
+  queue:create($name),
+  queue:push($name, { "a" : 1 }),
+  queue:push($name, { "b" : fn:true() }),
+  queue:pop($name),
+  queue:push($name, { "c" : jn:null() }),
+  queue:push($name, { "d" : 1.4142 }),
+  queue:pop($name)
+)

=== added file 'test/Queries/push-json2.xq'
--- test/Queries/push-json2.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/push-json2.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,13 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+(
+  queue:create($name),
+  queue:push($name, { "a" : 1 }),
+  queue:push($name, { "b" : 2.1 }),
+  queue:pop($name),
+  queue:push($name, { "c" : "done" }),
+  queue:push($name, { "d" : jn:null() }),
+  queue:pop($name),
+  queue:pop($name)
+)

=== modified file 'test/Queries/push1.xq'
--- test/Queries/push1.xq	2012-02-29 09:08:58 +0000
+++ test/Queries/push1.xq	2013-07-17 06:14:23 +0000
@@ -1,4 +1,4 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 (

=== modified file 'test/Queries/push2.xq'
--- test/Queries/push2.xq	2012-03-23 07:19:21 +0000
+++ test/Queries/push2.xq	2013-07-17 06:14:23 +0000
@@ -1,4 +1,4 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 (

=== added file 'test/Queries/size-json1.xq'
--- test/Queries/size-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/size-json1.xq	2013-07-17 06:14:23 +0000
@@ -0,0 +1,10 @@
+import module namespace queue = "http://zorba.io/modules/queue";
+
+variable $name := fn:QName("", "queue1");
+queue:create($name);
+queue:push($name, { "a" : 1 });
+queue:push($name, { "b" : 2.1 });
+queue:pop($name);
+queue:push($name, { "c" : fn:false() });
+queue:push($name, { "d" : "sort" });
+queue:size($name)

=== modified file 'test/Queries/size1.xq'
--- test/Queries/size1.xq	2012-02-29 09:08:58 +0000
+++ test/Queries/size1.xq	2013-07-17 06:14:23 +0000
@@ -1,4 +1,4 @@
-import module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";
+import module namespace queue = "http://zorba.io/modules/queue";
 
 variable $name := fn:QName("", "queue1");
 queue:create($name);