| Index: LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.js
|
| diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.js b/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.js
|
| index ae67154880832542adcc01c808590e102d08e2b8..b328697e0a12bb39e5c1fd56da4592ca7aa2c2da 100644
|
| --- a/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.js
|
| +++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.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 an XPathResult UNORDERED_NODE_ITERATOR_TYPE XPathResultType for
|
| +*
|
| + Create an XPathResult UNORDERED_NODE_ITERATOR_TYPE XPathResultType for
|
| expression /staff/employee/employeeId/text() checking that:
|
| XPathResult.iteratorNext contains the correct number of nodes.
|
| -
|
| +
|
| * @author Bob Clary
|
| * @see http://www.w3.org/TR/2003/CR-DOM-Level-3-XPath-20030331/xpath#XPathResult-iteratorNext
|
| * @see http://www.w3.org/TR/2003/CR-DOM-Level-3-XPath-20030331/xpath#XPathResult
|
| @@ -111,7 +106,7 @@ function XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE() {
|
| var owner;
|
| var ownerType;
|
| var index;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| @@ -123,22 +118,19 @@ resolver = evaluator.createNSResolver(doc);
|
| outresult = evaluator.evaluate(expression,contextNode,resolver,xpathType,inresult);
|
| index = 0;
|
| outNode = outresult.iterateNext();
|
| -
|
| +
|
| while(
|
| -
|
| - (outNode != null)
|
|
|
| - ) {
|
| - index += 1;
|
| -outNode = outresult.iterateNext();
|
| -
|
| - }
|
| -assertEquals("count",4,index);
|
| -
|
| -}
|
| + (outNode != null)
|
|
|
| + ) {
|
| + index += 1;
|
| +outNode = outresult.iterateNext();
|
|
|
| + }
|
| +assertEquals("count",4,index);
|
|
|
| +}
|
|
|
| function runTest() {
|
| XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE();
|
|
|