| Index: LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.js
|
| diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.js b/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.js
|
| index 919e801b81ecc6e1222d503fb2083aa53558a6a0..be4efa8e4c6f10259a3a0cb0b7cc1a415b309798 100644
|
| --- a/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.js
|
| +++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_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", "staff");
|
| -
|
| +
|
| 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,13 +65,12 @@ function loadComplete() {
|
| }
|
| }
|
|
|
| -
|
| /**
|
| -*
|
| +*
|
| Create a ANY_TYPE XPathResult matching /staff/employee,
|
| modify the Document, then check that XPathResults.iterateNext
|
| throws DOMException INVALID_STATE_ERR.
|
| -
|
| +
|
| * @author Bob Clary
|
| * @see http://www.w3.org/TR/2003/CR-DOM-Level-3-XPath-20030331/xpath#XPathEvaluator
|
| * @see http://www.w3.org/TR/2003/CR-DOM-Level-3-XPath-20030331/xpath#XPathEvaluator-createNSResolver
|
| @@ -114,7 +109,7 @@ function XPathResult_iterateNext_INVALID_STATE_ERR() {
|
| var ownerType;
|
| var employee;
|
| var docElement;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| @@ -128,23 +123,20 @@ outresult = evaluator.evaluate(expression,contextNode,resolver,xpathType,inresul
|
|
|
| employee = doc.createElement("employee");
|
| employee = docElement.appendChild(employee);
|
| -
|
| - {
|
| - success = false;
|
| - try {
|
| +
|
| + {
|
| + success = false;
|
| + try {
|
| outNode = outresult.iterateNext();
|
| }
|
| - catch(ex) {
|
| + catch(ex) {
|
| success = (typeof(ex.code) != 'undefined' && ex.code == 11);
|
| - }
|
| - assertTrue("throw_INVALID_STATE_ERR",success);
|
| - }
|
| + }
|
| + assertTrue("throw_INVALID_STATE_ERR",success);
|
| + }
|
|
|
| }
|
|
|
| -
|
| -
|
| -
|
| function runTest() {
|
| XPathResult_iterateNext_INVALID_STATE_ERR();
|
| }
|
|
|