Namespace change for JSON (spec bug 28174)
authorMichael Kay <mike@saxonica.com>
Tue, 23 Jun 2015 17:29:55 +0100
changeset 990 32ad9ac3c0e5
parent 989 4f9cdb59e50e
child 991 92f2ab138d68
Namespace change for JSON (spec bug 28174)
tests/fn/json-to-xml/_json-to-xml-test-set.xml
tests/fn/json-to-xml/json-to-xml-A.xsl
tests/fn/json-to-xml/json-to-xml-typed.xsl
tests/fn/json-to-xml/schema-for-json.xsd
tests/fn/xml-to-json/_xml-to-json-test-set.xml
tests/fn/xml-to-json/xml-to-json-A.xsl
tests/fn/xml-to-json/xml-to-json-B.xsl
tests/misc/error/_error-test-set.xml
tests/misc/error/error-3255a.xsl
tests/misc/error/error-3265a.xsl
--- a/tests/fn/json-to-xml/_json-to-xml-test-set.xml	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/fn/json-to-xml/_json-to-xml-test-set.xml	Tue Jun 23 17:29:55 2015 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <test-set xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://www.w3.org/2012/10/xslt-test-catalog" xmlns:j="http://www.w3.org/2013/XSL/json"
+    xmlns="http://www.w3.org/2012/10/xslt-test-catalog" xmlns:j="http://www.w3.org/2005/xpath-functions"
     name="json-to-xml">
     <description>json-to-xml() function</description>
 
@@ -17,8 +17,8 @@
     <!-- It would be helpful to assert schema-awareness on the stylesheet in a shared environment
     Sadly 'dependencies' aren't appropriate and just adding 'schema' doesn't mean the same thing -->
     <environment name="json-to-xml-typed">
-        <!--<namespace prefix="j" uri="http://www.w3.org/2013/XSL/json"/>-->
-        <!-- <schema uri="http://www.w3.org/2013/XSL/json" file="schema-for-json.xsd">
+        <!--<namespace prefix="j" uri="http://www.w3.org/2005/xpath-functions"/>-->
+        <!-- <schema uri="http://www.w3.org/2005/xpath-functions" file="schema-for-json.xsd">
             <description>JSON XML representation schema</description>
             <created by="John Lumley" on="2013-10-03"/>
         </schema>-->
@@ -36,114 +36,124 @@
     <test-case name="json-to-xml-001">
         <description>Empty object as document-node</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-001"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:map xmlns:j="http://www.w3.org/2013/XSL/json"/>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:map xmlns:j="http://www.w3.org/2005/xpath-functions"/>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-002">
         <description>Empty object</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-002"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:map xmlns:j="http://www.w3.org/2013/XSL/json"/>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:map xmlns:j="http://www.w3.org/2005/xpath-functions"/>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-003">
         <description>Empty array as document-node</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-003"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:array xmlns:j="http://www.w3.org/2013/XSL/json"/>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:array xmlns:j="http://www.w3.org/2005/xpath-functions"/>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-004">
         <description>Empty array</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-004"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:array xmlns:j="http://www.w3.org/2013/XSL/json"/>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:array xmlns:j="http://www.w3.org/2005/xpath-functions"/>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-005">
         <description>Array Number</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-005"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:array xmlns:j="http://www.w3.org/2013/XSL/json"><j:number>1</j:number></j:array>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:array xmlns:j="http://www.w3.org/2005/xpath-functions"><j:number>1</j:number></j:array>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-006">
         <description>Array String</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-006"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:array xmlns:j="http://www.w3.org/2013/XSL/json"><j:string>a</j:string></j:array>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:array xmlns:j="http://www.w3.org/2005/xpath-functions"><j:string>a</j:string></j:array>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-007">
         <description>Array True</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-007"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:array xmlns:j="http://www.w3.org/2013/XSL/json"><j:boolean>true</j:boolean></j:array>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:array xmlns:j="http://www.w3.org/2005/xpath-functions"><j:boolean>true</j:boolean></j:array>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-008">
         <description>Array False</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-008"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:array xmlns:j="http://www.w3.org/2013/XSL/json"><j:boolean>false</j:boolean></j:array>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:array xmlns:j="http://www.w3.org/2005/xpath-functions"><j:boolean>false</j:boolean></j:array>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-009">
         <description>Array Null</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-009"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:array xmlns:j="http://www.w3.org/2013/XSL/json"><j:null/></j:array>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:array xmlns:j="http://www.w3.org/2005/xpath-functions"><j:null/></j:array>]]></assert-xml>
         </result>
     </test-case>
 
     <test-case name="json-to-xml-010">
         <description>Larger JSON input</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-010"/>
@@ -159,6 +169,7 @@
     <test-case name="json-to-xml-011">
         <description>Larger JSON input</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-011"/>
@@ -174,12 +185,13 @@
     <test-case name="json-to-xml-012">
         <description>Escaped text</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-012"/>
         </test>
         <result>
-            <assert-xml><![CDATA[<j:map xmlns:j="http://www.w3.org/2013/XSL/json"><j:string key="key">Data with " within it</j:string></j:map>]]></assert-xml>
+            <assert-xml ignore-prefixes="true"><![CDATA[<j:map xmlns:j="http://www.w3.org/2005/xpath-functions"><j:string key="key">Data with " within it</j:string></j:map>]]></assert-xml>
         </result>
     </test-case>
 
@@ -188,13 +200,14 @@
     <test-case name="json-to-xml-escape-001">
         <description>Escaped quote string</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-escape-001"/>
         </test>
         <result>
             <all-of>
-                <assert>* instance of element(Q{http://www.w3.org/2013/XSL/json}string)</assert>
+                <assert>* instance of element(Q{http://www.w3.org/2005/xpath-functions}string)</assert>
                 <assert>. = 'Data with " within it'</assert>
                 <any-of>
                     <assert>empty(*/@escaped)</assert>
@@ -210,13 +223,14 @@
     <test-case name="json-to-xml-escape-002">
         <description>Escaped quote and key string</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-escape-002"/>
         </test>
         <result>
             <all-of>
-                <assert>* instance of element(Q{http://www.w3.org/2013/XSL/json}string)</assert>
+                <assert>* instance of element(Q{http://www.w3.org/2005/xpath-functions}string)</assert>
                 <assert>. = 'Data with " within it'</assert>
                 <assert>*/@key eq 'Key " with quote'</assert>
                 <any-of>
@@ -233,13 +247,14 @@
     <test-case name="json-to-xml-escape-003">
         <description>Escaped quote string - remaining escaped</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-escape-003"/>
         </test>
         <result>
             <all-of>
-                <assert>* instance of element(Q{http://www.w3.org/2013/XSL/json}string)</assert>
+                <assert>* instance of element(Q{http://www.w3.org/2005/xpath-functions}string)</assert>
                 <assert>. = 'Data with \" within it'</assert>
                 <assert>*/@escaped eq "true"</assert>
                 <any-of>
@@ -252,13 +267,14 @@
     <test-case name="json-to-xml-escape-004">
         <description>Escaped quote string and key - remaining escaped</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-A"/>
         <test>
             <initial-template name="json-to-xml-escape-004"/>
         </test>
         <result>
             <all-of>
-                <assert>* instance of element(Q{http://www.w3.org/2013/XSL/json}string)</assert>
+                <assert>* instance of element(Q{http://www.w3.org/2005/xpath-functions}string)</assert>
                 <assert>. = 'Data with \" within it'</assert>
                 <assert>*/@key eq 'Key \" with quote'</assert>
                 <assert>*/@escaped eq "true"</assert>
@@ -276,6 +292,7 @@
     <test-case name="json-to-xml-typed-001">
         <description>Basic type</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware"/>
@@ -291,6 +308,7 @@
     <test-case name="json-to-xml-typed-002">
         <description>Basic parsing typed</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware"/>
@@ -306,6 +324,7 @@
     <test-case name="json-to-xml-typed-003">
         <description>Array Number typed</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware"/>
@@ -321,6 +340,7 @@
     <test-case name="json-to-xml-typed-004">
         <description>Array String typed</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware"/>
@@ -336,6 +356,7 @@
     <test-case name="json-to-xml-typed-005">
         <description>Array True typed</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware"/>
@@ -351,6 +372,7 @@
     <test-case name="json-to-xml-typed-006">
         <description>Array False typed</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware"/>
@@ -366,6 +388,7 @@
     <test-case name="json-to-xml-typed-007">
         <description>Array Null typed</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware"/>
@@ -383,6 +406,7 @@
         <description>Error when requesting type annotation on a non-schema aware
             processor</description>
         <created by="John Lumley" on="2013-10-08"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-typed"/>
         <dependencies>
             <feature value="schema_aware" satisfied="false"/>
@@ -401,6 +425,7 @@
     <test-case name="json-to-xml-error-001">
         <description>Empty string</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-001"/>
@@ -413,6 +438,7 @@
     <test-case name="json-to-xml-error-002">
         <description>Unknown token</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-002"/>
@@ -425,6 +451,7 @@
     <test-case name="json-to-xml-error-003">
         <description>Unknown token</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-003"/>
@@ -437,6 +464,7 @@
     <test-case name="json-to-xml-error-004">
         <description>Extra token</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-004"/>
@@ -449,6 +477,7 @@
     <test-case name="json-to-xml-error-005">
         <description>Non-string key</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-005"/>
@@ -461,6 +490,7 @@
     <test-case name="json-to-xml-error-006">
         <description>Non-string key</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-006"/>
@@ -473,6 +503,7 @@
     <test-case name="json-to-xml-error-007">
         <description>Missing colon after key</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-007"/>
@@ -485,6 +516,7 @@
     <test-case name="json-to-xml-error-008">
         <description>Extra token after map value</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-008"/>
@@ -497,6 +529,7 @@
     <test-case name="json-to-xml-error-009">
         <description>Extra token after array value</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-009"/>
@@ -509,6 +542,7 @@
     <test-case name="json-to-xml-error-010">
         <description>Leading + on number</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-010"/>
@@ -521,6 +555,7 @@
     <test-case name="json-to-xml-error-011">
         <description>Redundant leading 0 on number</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-011"/>
@@ -533,6 +568,7 @@
     <test-case name="json-to-xml-error-012">
         <description>Hex number</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-012"/>
@@ -545,6 +581,7 @@
     <test-case name="json-to-xml-error-013">
         <description>Trailing backslash</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-013"/>
@@ -557,6 +594,7 @@
     <test-case name="json-to-xml-error-014">
         <description>Short unicode</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-014"/>
@@ -571,6 +609,7 @@
         <created by="John Lumley" on="2013-10-01"/>
         <modified by="John Lumley" on="2014-07-22"
             change="changed from XTDE3240 to correct error code"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-015"/>
@@ -583,6 +622,7 @@
     <test-case name="json-to-xml-error-016">
         <description>Trailing comma in object</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-016"/>
@@ -597,6 +637,7 @@
         <created by="John Lumley" on="2013-10-01"/>
         <modified by="John Lumley" on="2014-07-22"
             change="option 'spec':'liberal' altered to 'liberal':true()"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-017"/>
@@ -612,6 +653,7 @@
     <test-case name="json-to-xml-error-018">
         <description>Trailing comma in array</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-018"/>
@@ -626,6 +668,7 @@
         <created by="John Lumley" on="2013-10-01"/>
         <modified by="John Lumley" on="2014-07-22"
             change="option 'spec':'liberal' altered to 'liberal':true()"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-019"/>
@@ -642,6 +685,7 @@
         <description>Liberal option error</description>
         <created by="John Lumley" on="2013-10-01"/>
         <modified by="John Lumley" on="2014-07-22" change="option 'spec' altered to 'liberal'"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-020"/>
@@ -655,6 +699,7 @@
         <description>Liberal option error</description>
         <created by="John Lumley" on="2013-10-01"/>
         <modified by="John Lumley" on="2014-07-22" change="option 'spec' altered to 'liberal'"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-021"/>
@@ -667,6 +712,7 @@
     <test-case name="json-to-xml-error-022">
         <description>Validate option error</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-022"/>
@@ -679,6 +725,7 @@
     <test-case name="json-to-xml-error-023">
         <description>Validate option error</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-023"/>
@@ -691,6 +738,7 @@
     <test-case name="json-to-xml-error-024">
         <description>Validate option error</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-024"/>
@@ -703,6 +751,7 @@
     <test-case name="json-to-xml-error-025">
         <description>Unescape option error</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-025"/>
@@ -715,6 +764,7 @@
     <test-case name="json-to-xml-error-026">
         <description>Unescape option error</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-026"/>
@@ -727,6 +777,7 @@
     <test-case name="json-to-xml-error-027">
         <description>Unescape option error</description>
         <created by="John Lumley" on="2013-10-01"/>
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-027"/>
@@ -740,6 +791,7 @@
         <description>Fallback option not function </description>
         <created by="John Lumley" on="2013-10-01"/>
         <modified by="Abel Braaksma" on="2014-10-21" change="':=' for maps is replaced by ':'" />
+        <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
         <environment ref="json-to-xml-E"/>
         <test>
             <initial-template name="json-to-xml-error-028"/>
--- a/tests/fn/json-to-xml/json-to-xml-A.xsl	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/fn/json-to-xml/json-to-xml-A.xsl	Tue Jun 23 17:29:55 2015 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:j="http://www.w3.org/2013/XSL/json">
+    xmlns:j="http://www.w3.org/2005/xpath-functions">
     <xsl:param name="options.escape" select="map{'unescape':false()}"/>
     <xsl:param name="options.validate" select="map{'validate':true()}"/>
 
@@ -46,7 +46,7 @@
         <xsl:variable name="expected-results">
             <all-of>
                 <assert-count>1</assert-count>
-                <assert-type>element(Q{http://www.w3.org/2013/XSL/json}map)</assert-type>
+                <assert-type>element(Q{http://www.w3.org/2005/xpath-functions}map)</assert-type>
                 <assert>count($result/*) eq 0</assert>
             </all-of>
         </xsl:variable>
@@ -75,7 +75,7 @@
         <xsl:variable name="expected-results">
             <all-of>
                 <assert-count>1</assert-count>
-                <assert-type>element(Q{http://www.w3.org/2013/XSL/json}array)</assert-type>
+                <assert-type>element(Q{http://www.w3.org/2005/xpath-functions}array)</assert-type>
                 <assert>count($result/*) eq 0</assert>
             </all-of>
         </xsl:variable>
@@ -90,7 +90,7 @@
         <xsl:variable name="expected-results">
             <all-of>
                 <assert-count>1</assert-count>
-                <assert-type>element(Q{http://www.w3.org/2013/XSL/json}array)</assert-type>
+                <assert-type>element(Q{http://www.w3.org/2005/xpath-functions}array)</assert-type>
                 <assert>count($result/*) eq 1</assert>
                 <assert>$result/*[1] instance of element(j:number,xs:untyped)</assert>
                 <assert>xs:double($result/*[1]) eq 1</assert>
@@ -210,7 +210,7 @@
             <result>
                 <all-of>
                     <!--<assert-count>1</assert-count>
-                    <assert-type>element(Q{http://www.w3.org/2013/XSL/json}string)</assert-type>
+                    <assert-type>element(Q{http://www.w3.org/2005/xpath-functions}string)</assert-type>
                     <assert-string-value>Data with " within it</assert-string-value>
                     <any-of>
                         <assert>empty($result/@escaped)</assert>
@@ -236,7 +236,7 @@
             <result>
                 <all-of>
                     <!--<assert-count>1</assert-count>
-                    <assert-type>element(Q{http://www.w3.org/2013/XSL/json}string)</assert-type>
+                    <assert-type>element(Q{http://www.w3.org/2005/xpath-functions}string)</assert-type>
                     <assert-string-value>Data with " within it</assert-string-value>
                     <assert>$result/@key eq 'Key " with quote'</assert>
                     <any-of>
@@ -263,7 +263,7 @@
             <result>
                 <!-- <all-of>
                     <assert-count>1</assert-count>
-                    <assert-type>element(Q{http://www.w3.org/2013/XSL/json}string)</assert-type>
+                    <assert-type>element(Q{http://www.w3.org/2005/xpath-functions}string)</assert-type>
                     <assert-string-value>Data with \" within it</assert-string-value>
                     <assert>$result/@escaped eq "true"</assert>
                     <any-of>
@@ -286,7 +286,7 @@
             <result>
                 <!--<all-of>
                     <assert-count>1</assert-count>
-                    <assert-type>element(Q{http://www.w3.org/2013/XSL/json}string)</assert-type>
+                    <assert-type>element(Q{http://www.w3.org/2005/xpath-functions}string)</assert-type>
                     <assert-string-value>Data with \" within it</assert-string-value>
                     <assert>$result/@key eq 'Key \" with quote'</assert>
                     <assert>$result/@escaped eq "true"</assert>
--- a/tests/fn/json-to-xml/json-to-xml-typed.xsl	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/fn/json-to-xml/json-to-xml-typed.xsl	Tue Jun 23 17:29:55 2015 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:j="http://www.w3.org/2013/XSL/json">
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:j="http://www.w3.org/2005/xpath-functions">
 
     <!-- Tests for schema aware typing of nodes from json-to-xml()
     Note that these *only* check type and little more -
@@ -17,9 +17,9 @@
     <xsl:param name="s1.null" select="'[null]'"/>
 
 
-    <!--<xsl:import-schema namespace="http://www.w3.org/2013/XSL/json"
+    <!--<xsl:import-schema namespace="http://www.w3.org/2005/xpath-functions"
         schema-location="http://www.w3.org/TR/2013/WD-xslt-30-20131212/schema-for-json.xsd"/>-->
-    <xsl:import-schema namespace="http://www.w3.org/2013/XSL/json"
+    <xsl:import-schema namespace="http://www.w3.org/2005/xpath-functions"
         schema-location="schema-for-json.xsd"/>
 
     <!-- Note that whilst it would be cleaner perhaps to do the type checking in the assertions
--- a/tests/fn/json-to-xml/schema-for-json.xsd	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/fn/json-to-xml/schema-for-json.xsd	Tue Jun 23 17:29:55 2015 +0100
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
-    targetNamespace="http://www.w3.org/2013/XSL/json"
-    xmlns:j="http://www.w3.org/2013/XSL/json">
+    targetNamespace="http://www.w3.org/2005/xpath-functions"
+    xmlns:j="http://www.w3.org/2005/xpath-functions">
     
     <!-- 
      * This is a schema for the XML representation of JSON used as the target for the
--- a/tests/fn/xml-to-json/_xml-to-json-test-set.xml	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/fn/xml-to-json/_xml-to-json-test-set.xml	Tue Jun 23 17:29:55 2015 +0100
@@ -18,6 +18,7 @@
       <description>Test of xml-to-json: simple "null" content</description>
       <keywords>simple-content fn:xml-to-json fn:json-to-xml json-null</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t001"/>
@@ -31,6 +32,7 @@
       <description>Test of xml-to-json: simple "true" content</description>
       <keywords>simple-content fn:xml-to-json fn:json-to-xml json-boolean</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t002"/>
@@ -44,6 +46,7 @@
       <description>Test of xml-to-json: simple "false" content</description>
       <keywords>simple-content fn:xml-to-json fn:json-to-xml json-boolean</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t003"/>
@@ -57,6 +60,7 @@
       <description>Test of xml-to-json: simple numeric content</description>
       <keywords>simple-content json-numeric fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t004"/>
@@ -70,6 +74,7 @@
       <description>Test of xml-to-json: simple string content</description>
       <keywords>simple-content json-string fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t005"/>
@@ -83,6 +88,7 @@
       <description>Test of xml-to-json: empty string content</description>
       <keywords>json-string fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t006"/>
@@ -96,6 +102,7 @@
       <description>Test of xml-to-json: empty array</description>
       <keywords>json-array fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t007"/>
@@ -109,6 +116,7 @@
       <description>Test of xml-to-json: singleton array</description>
       <keywords>json-array fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t008"/>
@@ -122,6 +130,7 @@
       <description>Test of xml-to-json: two-member array</description>
       <keywords>json-array json-boolean fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t009"/>
@@ -135,6 +144,7 @@
       <description>Test of xml-to-json: 5-member array</description>
       <keywords>json-array json-string fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t010"/>
@@ -148,6 +158,7 @@
       <description>Test of xml-to-json: empty map</description>
       <keywords>json-map fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t011"/>
@@ -161,6 +172,7 @@
       <description>Test of xml-to-json: single-entry map</description>
       <keywords>json-map fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t012"/>
@@ -174,6 +186,7 @@
       <description>Test of xml-to-json: five-entry map</description>
       <keywords>json-map fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t013"/>
@@ -188,6 +201,7 @@
       <description>Test of xml-to-json: complex map</description>
       <keywords>json-map complex-content fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-A"/>
       <test>
          <initial-template name="t014"/>
@@ -202,6 +216,7 @@
       <description>Test of xml-to-json: simple "null" content, indented</description>
       <keywords>simple-content json-null json-indented fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t001"/>
@@ -216,6 +231,7 @@
       <description>Test of xml-to-json: simple "true" content, indented</description>
       <keywords>simple-content json-boolean json-indented fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t002"/>
@@ -230,6 +246,7 @@
       <description>Test of xml-to-json: simple "false" content, indented</description>
       <keywords>simple-content json-boolean json-indented fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t003"/>
@@ -244,6 +261,7 @@
       <description>Test of xml-to-json: simple numeric content, indented</description>
       <keywords>simple-content json-numeric json-indented fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t004"/>
@@ -258,6 +276,7 @@
       <description>Test of xml-to-json: simple string content, indented</description>
       <keywords>json-indented simple-content json-string fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t005"/>
@@ -272,6 +291,7 @@
       <description>Test of xml-to-json: empty string content, indented</description>
       <keywords>json-string json-indented simple-content fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t006"/>
@@ -286,6 +306,7 @@
       <description>Test of xml-to-json: empty array, indented</description>
       <keywords>json-array simple-content json-indented fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t007"/>
@@ -300,6 +321,7 @@
       <description>Test of xml-to-json: singleton array, indented</description>
       <keywords>json-indented simple-content json-array fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t008"/>
@@ -314,6 +336,7 @@
       <description>Test of xml-to-json: two-member array, indented</description>
       <keywords>simple-content json-array json-boolean json-indented fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t009"/>
@@ -328,6 +351,7 @@
       <description>Test of xml-to-json: 5-member array, indented</description>
       <keywords>json-array json-string json-indented fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t010"/>
@@ -342,6 +366,7 @@
       <description>Test of xml-to-json: empty map, indented</description>
       <keywords>json-map json-indented fn:xml-to-json fn:json-to-xml simple-content</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t011"/>
@@ -356,6 +381,7 @@
       <description>Test of xml-to-json: single-entry map, indented</description>
       <keywords>json-map json-indented simple-content fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t012"/>
@@ -370,6 +396,7 @@
       <description>Test of xml-to-json: five-entry map, indented</description>
       <keywords>simple-content json-indented json-map fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t013"/>
@@ -385,6 +412,7 @@
       <description>Test of xml-to-json: complex map, indented</description>
       <keywords>json-map json-indented complex-content fn:xml-to-json fn:json-to-xml</keywords>
       <created by="Michael Kay" on="2014-07-19"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <environment ref="xml-to-json-B"/>
       <test>
          <initial-template name="t014"/>
--- a/tests/fn/xml-to-json/xml-to-json-A.xsl	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/fn/xml-to-json/xml-to-json-A.xsl	Tue Jun 23 17:29:55 2015 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:j="http://www.w3.org/2013/XSL/json"
+    xmlns:j="http://www.w3.org/2005/xpath-functions"
     exclude-result-prefixes="xs j"
     version="3.0">
     
--- a/tests/fn/xml-to-json/xml-to-json-B.xsl	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/fn/xml-to-json/xml-to-json-B.xsl	Tue Jun 23 17:29:55 2015 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:j="http://www.w3.org/2013/XSL/json"
+    xmlns:j="http://www.w3.org/2005/xpath-functions"
     exclude-result-prefixes="xs j"
     version="3.0">
     
--- a/tests/misc/error/_error-test-set.xml	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/misc/error/_error-test-set.xml	Tue Jun 23 17:29:55 2015 +0100
@@ -10089,6 +10089,7 @@
                      and whose value is not a permitted value for that key.</description>
       <created by="Michael Kay" on="2014-08-25"/>
       <modified by="Abel Braaksma" on="2015-04-07" change="Fixed typo, as='element' into as='element()'"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <dependencies>
          <spec value="XSLT30+"/>
       </dependencies>
@@ -10126,6 +10127,7 @@
                   JSON.</description>
       <created by="Michael Kay" on="2014-08-25"/>
       <modified by="Abel Braaksma" on="2015-04-07" change="Fixed typo, as='element' into as='element()'"/>
+      <modified by="Michael Kay" on="2015-06-23" change="Namespace change resulting from bug 28174"/>
       <dependencies>
          <spec value="XSLT30+"/>
       </dependencies>
--- a/tests/misc/error/error-3255a.xsl	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/misc/error/error-3255a.xsl	Tue Jun 23 17:29:55 2015 +0100
@@ -7,7 +7,7 @@
                   and whose value is not a permitted value for that key.-->
                   
    <xsl:variable name="x" as="element()">
-     <null xmlns="http://www.w3.org/2013/XSL/json"/>
+     <null xmlns="http://www.w3.org/2005/xpath-functions"/>
    </xsl:variable>               
                   
    <xsl:template name="main">
--- a/tests/misc/error/error-3265a.xsl	Thu Jun 18 11:29:29 2015 +0100
+++ b/tests/misc/error/error-3265a.xsl	Tue Jun 23 17:29:55 2015 +0100
@@ -6,7 +6,7 @@
                   JSON.-->
                   
    <xsl:variable name="x" as="element()">
-     <null xmlns="http://www.w3.org/2013/XSL/json">0</null>
+     <null xmlns="http://www.w3.org/2005/xpath-functions">0</null>
    </xsl:variable>                  
                   
    <xsl:template name="main">