Merge branch 'danielwhite/xmerl-xpath-resolve-context-namespaces/OTP-11461' into maint

* danielwhite/xmerl-xpath-resolve-context-namespaces/OTP-11461:
  xmerl: Use context namespace declarations to resolve prefix node tests
  xmerl: Look up unknown prefixes in xmlContext when matching attributes
  xmerl: Add tests for XPath queries that resolve the context namespace

3 files changed, 40 insertions, 3 deletions

diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index e21355f877..8432e66a97 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -42,7 +42,7 @@
 %%----------------------------------------------------------------------
 all() -> 
     [{group, cpd_tests}, xpath_text1, xpath_main,
-     xpath_abbreviated_syntax, xpath_functions,
+     xpath_abbreviated_syntax, xpath_functions, xpath_namespaces,
      {group, misc}, {group, eventp_tests},
      {group, ticket_tests}, {group, app_test},
      {group, appup_test}].
@@ -205,6 +205,11 @@ xpath_functions(Config) ->
     ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
     ?line ok = xpath_abbrev:functions().
 
+xpath_namespaces(suite) -> [];
+xpath_namespaces(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    ?line ok = xpath_abbrev:namespaces().
+
 %%----------------------------------------------------------------------
 
 latin1_alias(suite) -> [];
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
index a5ae223d65..16090c3590 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    orderDate="1999-10-20">
-  <billTo country="US">
+  <billTo country="US" xsi:type="apo:USAddress">
     <name>Robert Smith</name>
     <street>8 Oak Avenue</street>
     <!-- etc. -->
@@ -10,7 +11,7 @@
       <zip>95819</zip>
   </billTo>
   <apo:comment>Hurry, my lawn is going wild!</apo:comment>
-  <shipTo country="US">
+  <shipTo country="US" xsi:type="apo:USAddress">
     <name>Alice Smith</name>
     <street>123 Maple Street</street>
     <!-- etc. -->
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
index 7b6f1e95b3..afd39b6598 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
@@ -8,6 +8,7 @@
 -module(xpath_abbrev).
 
 -export([test/0, check_node_set/2, ticket_6873/0, ticket_7496/0, functions/0]).
+-export([namespaces/0]).
 
 -include("test_server.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
@@ -264,3 +265,33 @@ functions() ->
 		    [city,city,comment]),
     ?line ok = Test(Doc2,"//*[starts-with(name(),'{http://www.example.com/PO1')]",
 		    ['apo:purchaseOrder','apo:comment']).
+
+
+namespaces() ->
+    {Doc,_} = xmerl_scan:file("purchaseOrder.xml", [{namespace_conformant, true}]),
+
+    %% Element name using regular namespace and context namespace declaration.
+    ?line [#xmlElement{nsinfo = {_, "purchaseOrder"}}] =
+        xmerl_xpath:string("/apo:purchaseOrder", Doc),
+    ?line [#xmlElement{nsinfo = {_, "purchaseOrder"}}] =
+        xmerl_xpath:string("/t:purchaseOrder", Doc, [{namespace, [{"t", "http://www.example.com/PO1"}]}]),
+
+    %% Wildcard element name using regular namespace and context namespace declaration.
+    ?line [#xmlElement{nsinfo = {_, "comment"}}] =
+        xmerl_xpath:string("./apo:*", Doc),
+    ?line [#xmlElement{nsinfo = {_, "comment"}}] =
+        xmerl_xpath:string("./t:*", Doc, [{namespace, [{"t", "http://www.example.com/PO1"}]}]),
+
+    %% Attribute name using regular namespace and context namespace declaration.
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@xsi:type", Doc),
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@t:type", Doc, [{namespace, [{"t", "http://www.w3.org/2001/XMLSchema-instance"}]}]),
+
+    %% Wildcard attribute name using regular namespace and context namespace declaration.
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@xsi:*", Doc),
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@t:*", Doc, [{namespace, [{"t", "http://www.w3.org/2001/XMLSchema-instance"}]}]),
+
+    ok.