| Index: LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.js
|
| diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.js b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.js
|
| index 6be018c8a66305496783d1b75ac0e74bf2237dff..04dd3eb3f308cdae61e201d51c76e6a10c7e6460 100644
|
| --- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.js
|
| +++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.js
|
| @@ -1,16 +1,14 @@
|
| -
|
| /*
|
| -Copyright © 2001-2004 World Wide Web Consortium,
|
| -(Massachusetts Institute of Technology, European Research Consortium
|
| -for Informatics and Mathematics, Keio University). All
|
| -Rights Reserved. This work is distributed under the W3C® Software License [1] in the
|
| -hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
| -the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
| +Copyright © 2001-2004 World Wide Web Consortium,
|
| +(Massachusetts Institute of Technology, European Research Consortium
|
| +for Informatics and Mathematics, Keio University). All
|
| +Rights Reserved. This work is distributed under the W3C® Software License [1] in the
|
| +hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
| +the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
| [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
|
| */
|
|
|
| -
|
| // expose test function names
|
| function exposeTestFunctionNames()
|
| {
|
| @@ -38,26 +36,24 @@ function setUpPage() {
|
| builder = createConfiguredBuilder();
|
|
|
| docsLoaded = 0;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| }
|
| docsLoaded += preload(docRef, "doc", "staffNS");
|
| -
|
| +
|
| if (docsLoaded == 1) {
|
| setUpPageStatus = 'complete';
|
| }
|
| } catch(ex) {
|
| - catchInitializationError(builder, ex);
|
| + catchInitializationError(builder, ex);
|
| setUpPageStatus = 'complete';
|
| }
|
| }
|
|
|
| -
|
| -
|
| //
|
| -// This method is called on the completion of
|
| +// This method is called on the completion of
|
| // each asychronous load started in setUpTests.
|
| //
|
| // When every synchronous loaded document has completed,
|
| @@ -69,11 +65,10 @@ function loadComplete() {
|
| }
|
| }
|
|
|
| -
|
| /**
|
| -*
|
| +*
|
| Test if XPathEvaluator.evaluate properly throws NOT_SUPPORTED_ERROR
|
| -
|
| +
|
| * @author Philippe Le Hégaret
|
| * @author Bob Clary
|
| * @see http://www.w3.org/TR/2003/CR-DOM-Level-3-XPath-20030331/xpath#XPathEvaluator-evaluate
|
| @@ -89,7 +84,7 @@ function XPathEvaluator_evaluate_NOT_SUPPORTED_ERR() {
|
| var nullResult = null;
|
|
|
| var contextNode;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| @@ -97,23 +92,20 @@ function XPathEvaluator_evaluate_NOT_SUPPORTED_ERR() {
|
| doc = load(docRef, "doc", "staffNS");
|
| xpEvaluator = createXPathEvaluator(doc);
|
| contextNode = doc.createEntityReference("entityname");
|
| -
|
| - {
|
| - success = false;
|
| - try {
|
| +
|
| + {
|
| + success = false;
|
| + try {
|
| result = xpEvaluator.evaluate("//foo:bar",contextNode,nullNSResolver,0,nullResult);
|
| }
|
| - catch(ex) {
|
| + catch(ex) {
|
| success = (typeof(ex.code) != 'undefined' && ex.code == 9);
|
| - }
|
| - assertTrue("throw_NOT_SUPPORTED_ERR",success);
|
| - }
|
| + }
|
| + assertTrue("throw_NOT_SUPPORTED_ERR",success);
|
| + }
|
|
|
| }
|
|
|
| -
|
| -
|
| -
|
| function runTest() {
|
| XPathEvaluator_evaluate_NOT_SUPPORTED_ERR();
|
| }
|
|
|