mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix bug 352728, r+sr=peterv

This commit is contained in:
bzbarsky%mit.edu 2006-11-21 04:38:00 +00:00
Родитель f3f1033051
Коммит 8986aa6eaf
4 изменённых файлов: 333 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
content/base/src/nsDocument.cpp
Просмотреть файл

@ -2643,6 +2643,12 @@ nsDocument::CreateComment(const nsAString& aData, nsIDOMComment** aReturn)
{
*aReturn = nsnull;
// Make sure the substring "--" is not present in aData. Otherwise
// we'll create a document that can't be serialized.
if (FindInReadable(NS_LITERAL_STRING("--"), aData)) {
return NS_ERROR_DOM_INVALID_CHARACTER_ERR;
}
nsCOMPtr<nsIContent> comment;
nsresult rv = NS_NewCommentNode(getter_AddRefs(comment), mNodeInfoManager);
@ -2663,11 +2669,7 @@ nsDocument::CreateCDATASection(const nsAString& aData,
NS_ENSURE_ARG_POINTER(aReturn);
*aReturn = nsnull;
nsReadingIterator<PRUnichar> begin;
nsReadingIterator<PRUnichar> end;
aData.BeginReading(begin);
aData.EndReading(end);
if (FindInReadable(NS_LITERAL_STRING("]]>"),begin,end))
if (FindInReadable(NS_LITERAL_STRING("]]>"), aData))
return NS_ERROR_DOM_INVALID_CHARACTER_ERR;
nsCOMPtr<nsIContent> content;
@ -2694,6 +2696,10 @@ nsDocument::CreateProcessingInstruction(const nsAString& aTarget,
nsresult rv = nsContentUtils::CheckQName(aTarget, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
if (FindInReadable(NS_LITERAL_STRING("?>"), aData)) {
return NS_ERROR_DOM_INVALID_CHARACTER_ERR;
}
nsCOMPtr<nsIContent> content;
rv = NS_NewXMLProcessingInstruction(getter_AddRefs(content),
mNodeInfoManager, aTarget, aData);

2
testing/mochitest/tests/index.html
Просмотреть файл

@ -81,6 +81,8 @@ RunSet.runall = function() {
'test_bug345521.html',
'test_bug348497.html',
'test_bug351601.html',
'test_bug352728.html',
'test_bug352728.xhtml',
'test_bug355026.html',
'test_bug357509.html',
'test_bug358660.html',

125
testing/mochitest/tests/test_bug352728.html Normal file
Просмотреть файл

@ -0,0 +1,125 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=352728
-->
<head>
<title>Test for Bug 352728</title>
<script type="text/javascript" src="/MochiKit/MochiKit.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=352728">Mozilla Bug 352728</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 352728 **/
function checkTypes(aNode, aNodeType, aTypeArray)
{
for (var i = 0; i < aTypeArray.length; ++i) {
ok(aNode instanceof aTypeArray[i], aNodeType + " type test " + i,
aNodeType + " should be a " + aTypeArray[i]);
}
}
function checkInterfaces(aNode, aNodeType, aInterfaceArray)
{
for (var i = 0; i < aInterfaceArray.length; ++i) {
ok(aNode instanceof Components.interfaces[aInterfaceArray[i]],
aNodeType + " interface test " + i,
aNodeType + " should be a " + aInterfaceArray[i]);
}
}
function testCharacterData(aNode, aText)
{
is(aNode.length, aText.length, "Text length should match");
is(aNode.data, aText, "Text content should match");
is(aNode.nodeValue, aText, "Check nodeValue");
is(aNode.localName, null, "Check localName")
is(aNode.namespaceURI, null, "Check namespaceURI");
}
function testComment(aText, aShouldSucceed)
{
try {
var comment = document.createComment(aText);
var types = [ Comment, CharacterData, Node ];
checkTypes(comment, "comment", types);
var interfaces = [ "nsIDOMComment", "nsIDOMCharacterData", "nsIDOMNode",
"nsIDOM3Node", "nsIDOMEventTarget" ];
checkInterfaces(comment, "comment", interfaces);
testCharacterData(comment, aText);
is(comment.nodeName, "#comment", "Check nodeName");
is(comment.nodeType, Node.COMMENT_NODE, "Check nodeType");
if (!aShouldSucceed) {
ok(0, "Invalid comment creation",
"Shouldn't create comment with embedded \"--\"");
}
} catch (e) {
if (aShouldSucceed) {
ok(0, "Correct functioning of comment stuff", "something broke: " + e);
} else {
is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
}
}
}
function testCDATASection(aText, aShouldSucceed)
{
try {
var cdataSection = document.createCDATASection(aText);
ok(0, "Invalid CDATA section creation",
"Shouldn't create CDATA sections in HTML");
} catch (e) {
is(e.code, DOMException.NOT_SUPPORTED_ERR, "Check exception code");
}
}
function testPI(aTarget, aData, aShouldSucceed, aReason)
{
try {
var pi = document.createProcessingInstruction(aTarget, aData);
ok(0, "Invalid processing instruction creation",
"Shouldn't create processing instructions in HTML");
} catch (e) {
is(e.code, DOMException.NOT_SUPPORTED_ERR, "Check exception code");
}
}
testComment("Some text", true);
testComment("Some text with a '-' in it", true);
testComment("Some text with a '-' and a '-' and another '-'", true);
testComment("Some text -- this shouldn't create a node!", false);
testComment("<!-- This is an HTML comment -->", false);
testCDATASection("Some text", true);
testCDATASection("Some text with a '?' in it", true);
testCDATASection("Some text with a '>' in it", true);
testCDATASection("Some text with a '?' and a '>' in it", true);
testCDATASection("Some text with a '? >' in it", true);
testCDATASection("Some text -- ?> this should be ok", true);
testCDATASection("Some text ]]&gt; this should not create a node!", false);
testPI("foo", "bar", true);
testPI("foo:bar", "baz", true);
testPI("foo", "bar?", true);
testPI("foo", "bar>", true);
testPI("foo", "bar? >", true);
testPI("<aaa", "bar", false, "Target should not contain '<'");
testPI("aaa>", "bar", false, "Target should not contain '>'");
testPI("aa?", "bar", false, "Target should not contain '?'");
testPI("foo", "bar?>", false, "Data should not contain '?>'");
</script>
</pre>
</body>
</html>

195
testing/mochitest/tests/test_bug352728.xhtml Normal file
Просмотреть файл

@ -0,0 +1,195 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=352728
-->
<head>
<title>Test for Bug 352728</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=352728">Mozilla Bug 352728</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<!-- First make sure that a script consisting of multiple CDATA sections is
even supported -->
<script class="testbody" type="text/javascript">
var cdataTest1 = false;
var cdataTest2 = false;
var cdataTest3 = false;
</script>
<script class="testbody" type="text/javascript">
<![CDATA[
cdataTest1 = true;
]]>
cdataTest2 = true;
<![CDATA[
cdataTest3 = true;
]]>
</script>
<script class="testbody" type="text/javascript">
is(cdataTest1, true, "Check first CDATA section");
is(cdataTest2, true, "Check in between CDATA sections");
is(cdataTest3, true, "Check second CDATA section");
</script>
<script class="testbody" type="text/javascript">
<![CDATA[
/** Test for Bug 352728 **/
function checkTypes(aNode, aNodeType, aTypeArray)
{
for (var i = 0; i < aTypeArray.length; ++i) {
ok(aNode instanceof aTypeArray[i], aNodeType + " type test " + i,
aNodeType + " should be a " + aTypeArray[i]);
}
}
function checkInterfaces(aNode, aNodeType, aInterfaceArray)
{
for (var i = 0; i < aInterfaceArray.length; ++i) {
ok(aNode instanceof Components.interfaces[aInterfaceArray[i]],
aNodeType + " interface test " + i,
aNodeType + " should be a " + aInterfaceArray[i]);
}
}
function testCharacterData(aNode, aText)
{
is(aNode.length, aText.length, "Text length should match");
is(aNode.data, aText, "Text content should match");
is(aNode.nodeValue, aText, "Check nodeValue");
is(aNode.localName, null, "Check localName")
is(aNode.namespaceURI, null, "Check namespaceURI");
}
function testComment(aText, aShouldSucceed)
{
try {
var comment = document.createComment(aText);
var types = [ Comment, CharacterData, Node ];
checkTypes(comment, "comment", types);
var interfaces = [ "nsIDOMComment", "nsIDOMCharacterData", "nsIDOMNode",
"nsIDOM3Node", "nsIDOMEventTarget" ];
checkInterfaces(comment, "comment", interfaces);
testCharacterData(comment, aText);
is(comment.nodeName, "#comment", "Check nodeName");
is(comment.nodeType, Node.COMMENT_NODE, "Check nodeType");
if (!aShouldSucceed) {
ok(0, "Invalid comment creation",
"Shouldn't create comment with embedded \"--\"");
}
} catch (e) {
if (aShouldSucceed) {
ok(0, "Correct functioning of comment stuff", "something broke: " + e);
} else {
is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
}
}
}
function testCDATASection(aText, aShouldSucceed)
{
try {
var cdataSection = document.createCDATASection(aText);
var types = [ CDATASection, CharacterData, Node ];
checkTypes(cdataSection, "CDATA section", types);
var interfaces = [ "nsIDOMCDATASection", "nsIDOMCharacterData",
"nsIDOMNode", "nsIDOM3Node", "nsIDOMEventTarget" ];
checkInterfaces(cdataSection, "CDATA section", interfaces);
testCharacterData(cdataSection, aText);
is(cdataSection.nodeName, "#cdata-section", "Check nodeName");
is(cdataSection.nodeType, Node.CDATA_SECTION_NODE, "Check nodeType");
if (!aShouldSucceed) {
ok(0, "Invalid CDATA section creation",
]]>
"Shouldn't create CDATA section with embedded \"]]&gt;\"");
<![CDATA[
}
} catch (e) {
if (aShouldSucceed) {
ok(0, "Correct functioning of CDATA section stuff",
"something broke: " + e);
} else {
is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
}
}
}
function testPI(aTarget, aData, aShouldSucceed, aReason)
{
try {
var pi = document.createProcessingInstruction(aTarget, aData);
var types = [ ProcessingInstruction, Node ];
checkTypes(pi, "processing instruction", types);
var interfaces = [ "nsIDOMProcessingInstruction", "nsIDOMNode",
"nsIDOM3Node", "nsIDOMEventTarget" ];
checkInterfaces(pi, "processing instruction", interfaces);
is(pi.target, aTarget, "Check target");
is(pi.data, aData, "Check data");
is(pi.nodeName, aTarget, "Check nodeName");
is(pi.nodeValue, aData, "Check nodeValue");
is(pi.localName, null, "Check localName")
is(pi.namespaceURI, null, "Check namespaceURI");
is(pi.nodeType, Node.PROCESSING_INSTRUCTION_NODE, "Check nodeType");
if (!aShouldSucceed) {
ok(0, "Invalid processing instruction creation", aReason);
}
} catch (e) {
if (aShouldSucceed) {
ok(0, "Correct functioning of processing instruction stuff",
"something broke: " + e);
} else {
is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
}
}
}
testComment("Some text", true);
testComment("Some text with a '-' in it", true);
testComment("Some text with a '-' and a '-' and another '-'", true);
testComment("Some text -- this shouldn't create a node!", false);
testComment("<!-- This is an HTML comment -->", false);
testCDATASection("Some text", true);
testCDATASection("Some text with a '?' in it", true);
testCDATASection("Some text with a '>' in it", true);
testCDATASection("Some text with a '?' and a '>' in it", true);
testCDATASection("Some text with a '? >' in it", true);
testCDATASection("Some text -- ?> this should be ok", true);
]]>
testCDATASection("Some text ]]&gt; this should not create a node!", false);
<![CDATA[
testPI("foo", "bar", true);
testPI("foo:bar", "baz", true);
testPI("foo", "bar?", true);
testPI("foo", "bar>", true);
testPI("foo", "bar? >", true);
testPI("<aaa", "bar", false, "Target should not contain '<'");
testPI("aaa>", "bar", false, "Target should not contain '>'");
testPI("aa?", "bar", false, "Target should not contain '?'");
testPI("foo", "bar?>", false, "Data should not contain '?>'");
]]>
</script>
</pre>
</body>
</html>