From 83cc23089abb134189396216e799e7f7015e1458 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 30 Jul 2014 17:55:28 +0200 Subject: [PATCH] Throw a TypeError when a non-object is passed where one is expected. --- .../dom/bindings/codegen/CodegenRust.py | 2 +- .../open-url-javascript-window-2.htm.ini | 3 - .../open-url-javascript-window.htm.ini | 3 - .../responsetext-decoding.htm.ini | 1 - .../DOMImplementation-createDocument.html.ini | 84 +++++++++++++++++-- ...-childElementCount-dynamic-remove.html.ini | 3 +- .../dom/nodes/Node-replaceChild.html.ini | 5 +- 7 files changed, 83 insertions(+), 18 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 84f978e8f8f..a9a77fb34ff 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -497,7 +497,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, return CGWrapper( CGGeneric( failureCode or - ('//XXXjdm ThrowErrorMessage(cx, MSG_NOT_OBJECT, "%s");\n' + ('throw_type_error(cx, "%s is not an object.");\n' '%s' % (firstCap(sourceDescription), exceptionCode))), post="\n") def onFailureBadType(failureCode, typeName): diff --git a/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini index f48486261eb..96352459d95 100644 --- a/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini +++ b/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini @@ -1,6 +1,3 @@ [open-url-javascript-window-2.htm] type: testharness expected: TIMEOUT - [XMLHttpRequest: open() - resolving URLs (javascript: ] - expected: TIMEOUT - diff --git a/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini index b52449895eb..a31220abbac 100644 --- a/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini +++ b/src/test/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini @@ -1,6 +1,3 @@ [open-url-javascript-window.htm] type: testharness expected: TIMEOUT - [XMLHttpRequest: open() - resolving URLs (javascript: ] - expected: TIMEOUT - diff --git a/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini index 3a0f884346d..32de679a16a 100644 --- a/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini +++ b/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini @@ -1,6 +1,5 @@ [responsetext-decoding.htm] type: testharness - expected: TIMEOUT [XMLHttpRequest: responseText decoding (text/plain %FE%FF)] expected: FAIL diff --git a/src/test/wpt/metadata/dom/nodes/DOMImplementation-createDocument.html.ini b/src/test/wpt/metadata/dom/nodes/DOMImplementation-createDocument.html.ini index efb9ba88eee..1a049731535 100644 --- a/src/test/wpt/metadata/dom/nodes/DOMImplementation-createDocument.html.ini +++ b/src/test/wpt/metadata/dom/nodes/DOMImplementation-createDocument.html.ini @@ -1,9 +1,83 @@ [DOMImplementation-createDocument.html] type: testharness - expected: TIMEOUT - [DOMImplementation.createDocument(namespace, qualifiedName, doctype)] - expected: TIMEOUT + [createDocument test 2: null,undefined,null,null] + expected: FAIL - [createDocument test 0: null,null,false,object "TypeError"] - expected: TIMEOUT + [createDocument test 4: null,"foo",null,null] + expected: FAIL + + [createDocument test 6: null,"f1oo",null,null] + expected: FAIL + + [createDocument test 7: null,"foo1",null,null] + expected: FAIL + + [createDocument test 11: null,"xml",null,null] + expected: FAIL + + [createDocument test 12: null,"xmlns",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 13: null,"xmlfoo",null,null] + expected: FAIL + + [createDocument test 18: undefined,undefined,undefined,null] + expected: FAIL + + [createDocument test 20: undefined,"foo",undefined,null] + expected: FAIL + + [createDocument test 22: undefined,"f1oo",undefined,null] + expected: FAIL + + [createDocument test 23: undefined,"foo1",undefined,null] + expected: FAIL + + [createDocument test 27: undefined,"xml",undefined,null] + expected: FAIL + + [createDocument test 28: undefined,"xmlns",undefined,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 29: undefined,"xmlfoo",undefined,null] + expected: FAIL + + [createDocument test 41: "http://example.com/","foo:",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 43: "http://example.com/","xmlns",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 46: "http://example.com/","xmlns:foo",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 56: "/","foo:",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 58: "/","xmlns",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 61: "/","xmlns:foo",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 71: "http://www.w3.org/XML/1998/namespace","foo:",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 73: "http://www.w3.org/XML/1998/namespace","xmlns",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 76: "http://www.w3.org/XML/1998/namespace","xmlns:foo",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 101: "foo:","foo:",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 103: "foo:","xmlns",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 106: "foo:","xmlns:foo",null,"NAMESPACE_ERR"] + expected: FAIL + + [createDocument test 113: null,"foo",DocumentType node,null] + expected: FAIL diff --git a/src/test/wpt/metadata/dom/nodes/Element-childElementCount-dynamic-remove.html.ini b/src/test/wpt/metadata/dom/nodes/Element-childElementCount-dynamic-remove.html.ini index 9434c4dee18..b6e76d17946 100644 --- a/src/test/wpt/metadata/dom/nodes/Element-childElementCount-dynamic-remove.html.ini +++ b/src/test/wpt/metadata/dom/nodes/Element-childElementCount-dynamic-remove.html.ini @@ -1,6 +1,5 @@ [Element-childElementCount-dynamic-remove.html] type: testharness - expected: TIMEOUT [Dynamic Removal of Elements] - expected: TIMEOUT + expected: FAIL diff --git a/src/test/wpt/metadata/dom/nodes/Node-replaceChild.html.ini b/src/test/wpt/metadata/dom/nodes/Node-replaceChild.html.ini index 9753422bfc2..a1ccb834346 100644 --- a/src/test/wpt/metadata/dom/nodes/Node-replaceChild.html.ini +++ b/src/test/wpt/metadata/dom/nodes/Node-replaceChild.html.ini @@ -1,6 +1,5 @@ [Node-replaceChild.html] type: testharness - expected: TIMEOUT - [Passing null to replaceChild should throw a TypeError.] - expected: TIMEOUT + [If child\'s parent is not the context node, a NotFoundError exception should be thrown] + expected: FAIL