Bug 566629: Make XSLT and XPath code use the correct casing for name() function for (X)HTML elements. r=hsivonen a=blocker

This commit is contained in:
Jonas Sicking 2010-10-07 09:41:03 -07:00
parent 466c50688d
commit 0a727bd180
4 changed files with 149 additions and 1 deletions

View File

@ -473,7 +473,8 @@ txXPathNodeUtils::getNodeName(const txXPathNode& aNode, nsAString& aName)
nodeInfo->GetQualifiedName(aName);
// Check for html
if (aNode.Content()->IsHTML()) {
if (aNode.Content()->IsHTML() &&
aNode.Content()->IsInHTMLDocument()) {
ToUpperCase(aName);
}
return;

View File

@ -52,6 +52,8 @@ _TEST_FILES = test_bug319374.xhtml \
test_bug511487.html \
test_bug551412.html \
test_bug551654.html \
test_bug566629.html \
test_bug566629.xhtml \
$(NULL)
libs:: $(_TEST_FILES)

View File

@ -0,0 +1,71 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=566629
-->
<head>
<title>Test for Bug 566629</title>
<script type="text/javascript" src="/MochiKit/packed.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=566629">Mozilla Bug 566629</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 566629 **/
var xsltdoc = new DOMParser().parseFromString(
'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\
xmlns:xhtml="http://www.w3.org/1999/xhtml">\
<xsl:template match="/">\
<xsl:value-of select="count(//body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="count(//xhtml:body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="count(//xsl:body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="name(//body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="local-name(//body)"/>\
</xsl:template>\
</xsl:stylesheet>',
"text/xml");
var processor = new XSLTProcessor;
processor.importStylesheet(xsltdoc);
var result = processor.transformToFragment(document, document);
ok(result instanceof DocumentFragment, "returned a docfragment");
is(result.firstChild.nodeValue, "1,1,0,BODY,body",
"correct treatment of HTML elements in XSLT");
is(document.evaluate("count(//body)", document, null, XPathResult.ANY_TYPE, null).numberValue,
1, "namespace-less node-test");
is(document.evaluate("count(//a:body)", document,
function() { return "http://www.w3.org/1999/xhtml" },
XPathResult.ANY_TYPE, null).numberValue,
1, "with-namespace node-test");
is(document.evaluate("count(//a:body)", document,
function() { return "foo" },
XPathResult.ANY_TYPE, null).numberValue,
0, "wrong-namespace node-test");
is(document.evaluate("//bODy", document, null, XPathResult.ANY_TYPE, null).iterateNext(),
document.body, "case insensitive matching");
is(document.evaluate("count(//a:bODy)", document,
function() { return "http://www.w3.org/1999/xhtml" },
XPathResult.ANY_TYPE, null).numberValue,
0, "with-namespace but wrong casing node-test");
is(document.evaluate("name(//body)", document, null, XPathResult.ANY_TYPE, null).stringValue,
"BODY", "uppercase name() function");
is(document.evaluate("local-name(//body)", document, null, XPathResult.ANY_TYPE, null).stringValue,
"body", "lowercase local-name() function");
</script>
</pre>
</body>
</html>

View File

@ -0,0 +1,74 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=566629
-->
<head>
<title>Test for Bug 566629</title>
<script type="text/javascript" src="/MochiKit/packed.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=566629">Mozilla Bug 566629</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
<![CDATA[
/** Test for Bug 566629 **/
var xsltdoc = new DOMParser().parseFromString(
'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\
xmlns:xhtml="http://www.w3.org/1999/xhtml">\
<xsl:template match="/">\
<xsl:value-of select="count(//body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="count(//xhtml:body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="count(//xsl:body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="name(//xhtml:body)"/>\
<xsl:text>,</xsl:text>\
<xsl:value-of select="local-name(//xhtml:body)"/>\
</xsl:template>\
</xsl:stylesheet>',
"text/xml");
var processor = new XSLTProcessor;
processor.importStylesheet(xsltdoc);
var result = processor.transformToFragment(document, document);
ok(result instanceof DocumentFragment, "returned a docfragment");
is(result.firstChild.nodeValue, "0,1,0,body,body",
"correct treatment of HTML elements in XSLT");
is(document.evaluate("count(//body)", document, null, XPathResult.ANY_TYPE, null).numberValue,
0, "namespace-less node-test");
is(document.evaluate("count(//a:body)", document,
function() { return "http://www.w3.org/1999/xhtml" },
XPathResult.ANY_TYPE, null).numberValue,
1, "with-namespace node-test");
is(document.evaluate("count(//a:body)", document,
function() { return "foo" },
XPathResult.ANY_TYPE, null).numberValue,
0, "wrong-namespace node-test");
is(document.evaluate("count(//a:bODy)", document,
function() { return "http://www.w3.org/1999/xhtml" },
XPathResult.ANY_TYPE, null).numberValue,
0, "with-namespace wrong-casing node-test");
is(document.evaluate("count(//bODy)", document, null, XPathResult.ANY_TYPE, null).numberValue,
0, "without-namespace wrong-casing node-test");
is(document.evaluate("name(//a:body)", document,
function() { return "http://www.w3.org/1999/xhtml" },
XPathResult.ANY_TYPE, null).stringValue,
"body", "name()");
is(document.evaluate("local-name(//a:body)", document,
function() { return "http://www.w3.org/1999/xhtml" },
XPathResult.ANY_TYPE, null).stringValue,
"body", "local-name()");
]]>
</script>
</pre>
</body>
</html>