Add missing specification examples in tests

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Array/Navigation/q01_array_navigation.txt

@@ -1 +1 @@
-2
+Sunday

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Array/Navigation/q02_array_navigation.txt

@@ -1 +1 @@
-2
+tuesday

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Array/Navigation/q08_array_navigation.txt

@@ -0,0 +1 @@
+["mercury","venus","earth","mars"]

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Array/q03_array.txt

@@ -1 +1 @@
-[[1,2],[2,3]]
+[[1,2,3],[4,5,6],[7,8,9]]

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Array/q05_array.txt

@@ -0,0 +1 @@
+["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Array/q06_array.txt

@@ -0,0 +1 @@
+[10,11,12,13,14,15]

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Functions/fn_boolean.txt

@@ -5,4 +5,5 @@ true
 true
 true
 true
+true
 true

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Object/q06_object.txt

@@ -1 +1 @@
-{"a":[1,2,3],"b":2}
+{"id":404,"name":"Stanco Grease Pot","price":6.49,"weight":3.8,"uses":["Grease storage","Backpacking pot"]}

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Object/q19_object.txt

@@ -0,0 +1 @@
+{"Sunday":1,"Monday":2,"Tuesday":3,"Wednesday":4,"Thursday":5,"Friday":6,"Saturday":7}

vxquery-xtest/src/test/resources/ExpectedTestResults/Json/xml_in_json/xml_in_json.txt

@@ -0,0 +1,3 @@
+{"element":<mercury>Hg</mercury>,"atomic value":"1896-01-24","several dates":["1066-10-14","1935-01-11","1989-11-09"]}
+["1066-10-14",<mercury>Hg</mercury>,"ice cream"]
+<x>10</x>

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/Navigation/q01_array_navigation.xq

@@ -17,5 +17,5 @@
 
 (: Json Array Navigation Query :)
 (: Just navigate through an array :)
-    let $x:=[2,5]
-    return $x(1)
+let $wd := ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
+return $wd(1)

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/Navigation/q02_array_navigation.xq

@@ -17,6 +17,8 @@
 
 (: Json Array Navigation Query :)
 (: Just navigate through an array :)
-    let $x:=[1,[2]]
-    return $x(2)(1)
-
+let $x := [
+    [ "mercury", "venus", "earth", "mars" ],
+    [ "monday", "tuesday", "wednesday", "thursday" ]
+]
+return $x(2)(2)

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/Navigation/q08_array_navigation.xq

@@ -0,0 +1,23 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: Json Array Navigation Query :)
+let $x := [
+    [ "mercury", "venus", "earth", "mars" ],
+    [ "monday", "tuesday", "wednesday", "thursday" ]
+]
+return $x(1)

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/q03_array.xq

@@ -17,4 +17,8 @@
 
 (: Json Array Query :)
 (: Just parse an array with nested arrays :)
-    [[1,2],[2,3]]
+[
+    [1, 2, 3],
+    [4, 5, 6],
+    [7, 8, 9]
+]

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/q05_array.xq

@@ -0,0 +1,28 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: Json Array Query :)
+(: Parse an array with strings:)
+[
+    "Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday"
+]

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Array/q06_array.xq

@@ -0,0 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: Json Array Query :)
+(: Parse an array with XQuery expressions:)
+[ 10 to 15 ]

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_boolean.xq

@@ -16,7 +16,5 @@
    under the License. :)
 
 (: JSONiq fn:boolean :)
-(
-    fn:boolean(null), fn:boolean({}), fn:boolean({"foo": 3, "bar":4}), fn:boolean({"foo": 3}), fn:boolean([]),
-    fn:boolean([1]), fn:boolean([1, 2]), fn:boolean(( [1], null ))
-)
+fn:boolean(jn:null()), fn:boolean({}), fn:boolean({ "foo": false() }), fn:boolean({"foo": 3, "bar":4}), fn:boolean({"foo": 3}), fn:boolean([]),
+fn:boolean([1]), fn:boolean([1, 2]), fn:boolean(( [1], jn:null()))

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_data4.xq

@@ -0,0 +1,19 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: JSONiq fn:data :)
+fn:data( {"foo" : 3, "bar" : 4 } )

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_data5.xq

@@ -0,0 +1,19 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: JSONiq fn:data :)
+fn:data( { } )

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_string1.xq

@@ -15,7 +15,7 @@
    specific language governing permissions and limitations
    under the License. :)
 
-(: JSONiq fn:data :)
+(: JSONiq fn:string :)
 (
     fn:string(null)
 )

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_string2.xq

@@ -15,7 +15,7 @@
    specific language governing permissions and limitations
    under the License. :)
 
-(: JSONiq fn:data :)
+(: JSONiq fn:string :)
 (
     fn:string({"foo" : 3})
 )

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_string3.xq

@@ -15,7 +15,7 @@
    specific language governing permissions and limitations
    under the License. :)
 
-(: JSONiq fn:data :)
+(: JSONiq fn:string :)
 (
     fn:string([1])
 )

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_string4.xq

@@ -0,0 +1,19 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: JSONiq fn:string :)
+fn:string( {"foo" : 3, "bar" : 4 } )

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/fn_string5.xq

@@ -0,0 +1,19 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: JSONiq fn:string :)
+fn:string( { } )

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Object/q06_object.xq

@@ -18,10 +18,9 @@
 (: Json Object Query :)
 (: Pasrse object with arrays :)
 {
-    "a": [
-        1,
-        2,
-        3
-    ],
-    "b": 2
+    "id" : 404,
+    "name" : "Stanco Grease Pot",
+    "price" : 6.49,
+    "weight" : 3.8,
+    "uses" : ["Grease storage","Backpacking pot"]
 }

vxquery-xtest/src/test/resources/Queries/XQuery/Json/Object/q19_object.xq

@@ -0,0 +1,29 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: Json Object Query :)
+(: Object Constructor with XQuery expressions :)
+{
+    "Sunday" : 1,
+    "Monday" : 1 + 1,
+    "Tuesday" : 3 * 1,
+    "Wednesday" : 8 div 2,
+    "Thursday" : 5,
+    "Friday" : count(for $i in 1 to 6 return $i),
+    "Saturday" : 10 - 3,
+    "NotADay" ?: ()
+}

vxquery-xtest/src/test/resources/Queries/XQuery/Json/xml_in_json/xml_in_json.xq

@@ -0,0 +1,27 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: XML in JSON :)
+{
+    "element" : <mercury>Hg</mercury>,
+    "atomic value" : xs:date("1896-01-24")
+    "several dates" : [ xs:date("1066-10-14"), xs:date("1935-01-11"), xs:date("1989-11-09") ]
+},
+[ xs:date("1066-10-14"), <mercury>Hg</mercury>, "ice cream" ],
+let $object := { "x" : 10, "y" : 12 }
+let $x := $object("x")
+return <x>{ $x }</x>

vxquery-xtest/src/test/resources/VXQueryCatalog.xml

@@ -51,6 +51,7 @@
 <!ENTITY JsonArrayNavigationQueries SYSTEM "cat/JsonArrayNavigationQueries.xml">
 <!ENTITY JsonParserQueries SYSTEM "cat/JsonParserQueries.xml">
 <!ENTITY LibrariesInJSONiq SYSTEM "cat/LibrariesInJSONiq.xml">
+<!ENTITY XMLInJSONQueries SYSTEM "cat/XMLInJSONQueries.xml">
 
 <!ENTITY TraceQuery SYSTEM "cat/TraceQuery.xml">
 
@@ -351,4 +352,16 @@
          &SerializationQueries;
       </test-group>
    </test-group>
+    <test-group name="XMLInJSONQueries" featureOwner="Riyafa Abdul Hameed">
+        <GroupInfo>
+            <title>XML in JSON</title>
+            <description>XML in JSON</description>
+        </GroupInfo>
+        <test-group name="XMLInJSONQueries" featureOwner="Riyafa Abdul Hameed">
+            <GroupInfo>
+                <title>Tests for XML in JSON</title>
+            </GroupInfo>
+            &XMLInJSONQueries;
+        </test-group>
+    </test-group>
 </test-suite>

vxquery-xtest/src/test/resources/cat/FunctionsInJSONiq.xml

@@ -40,6 +40,16 @@
         <query name="fn_data3" date="2016-06-17"/>
         <expected-error>JNTY0004</expected-error>
     </test-case>
+    <test-case name="functions-in-jsoniq-fn_data" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+        <description>Query for fn:data for JSON objects, arrays and null</description>
+        <query name="fn_data4" date="2016-08-21"/>
+        <expected-error>JNTY0004</expected-error>
+    </test-case>
+    <test-case name="functions-in-jsoniq-fn_data" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+        <description>Query for fn:data for JSON objects, arrays and null</description>
+        <query name="fn_data5" date="2016-08-21"/>
+        <expected-error>JNTY0004</expected-error>
+    </test-case>
     <test-case name="functions-in-jsoniq-fn_string" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
         <description>Query for fn:string for JSON null</description>
         <query name="fn_string1" date="2016-06-17"/>
@@ -56,6 +66,16 @@
         <query name="fn_string3" date="2016-06-17"/>
         <expected-error>JNTY0024</expected-error>
     </test-case>
+    <test-case name="functions-in-jsoniq-fn_data" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+        <description>Query for fn:string for JSON arrays</description>
+        <query name="fn_string4" date="2016-08-21"/>
+        <expected-error>JNTY0024</expected-error>
+    </test-case>
+    <test-case name="functions-in-jsoniq-fn_data" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+        <description>Query for fn:string for JSON arrays</description>
+        <query name="fn_string5" date="2016-08-21"/>
+        <expected-error>JNTY0024</expected-error>
+    </test-case>
     <test-case name="functions-in-jsoniq-fn_data" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
         <description>Query for cast for JSON null</description>
         <query name="cast" date="2016-06-23"/>