Skip to content

Commit

Permalink
Fix tests that have duplicate names.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jgraham
jgraham committed Aug 18, 2014
1 parent 752685a commit b509ca5
Show file tree
Hide file tree
Showing 13 changed files with 373 additions and 354 deletions.
2 changes: 1 addition & 1 deletion ambient-light/DeviceLightEvent_tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@
t.done();
});

var t2 = async_test('test if DeviceLightEvent received');
var t2 = async_test('test if DeviceLightEvent received (event handler attribute)');
window.ondevicelight = function(e) {
t2.step(function() {
var msg = 'expected instance of DeviceLightEvent: ';
Expand Down
5 changes: 5 additions & 0 deletions cors/origin.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ <h1>Access-Control-Allow-Origin handling</h1>
shouldPass(" "+location.protocol + "//" + location.host);


var failOrigins = [];
function shouldFail(origin) {
if (failOrigins.indexOf(origin) > -1) {
return;
}
failOrigins.push(origin);
test(function () {
var client = new XMLHttpRequest()
client.open('GET', CROSSDOMAIN
Expand Down
4 changes: 2 additions & 2 deletions dom/nodes/Document-getElementsByTagNameNS.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
this.add_cleanup(function() {document.body.removeChild(t)})
assert_array_equals(document.getElementsByTagNameNS("test", "BODY"), [t]);
assert_array_equals(document.getElementsByTagNameNS("test", "body"), []);
}, "body element in test namespace, no prefix")
}, "BODY element in test namespace, no prefix")

test(function() {
var t = document.body.appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "abc"))
Expand Down Expand Up @@ -90,7 +90,7 @@
this.add_cleanup(function() {document.body.removeChild(t)})
assert_array_equals(document.getElementsByTagNameNS("test", "BODY"), [t]);
assert_array_equals(document.getElementsByTagNameNS("test", "body"), []);
}, "body element in test namespace, prefix")
}, "BODY element in test namespace, prefix")

test(function() {
var t = document.body.appendChild(document.createElementNS("test", "test:test"))
Expand Down
120 changes: 60 additions & 60 deletions dom/nodes/selectors.js
View file

Large diffs are not rendered by default.

118 changes: 59 additions & 59 deletions dom/ranges/Range-selectNode.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,56 +10,56 @@
"use strict";

function testSelectNode(range, node) {
try {
range.collapsed;
} catch (e) {
// Range is detached
assert_throws("INVALID_STATE_ERR", function () {
range.selectNode(node);
}, "selectNode() on a detached node must throw INVALID_STATE_ERR");
assert_throws("INVALID_STATE_ERR", function () {
range.selectNodeContents(node);
}, "selectNodeContents() on a detached node must throw INVALID_STATE_ERR");
return;
}
try {
range.collapsed;
} catch (e) {
// Range is detached
assert_throws("INVALID_STATE_ERR", function () {
range.selectNode(node);
}, "selectNode() on a detached node must throw INVALID_STATE_ERR");
assert_throws("INVALID_STATE_ERR", function () {
range.selectNodeContents(node);
}, "selectNodeContents() on a detached node must throw INVALID_STATE_ERR");
return;
}

if (!node.parentNode) {
assert_throws("INVALID_NODE_TYPE_ERR", function() {
range.selectNode(node);
}, "selectNode() on a node with no parent must throw INVALID_NODE_TYPE_ERR");
} else {
var index = 0;
while (node.parentNode.childNodes[index] != node) {
index++;
}
if (!node.parentNode) {
assert_throws("INVALID_NODE_TYPE_ERR", function() {
range.selectNode(node);
}, "selectNode() on a node with no parent must throw INVALID_NODE_TYPE_ERR");
} else {
var index = 0;
while (node.parentNode.childNodes[index] != node) {
index++;
}

range.selectNode(node);
assert_equals(range.startContainer, node.parentNode,
"After selectNode(), startContainer must equal parent node");
assert_equals(range.endContainer, node.parentNode,
"After selectNode(), endContainer must equal parent node");
assert_equals(range.startOffset, index,
"After selectNode(), startOffset must be index of node in parent (" + index + ")");
assert_equals(range.endOffset, index + 1,
"After selectNode(), endOffset must be one plus index of node in parent (" + (index + 1) + ")");
}
range.selectNode(node);
assert_equals(range.startContainer, node.parentNode,
"After selectNode(), startContainer must equal parent node");
assert_equals(range.endContainer, node.parentNode,
"After selectNode(), endContainer must equal parent node");
assert_equals(range.startOffset, index,
"After selectNode(), startOffset must be index of node in parent (" + index + ")");
assert_equals(range.endOffset, index + 1,
"After selectNode(), endOffset must be one plus index of node in parent (" + (index + 1) + ")");
}

if (node.nodeType == Node.DOCUMENT_TYPE_NODE) {
assert_throws("INVALID_NODE_TYPE_ERR", function () {
range.selectNodeContents(node);
}, "selectNodeContents() on a doctype must throw INVALID_NODE_TYPE_ERR");
} else {
range.selectNodeContents(node);
assert_equals(range.startContainer, node,
"After selectNodeContents(), startContainer must equal node");
assert_equals(range.endContainer, node,
"After selectNodeContents(), endContainer must equal node");
assert_equals(range.startOffset, 0,
"After selectNodeContents(), startOffset must equal 0");
var len = nodeLength(node);
assert_equals(range.endOffset, len,
"After selectNodeContents(), endOffset must equal node length (" + len + ")");
}
if (node.nodeType == Node.DOCUMENT_TYPE_NODE) {
assert_throws("INVALID_NODE_TYPE_ERR", function () {
range.selectNodeContents(node);
}, "selectNodeContents() on a doctype must throw INVALID_NODE_TYPE_ERR");
} else {
range.selectNodeContents(node);
assert_equals(range.startContainer, node,
"After selectNodeContents(), startContainer must equal node");
assert_equals(range.endContainer, node,
"After selectNodeContents(), endContainer must equal node");
assert_equals(range.startOffset, 0,
"After selectNodeContents(), startOffset must equal 0");
var len = nodeLength(node);
assert_equals(range.endOffset, len,
"After selectNodeContents(), endOffset must equal node length (" + len + ")");
}
}

var range = document.createRange();
Expand All @@ -69,17 +69,17 @@
detachedRange.detach();
var tests = [];
function testTree(root, marker) {
if (root.nodeType == Node.ELEMENT_NODE && root.id == "log") {
// This is being modified during the tests, so let's not test it.
return;
}
tests.push([marker + root.nodeName.toLowerCase() + " node, current doc's range, type " + root.nodeType, range, root]);
tests.push([marker + root.nodeName.toLowerCase() + " node, foreign doc's range, type " + root.nodeType, foreignRange, root]);
tests.push([marker + root.nodeName.toLowerCase() + " node, XML doc's range, type " + root.nodeType, xmlRange, root]);
tests.push([marker + root.nodeName.toLowerCase() + " node, detached range, type " + root.nodeType, detachedRange, root]);
for (var i = 0; i < root.childNodes.length; i++) {
testTree(root.childNodes[i], "**" + marker);
}
if (root.nodeType == Node.ELEMENT_NODE && root.id == "log") {
// This is being modified during the tests, so let's not test it.
return;
}
tests.push([marker + root.nodeName.toLowerCase() + " node, current doc's range, type " + root.nodeType, range, root]);
tests.push([marker + root.nodeName.toLowerCase() + " node, foreign doc's range, type " + root.nodeType, foreignRange, root]);
tests.push([marker + root.nodeName.toLowerCase() + " node, XML doc's range, type " + root.nodeType, xmlRange, root]);
tests.push([marker + root.nodeName.toLowerCase() + " node, detached range, type " + root.nodeType, detachedRange, root]);
for (var i = 0; i < root.childNodes.length; i++) {
testTree(root.childNodes[i], "**" + marker);
}
}
testTree(document, " current doc: ");
testTree(foreignDoc, " foreign doc: ");
Expand All @@ -90,7 +90,7 @@
docfrag, foreignDocfrag, xmlDocfrag];

for (var i = 0; i < otherTests.length; i++) {
testTree(otherTests[i], " ");
testTree(otherTests[i], " ");
}

generate_tests(testSelectNode, tests);
Expand Down
2 changes: 1 addition & 1 deletion domxpath/001.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
["SVG elements mixed case selector", "//svg:PatH", [], ns_resolver],
["Non-ascii HTML element", "//dØdd", document.getElementsByTagName("dØdd"), ns_resolver],
["Non-ascii HTML element2", "//dødd", [], ns_resolver],
["Non-ascii HTML element2", "//DØDD", document.getElementsByTagName("dØdd"), ns_resolver]
["Non-ascii HTML element3", "//DØDD", document.getElementsByTagName("dØdd"), ns_resolver]
])

generate_tests(test_xpath_throws, [
Expand Down
8 changes: 6 additions & 2 deletions html/dom/reflection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,12 @@ ReflectionTests.doReflects = function(data, idlName, idlObj, domName, domObj) {
data.nonCanon = {};
}
for (var i = 0; i < data.keywords.length; i++) {
domTests.push(data.keywords[i], "x" + data.keywords[i], data.keywords[i] + "\0");
idlTests.push(data.keywords[i], "x" + data.keywords[i], data.keywords[i] + "\0");
if (data.keywords[i] != "") {
domTests.push(data.keywords[i], "x" + data.keywords[i], data.keywords[i] + "\0");
}
if (data.keywords[i] != "") {
idlTests.push(data.keywords[i], "x" + data.keywords[i], data.keywords[i] + "\0");
}

if (data.keywords[i].length > 1) {
domTests.push(data.keywords[i].slice(1));
Expand Down
2 changes: 1 addition & 1 deletion html/semantics/forms/the-input-element/input-textselection-01.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
var valid = ["text", "search", "url", "tel", "email", "password"];
var invalid = ["hidden", "datetime", "date", "month", "week", "datetime-local",
"number", "range", "color", "checkbox", "radio", "button",
"file", "submit", "image", "reset", "button"];
"file", "submit", "image", "reset"];
valid.forEach(function(aType) {
test(function() {
var input = document.createElement("input");
Expand Down
Loading

0 comments on commit b509ca5

Please sign in to comment.