diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-11-06 22:51:29 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-11-06 22:51:29 -0700 |
| commit | bb7621f5dc33dd5068a3a4de7cdfe3af8b3d4130 (patch) | |
| tree | 4e4ffaaeb9bb494275c2d0551881c0a8e290695a | |
| parent | 338a9c3f054db0244185c3d85b47e427b6070e37 (diff) | |
| parent | 711f4d5af92168bff43004cbd63d6ba83341c286 (diff) | |
| download | servo-bb7621f5dc33dd5068a3a4de7cdfe3af8b3d4130.tar.gz servo-bb7621f5dc33dd5068a3a4de7cdfe3af8b3d4130.zip | |
auto merge of #3929 : jdm/servo/finish, r=larsbergstrom
72 files changed, 20 insertions, 105 deletions
diff --git a/tests/content/harness.js b/tests/content/harness.js index 7dafac00b6e..2738ca2e6a6 100644 --- a/tests/content/harness.js +++ b/tests/content/harness.js @@ -75,6 +75,9 @@ function check_disabled_selector(elem, disabled) { var _test_complete = false; var _test_timeout = 10000; //10 seconds function finish() { + if (_test_complete) { + _fail('finish called multiple times'); + } if (_expectations > _tests) { _fail('expected ' + _expectations + ' tests, fullfilled ' + _tests); } @@ -90,3 +93,14 @@ function _test_timed_out() { } setTimeout(_test_timed_out, _test_timeout); + +var _needs_finish = false; +function waitForExplicitFinish() { + _needs_finish = true; +} + +addEventListener('load', function() { + if (!_needs_finish) { + finish(); + } +}); diff --git a/tests/content/test_DOMParser.html b/tests/content/test_DOMParser.html index c773116e3f6..1928863d8d5 100644 --- a/tests/content/test_DOMParser.html +++ b/tests/content/test_DOMParser.html @@ -6,7 +6,6 @@ is_function(DOMParser, "DOMParser"); let parser = new DOMParser(); is_a(parser, DOMParser); is_a(parser.parseFromString("", "text/html"), Document); -finish(); </script> </head> </html> diff --git a/tests/content/test_Event.html b/tests/content/test_Event.html index 0643df62e44..267983f59ef 100644 --- a/tests/content/test_Event.html +++ b/tests/content/test_Event.html @@ -11,8 +11,6 @@ is(ev.type, 'foopy'); is(ev.defaultPrevented, false); ev.preventDefault(); is(ev.defaultPrevented, true); - -finish(); </script> </head> </html> diff --git a/tests/content/test_MouseEvent.html b/tests/content/test_MouseEvent.html index 9d17cdc801e..89173bbe6cc 100644 --- a/tests/content/test_MouseEvent.html +++ b/tests/content/test_MouseEvent.html @@ -11,8 +11,6 @@ is_a(ev, UIEvent); is_a(ev, MouseEvent); is(ev.screenX, 150); is(ev.detail, 100); - -finish(); </script> </head> </html> diff --git a/tests/content/test_body_listener.html b/tests/content/test_body_listener.html index dd125e7271c..03dd253c47d 100644 --- a/tests/content/test_body_listener.html +++ b/tests/content/test_body_listener.html @@ -2,6 +2,7 @@ <head> <script src="harness.js"></script> <script> + waitForExplicitFinish(); function check_onload(listener) { is(listener, window); var ev = new Event('click', {bubbles: true, cancelable: true}); diff --git a/tests/content/test_caption.html b/tests/content/test_caption.html index be4288bcc13..3280701b166 100644 --- a/tests/content/test_caption.html +++ b/tests/content/test_caption.html @@ -17,7 +17,5 @@ t.caption = newCaption; is(newCaption.parentNode, t); is(t.caption, newCaption); - - finish(); </script> </html> diff --git a/tests/content/test_collections.html b/tests/content/test_collections.html index 61215300e6a..c32381a1c1c 100644 --- a/tests/content/test_collections.html +++ b/tests/content/test_collections.html @@ -136,8 +136,6 @@ check_tag("video", 1, [HTMLMediaElement, HTMLVideoElement]); // Test non-ASCII tag names. Uppercasing is ASCII-only per spec: // http://dom.spec.whatwg.org/#dom-element-tagname check_tag("foo-á", 1, [HTMLUnknownElement], "FOO-á"); - -finish(); </script> </body> </html> diff --git a/tests/content/test_createElement_script.html b/tests/content/test_createElement_script.html index 0805511acf1..ec5b2d01dd0 100644 --- a/tests/content/test_createElement_script.html +++ b/tests/content/test_createElement_script.html @@ -14,7 +14,6 @@ output += "end"; is(output, "start middle end"); - finish(); </script> </body> </html> diff --git a/tests/content/test_create_element.html b/tests/content/test_create_element.html index f62c599504d..ede3e21814b 100644 --- a/tests/content/test_create_element.html +++ b/tests/content/test_create_element.html @@ -13,7 +13,6 @@ is_a(elem, HTMLSpanElement); var text = document.createTextNode("hello"); is_a(text, Text); - finish(); </script> </body> </html> diff --git a/tests/content/test_documentElement.html b/tests/content/test_documentElement.html index efe68e086d0..4bb858e931e 100644 --- a/tests/content/test_documentElement.html +++ b/tests/content/test_documentElement.html @@ -7,7 +7,6 @@ is_a(document.documentElement, HTMLHtmlElement); is_a(document.documentElement.firstChild, HTMLHeadElement); is(document.documentElement.nextSibling, null); is_a(document, Document); -finish(); </script> </head> </html> diff --git a/tests/content/test_document_adoptNode.html b/tests/content/test_document_adoptNode.html index e3f36fb7f47..41481b56af7 100644 --- a/tests/content/test_document_adoptNode.html +++ b/tests/content/test_document_adoptNode.html @@ -18,8 +18,6 @@ is(foo.ownerDocument, doc); is(foo.parentNode, null); is(foo.childNodes.length, 1); - - finish(); </script> </body> </html> diff --git a/tests/content/test_document_body.html b/tests/content/test_document_body.html index 0d47d5304f3..ebe60a2ad93 100644 --- a/tests/content/test_document_body.html +++ b/tests/content/test_document_body.html @@ -66,8 +66,6 @@ new_document.body = new_frameset; is(new_document.body, new_frameset, "test6-3, append frameset to a new document"); } - - finish(); </script> </body> </html> diff --git a/tests/content/test_document_characterSet.html b/tests/content/test_document_characterSet.html index c1d5ed9f103..4ac3dea31be 100644 --- a/tests/content/test_document_characterSet.html +++ b/tests/content/test_document_characterSet.html @@ -14,8 +14,6 @@ var htmldoc = document.implementation.createHTMLDocument("title"); is(htmldoc.characterSet, "utf-8", "test2-2, characterSet"); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_document_characterSet_default.html b/tests/content/test_document_characterSet_default.html index 08fc63075e2..1941e50c3ee 100644 --- a/tests/content/test_document_characterSet_default.html +++ b/tests/content/test_document_characterSet_default.html @@ -8,8 +8,6 @@ // FIXME: https://github.com/mozilla-servo/libhubbub/issues/5 is(document.characterSet, "utf-8", "test1-0, default characterSet"); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_document_characterSet_invalid.html b/tests/content/test_document_characterSet_invalid.html index 80984ad3e45..d0440e4fe0f 100644 --- a/tests/content/test_document_characterSet_invalid.html +++ b/tests/content/test_document_characterSet_invalid.html @@ -8,8 +8,6 @@ { is(document.characterSet, "utf-8", "test1-0, unknown charset"); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_document_compatMode.html b/tests/content/test_document_compatMode.html index 754512c9a3b..92ba6644218 100644 --- a/tests/content/test_document_compatMode.html +++ b/tests/content/test_document_compatMode.html @@ -15,7 +15,6 @@ var htmldoc = document.implementation.createHTMLDocument("title"); is(htmldoc.compatMode, "CSS1Compat", "test2-1, Non-parsed documents"); } - finish(); </script> </head> </html> diff --git a/tests/content/test_document_compatMode_loose.html b/tests/content/test_document_compatMode_loose.html index 8a03b25e5a1..da538636bb8 100644 --- a/tests/content/test_document_compatMode_loose.html +++ b/tests/content/test_document_compatMode_loose.html @@ -7,7 +7,6 @@ { is(document.compatMode, "BackCompat", "test1-0, Loose HTML"); } - finish(); </script> </head> </html> diff --git a/tests/content/test_document_compatMode_strict.html b/tests/content/test_document_compatMode_strict.html index dd1b566735e..b28816cc60f 100644 --- a/tests/content/test_document_compatMode_strict.html +++ b/tests/content/test_document_compatMode_strict.html @@ -7,7 +7,6 @@ { is(document.compatMode, "CSS1Compat", "test1-0, Strict HTML"); } - finish(); </script> </head> </html> diff --git a/tests/content/test_document_contenttype.html b/tests/content/test_document_contenttype.html index 4a63a654547..73bf7f0217a 100644 --- a/tests/content/test_document_contenttype.html +++ b/tests/content/test_document_contenttype.html @@ -15,8 +15,6 @@ is_a(doc, Document, "test2-0, XML document"); is(doc.contentType, "application/xml", "test2-1, XML document"); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_document_datalist_options.html b/tests/content/test_document_datalist_options.html index 770c67a23e4..140a253a761 100644 --- a/tests/content/test_document_datalist_options.html +++ b/tests/content/test_document_datalist_options.html @@ -15,6 +15,5 @@ is_a(datalist.options[0], HTMLOptionElement); is_a(datalist.options[1], HTMLOptionElement); is_a(datalist.options[2], HTMLOptionElement); - finish(); </script> </html> diff --git a/tests/content/test_document_getElementById.html b/tests/content/test_document_getElementById.html index d8430011b33..7484fdf4eb5 100644 --- a/tests/content/test_document_getElementById.html +++ b/tests/content/test_document_getElementById.html @@ -19,8 +19,6 @@ let result = document.getElementById(TEST_ID); is(result, b, "test 9-0"); } - - finish(); </script> </body> </html> diff --git a/tests/content/test_document_getElementsByName.html b/tests/content/test_document_getElementsByName.html index ab69292eced..6d45ed6c8bf 100644 --- a/tests/content/test_document_getElementsByName.html +++ b/tests/content/test_document_getElementsByName.html @@ -9,7 +9,6 @@ let nameList = document.getElementsByName("foo"); is_a(nameList, NodeList); is_not_a(nameList, HTMLCollection); - finish(); </script> </body> </html> diff --git a/tests/content/test_document_head.html b/tests/content/test_document_head.html index f52a2b9aeba..00cff0c885e 100644 --- a/tests/content/test_document_head.html +++ b/tests/content/test_document_head.html @@ -40,7 +40,6 @@ foo.appendChild(head); is(new_document.head, null, "test3-0, head's parent should be document element"); } - finish(); </script> </body> </html> diff --git a/tests/content/test_document_implementation.html b/tests/content/test_document_implementation.html index 7ac34da077d..ac51b18f875 100644 --- a/tests/content/test_document_implementation.html +++ b/tests/content/test_document_implementation.html @@ -74,8 +74,6 @@ is(doc.doctype, doctype, "test4-9, createDocument"); is_a(doc.documentElement, Element, "test4-10, createDocument"); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_document_links_cache.html b/tests/content/test_document_links_cache.html index bf4086ff0cc..590939e42f7 100644 --- a/tests/content/test_document_links_cache.html +++ b/tests/content/test_document_links_cache.html @@ -32,8 +32,6 @@ document.body.removeChild(document.getElementById("anchor-with-href")); is(links, document.links); is(links.length, 0); - - finish(); </script> </body> </html> diff --git a/tests/content/test_document_readystate.html b/tests/content/test_document_readystate.html index 911d6043e6f..bf0066908f7 100644 --- a/tests/content/test_document_readystate.html +++ b/tests/content/test_document_readystate.html @@ -4,6 +4,8 @@ </head> <body onload="is(document.readyState, 'complete'); is(gNumChanges, 2); finish()"> <script> + waitForExplicitFinish(); + gNumChanges = 0; document.addEventListener('readystatechange', function() { gNumChanges++; diff --git a/tests/content/test_document_set_node_value.html b/tests/content/test_document_set_node_value.html index 20762a93674..6aeb79bc5f7 100644 --- a/tests/content/test_document_set_node_value.html +++ b/tests/content/test_document_set_node_value.html @@ -13,7 +13,6 @@ is(div.firstChild.nodeValue, "B"); var commentNode = document.createComment("comment node"); is(commentNode.nodeValue, "comment node"); - finish(); </script> </body> </html> diff --git a/tests/content/test_document_title_nontextchildren.html b/tests/content/test_document_title_nontextchildren.html index 9875a149be7..20a74d4587d 100644 --- a/tests/content/test_document_title_nontextchildren.html +++ b/tests/content/test_document_title_nontextchildren.html @@ -4,6 +4,5 @@ <script> document.head.firstChild.appendChild(document.createElement("foo")); is(document.title, "x"); -finish(); </script> </html> diff --git a/tests/content/test_document_url.html b/tests/content/test_document_url.html index bab643b58f0..cb3aca2b0f1 100644 --- a/tests/content/test_document_url.html +++ b/tests/content/test_document_url.html @@ -23,8 +23,6 @@ is(url[0], "file:", "test3-0, current document"); is(url[url.length-1], "test_document_url.html", "test3-1, current document"); } - - finish(); </script> </head> <body> diff --git a/tests/content/test_domtokenlist.html b/tests/content/test_domtokenlist.html index bc32777ec0e..98877ddf840 100644 --- a/tests/content/test_domtokenlist.html +++ b/tests/content/test_domtokenlist.html @@ -38,8 +38,6 @@ is(classList.contains("bar"), true); is(classList.contains("baz"), false); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_element_attribute.html b/tests/content/test_element_attribute.html index d7ee6a23640..3715c4e091d 100644 --- a/tests/content/test_element_attribute.html +++ b/tests/content/test_element_attribute.html @@ -59,8 +59,6 @@ should_throw(function () { test.setAttributeNS("http://www.w3.org/2000/xmlns/", "prefix:attr", "value"); }); - - finish(); </script> </body> </html> diff --git a/tests/content/test_element_attributes.html b/tests/content/test_element_attributes.html index c489fad9f87..7eb560ec258 100644 --- a/tests/content/test_element_attributes.html +++ b/tests/content/test_element_attributes.html @@ -15,7 +15,6 @@ is(attributes[i].name, String.fromCharCode(i + 'a'.charCodeAt(0))); is(attributes[i].value, (i + 'a'.charCodeAt(0)).toString()); } - finish(); </script> </body> </html> diff --git a/tests/content/test_element_classList.html b/tests/content/test_element_classList.html index ade4aa6a5a1..8d61414017b 100644 --- a/tests/content/test_element_classList.html +++ b/tests/content/test_element_classList.html @@ -12,8 +12,6 @@ is(classList.item(0), null, "classList.item(0) must return null when all classes have been removed"); is(classList[0], undefined, "classList[0] must be undefined when all classes have been removed"); - - finish(); </script> </head> <body> diff --git a/tests/content/test_element_className.html b/tests/content/test_element_className.html index 743d0f21f20..298205c4681 100644 --- a/tests/content/test_element_className.html +++ b/tests/content/test_element_className.html @@ -31,8 +31,6 @@ collection = document.getElementsByClassName("baz"); is(collection.length, 1); is(collection[0].id, foo2.id); - - finish(); </script> </body> </html> diff --git a/tests/content/test_element_matches.html b/tests/content/test_element_matches.html index 55f89d4a3fc..50847e4dcc2 100644 --- a/tests/content/test_element_matches.html +++ b/tests/content/test_element_matches.html @@ -11,8 +11,6 @@ is(test.matches("#foo"), true, "test-1"); is(test.matches("#not-foo"), false, "test-2"); - - finish(); </script> </body> </html> diff --git a/tests/content/test_empty_clientrect.html b/tests/content/test_empty_clientrect.html index 2504fa66396..af319a14528 100644 --- a/tests/content/test_empty_clientrect.html +++ b/tests/content/test_empty_clientrect.html @@ -12,7 +12,6 @@ is(rect.right, 0); is(rect.width, 0); is(rect.height, 0); is(rects.length, 0); -finish(); </script> </head> </html> diff --git a/tests/content/test_enabled_disabled_selectors.html b/tests/content/test_enabled_disabled_selectors.html index 8e0c2c2fd26..3a46183de29 100644 --- a/tests/content/test_enabled_disabled_selectors.html +++ b/tests/content/test_enabled_disabled_selectors.html @@ -172,8 +172,6 @@ optgroup.removeChild(option); check_disabled_selector(option, false); } - - finish(); </script> </body> </html> diff --git a/tests/content/test_event_dispatch.html b/tests/content/test_event_dispatch.html index cf9eb4ee675..0ace43d8f28 100644 --- a/tests/content/test_event_dispatch.html +++ b/tests/content/test_event_dispatch.html @@ -44,8 +44,6 @@ is(bodyTimes, 2, 'body listener should be called multiple times'); is(divTimes, 1, 'target listener should be called once'); is(spanTimes, 1, 'span listener should be called while bubbling'); - - finish(); </script> </body> </html> diff --git a/tests/content/test_event_dispatch_dynamic.html b/tests/content/test_event_dispatch_dynamic.html index 3b852fe497d..a7daddd4afc 100644 --- a/tests/content/test_event_dispatch_dynamic.html +++ b/tests/content/test_event_dispatch_dynamic.html @@ -17,5 +17,4 @@ outerb.addEventListener("x", function() { innerb.dispatchEvent(new Event("x")); is(sawmiddle, 1); is(sawouter, 0); -finish(); </script> diff --git a/tests/content/test_event_dispatch_order.html b/tests/content/test_event_dispatch_order.html index e1b381d0b77..8092a6eeefd 100644 --- a/tests/content/test_event_dispatch_order.html +++ b/tests/content/test_event_dispatch_order.html @@ -36,7 +36,6 @@ is(sawBubble, true); is(sawCapture, true); is(sawBubbleTwice, true); - finish(); </script> </body> </html> diff --git a/tests/content/test_event_handler_syntax_error.html b/tests/content/test_event_handler_syntax_error.html index f6c8cdffcff..3c58a6b4b80 100644 --- a/tests/content/test_event_handler_syntax_error.html +++ b/tests/content/test_event_handler_syntax_error.html @@ -16,8 +16,6 @@ is(document.body.getAttribute("onx"), "{"); is(document.body.getAttribute("ony"), "}"); - - finish(); </script> </body> </html> diff --git a/tests/content/test_event_listener.html b/tests/content/test_event_listener.html index 5096d76349a..da040fb2ed6 100644 --- a/tests/content/test_event_listener.html +++ b/tests/content/test_event_listener.html @@ -32,8 +32,6 @@ var ev = new constructors[i]('foopy', {cancelable: true, bubbles: true}); window.dispatchEvent(ev); } - - finish(); </script> </body> </html> diff --git a/tests/content/test_getBoundingClientRect.html b/tests/content/test_getBoundingClientRect.html index c1ad4a81437..e99bc1870dc 100644 --- a/tests/content/test_getBoundingClientRect.html +++ b/tests/content/test_getBoundingClientRect.html @@ -28,8 +28,6 @@ div { is(rect.height, 100); is(rect.width, rect.right - rect.left); is(rect.height, rect.bottom - rect.top); - - finish(); </script> </body> </html> diff --git a/tests/content/test_global.html b/tests/content/test_global.html index 24cfbc5f6ba..b3a0c2dbbba 100644 --- a/tests/content/test_global.html +++ b/tests/content/test_global.html @@ -7,7 +7,6 @@ is(window, this); for (var key in this) { is(this[key], window[key]); } -finish(); </script> </head> </html> diff --git a/tests/content/test_htmlcollection.html b/tests/content/test_htmlcollection.html index 6ee77fa8157..410c54b2ddf 100644 --- a/tests/content/test_htmlcollection.html +++ b/tests/content/test_htmlcollection.html @@ -112,8 +112,6 @@ is(from_element.item(0), p1); is(from_element.item(1), p3); } - - finish(); </script> </body> </html> diff --git a/tests/content/test_htmlfieldsetelement_elements.html b/tests/content/test_htmlfieldsetelement_elements.html index 3f599a44b9d..45174bf86c5 100644 --- a/tests/content/test_htmlfieldsetelement_elements.html +++ b/tests/content/test_htmlfieldsetelement_elements.html @@ -40,6 +40,5 @@ is_a(fs.elements[7], HTMLInputElement); is_a(fs.elements[8], HTMLOutputElement); is_a(fs.elements[9], HTMLObjectElement); - finish(); </script> </html> diff --git a/tests/content/test_htmlspacechars.html b/tests/content/test_htmlspacechars.html index 7ce5ab3695f..fbb6046d8c3 100644 --- a/tests/content/test_htmlspacechars.html +++ b/tests/content/test_htmlspacechars.html @@ -21,7 +21,6 @@ <script> is(document.getElementsByClassName("foo").length, 6); is_not(document.getElementById("bar").className, "ggg foo"); - finish(); </script> </body> </html> diff --git a/tests/content/test_inline_event_handler.html b/tests/content/test_inline_event_handler.html index 05b5a57c952..53ba610f074 100644 --- a/tests/content/test_inline_event_handler.html +++ b/tests/content/test_inline_event_handler.html @@ -4,6 +4,7 @@ </head> <body onload="is_a(event, Event); finish()"> <script> + waitForExplicitFinish(); </script> </body> </html> diff --git a/tests/content/test_innerHTML.html b/tests/content/test_innerHTML.html index 1f0cf235526..710dc256de4 100644 --- a/tests/content/test_innerHTML.html +++ b/tests/content/test_innerHTML.html @@ -5,7 +5,6 @@ var a = document.createElement("div"); a.appendChild(document.createElement("pre")).appendChild(new Text("")); is(a.innerHTML, "<pre></pre>"); - finish(); </script> </head> </html> diff --git a/tests/content/test_interfaces.html b/tests/content/test_interfaces.html index 5d544ebeaca..696d6dcc7da 100644 --- a/tests/content/test_interfaces.html +++ b/tests/content/test_interfaces.html @@ -206,5 +206,4 @@ for (var name of Object.keys(interfaceMap)) { } is(Object.keys(interfaceMap).length, 0, "The following interface(s) are not enumerated: " + Object.keys(interfaceMap).join(", ")); -finish(); </script> diff --git a/tests/content/test_lenient_this.html b/tests/content/test_lenient_this.html index b31bc0b0751..7e7d27b4300 100644 --- a/tests/content/test_lenient_this.html +++ b/tests/content/test_lenient_this.html @@ -21,8 +21,6 @@ is(Document.prototype.onreadystatechange, undefined, "test2-1, property access returns undefined"); }); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_load_event.html b/tests/content/test_load_event.html index 595ed3b44c7..bbf07d699cb 100644 --- a/tests/content/test_load_event.html +++ b/tests/content/test_load_event.html @@ -4,6 +4,8 @@ </head> <body> <script> + waitForExplicitFinish(); + var onloads = 0; function check(ev) { is_a(ev, Event); diff --git a/tests/content/test_navigator.html b/tests/content/test_navigator.html index cb157086dbf..0b8b048bb2e 100644 --- a/tests/content/test_navigator.html +++ b/tests/content/test_navigator.html @@ -14,7 +14,6 @@ is(nav.taintEnabled(), false); is(nav.appName, "Netscape"); is(nav.appCodeName, "Mozilla"); is(nav.platform, ""); -finish(); </script> </body> </html> diff --git a/tests/content/test_node_cloneNode.html b/tests/content/test_node_cloneNode.html index 3432ae9d537..8d09e07e5b0 100644 --- a/tests/content/test_node_cloneNode.html +++ b/tests/content/test_node_cloneNode.html @@ -226,8 +226,6 @@ check_copy(parent, copy, HTMLDivElement); is(copy.childNodes.length, 0); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_node_compareDocumentPosition.html b/tests/content/test_node_compareDocumentPosition.html index ed03add639a..843d8095262 100644 --- a/tests/content/test_node_compareDocumentPosition.html +++ b/tests/content/test_node_compareDocumentPosition.html @@ -29,7 +29,6 @@ is(another.compareDocumentPosition(follower), Node.DOCUMENT_POSITION_FOLLOWING); is(follower.compareDocumentPosition(another), Node.DOCUMENT_POSITION_PRECEDING); is(follower.compareDocumentPosition(preceder), Node.DOCUMENT_POSITION_PRECEDING); - finish(); } </script> </head> diff --git a/tests/content/test_node_contains.html b/tests/content/test_node_contains.html index 400b407b82d..568edf96ebb 100644 --- a/tests/content/test_node_contains.html +++ b/tests/content/test_node_contains.html @@ -18,8 +18,6 @@ is(parent.contains(child_of_child), true, "test1-2, Node.contains"); is(parent.contains(other), false, "test1-3, Node.contains"); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_node_insertBefore.html b/tests/content/test_node_insertBefore.html index 8ee4e6e68b2..1a280b1bb7b 100644 --- a/tests/content/test_node_insertBefore.html +++ b/tests/content/test_node_insertBefore.html @@ -17,8 +17,6 @@ is(root.insertBefore(before, after), before, "test1-0, insertBefore"); is(root.childNodes[0], before, "test1-1, insertBefore"); is(root.childNodes[1], after, "test1-2, insertBefore"); - - finish(); } </script> </body> diff --git a/tests/content/test_node_isEqualNode.html b/tests/content/test_node_isEqualNode.html index e7c55743725..feaeeb2f78a 100644 --- a/tests/content/test_node_isEqualNode.html +++ b/tests/content/test_node_isEqualNode.html @@ -32,8 +32,6 @@ is(parent_elem.isEqualNode(other_parent), false); is(child_elem.isEqualNode(other_child), false); } - - finish(); </script> </head> </html> diff --git a/tests/content/test_node_normalize.html b/tests/content/test_node_normalize.html index b2e9a367128..27f1ccedd5f 100644 --- a/tests/content/test_node_normalize.html +++ b/tests/content/test_node_normalize.html @@ -28,8 +28,6 @@ is(parent2.childNodes.length, 0, "Node.normalize removes empty text nodes even if there is only one text node"); is(child2.textContent, "", "Node.normalize doesn't change removed children original content") is(child3.textContent, "bb", "Node.normalize doesn't change removed children original content") - - finish(); </script> </body> </html> diff --git a/tests/content/test_node_replaceChild.html b/tests/content/test_node_replaceChild.html index 2deec080198..1ca01e501e7 100644 --- a/tests/content/test_node_replaceChild.html +++ b/tests/content/test_node_replaceChild.html @@ -45,8 +45,6 @@ is(document.replaceChild(new_elem, doc_elem), doc_elem, "test3-1, documentElement"); is(document.documentElement, new_elem, "test3-2, documentElement"); } - - finish(); </script> </body> </html> diff --git a/tests/content/test_parentNode_querySelector.html b/tests/content/test_parentNode_querySelector.html index b91205e7922..9ab4eb3b1cf 100644 --- a/tests/content/test_parentNode_querySelector.html +++ b/tests/content/test_parentNode_querySelector.html @@ -64,7 +64,6 @@ is(docfrag.querySelector(".myClass"), div); is(docfrag.querySelector("div > div"), child); } - finish(); </script> </body> </html> diff --git a/tests/content/test_parentNode_querySelectorAll.html b/tests/content/test_parentNode_querySelectorAll.html index f07ecb5187b..bc99a8251a6 100644 --- a/tests/content/test_parentNode_querySelectorAll.html +++ b/tests/content/test_parentNode_querySelectorAll.html @@ -52,8 +52,6 @@ nodelist = docfrag.querySelectorAll("#foo:nth-child(1)"); is(nodelist.item(0), div); } - - finish(); </script> </body> </html> diff --git a/tests/content/test_parentnodes.html b/tests/content/test_parentnodes.html index 2131b7270b2..51f0f3d1148 100644 --- a/tests/content/test_parentnodes.html +++ b/tests/content/test_parentnodes.html @@ -18,8 +18,6 @@ is(child.parentNode, elem); is(child.parentElement, elem); - - finish(); </script> </body> </html> diff --git a/tests/content/test_prototypes.html b/tests/content/test_prototypes.html index cfb5fb35c3f..705cff1d8dd 100644 --- a/tests/content/test_prototypes.html +++ b/tests/content/test_prototypes.html @@ -19,7 +19,6 @@ function test() { is(window.document.documentElement.tagName, "HTML"); is_a(window.document.getElementsByTagName('foo-á')[0], HTMLUnknownElement); is(window.document.getElementsByTagName('foo-á')[0].tagName, "FOO-á"); - finish(); } </script> </body> diff --git a/tests/content/test_proxy_setter.html b/tests/content/test_proxy_setter.html index 0d18f111599..a8bab0f3bd1 100644 --- a/tests/content/test_proxy_setter.html +++ b/tests/content/test_proxy_setter.html @@ -8,7 +8,6 @@ is(window.document.title, ''); window.document.title = 'foo'; is(window.document.title, 'foo'); -finish(); </script> </body> </html> diff --git a/tests/content/test_script_type.html b/tests/content/test_script_type.html index e034b9013a9..2a67db887cf 100644 --- a/tests/content/test_script_type.html +++ b/tests/content/test_script_type.html @@ -92,10 +92,6 @@ <script language="text/javascript"> fail('language is text/javascript'); </script> - - <script> - finish(); - </script> </body> </html> diff --git a/tests/content/test_textcontent.html b/tests/content/test_textcontent.html index 1720abca8a0..16c2c614d3e 100644 --- a/tests/content/test_textcontent.html +++ b/tests/content/test_textcontent.html @@ -11,7 +11,6 @@ var newContent = "new text con\ntent"; div.textContent = newContent; is(div.textContent, newContent); - finish(); </script> </body> </html> diff --git a/tests/content/test_title.html b/tests/content/test_title.html index da3dcfc7112..117e86134df 100644 --- a/tests/content/test_title.html +++ b/tests/content/test_title.html @@ -6,7 +6,6 @@ is(document.title, "starting title"); document.title = "new title"; is(document.title, "new title"); -finish(); </script> </head> </html> diff --git a/tests/content/test_trace_null.html b/tests/content/test_trace_null.html index af074b94f04..332f158e2a1 100644 --- a/tests/content/test_trace_null.html +++ b/tests/content/test_trace_null.html @@ -3,5 +3,4 @@ <script> new CustomEvent("foo", { detail: null }); gc(); -finish(); </script> diff --git a/tests/content/test_union.html b/tests/content/test_union.html index fd2bf84f96b..f5fa1e933ca 100644 --- a/tests/content/test_union.html +++ b/tests/content/test_union.html @@ -19,8 +19,6 @@ should_throw(function() { sel.add(div) }); should_not_throw(function() { sel.add(optgroup, function() {}) }); - - finish(); </script> </head> </html> diff --git a/tests/content/test_window.html b/tests/content/test_window.html index f532929a124..0f3cc72b274 100644 --- a/tests/content/test_window.html +++ b/tests/content/test_window.html @@ -7,7 +7,6 @@ <script> is(window, window.self); is_a(window.self, Window); -finish(); </script> </body> </html> diff --git a/tests/content/test_window_performance.html b/tests/content/test_window_performance.html index a87e52225ff..968ca1cde3e 100644 --- a/tests/content/test_window_performance.html +++ b/tests/content/test_window_performance.html @@ -22,7 +22,6 @@ gt(next, last); last = next; } - finish(); </script> </body> </html> |