| Index: LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.js
|
| diff --git a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.js b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.js
|
| index 6ec2413bead74f303eaa2b0240bf909a0785ea9d..1458f539297ec862dec3d48728a2045846f39441 100644
|
| --- a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.js
|
| +++ b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_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,32 +36,30 @@ function setUpPage() {
|
| builder = createConfiguredBuilder();
|
|
|
| docsLoaded = 0;
|
| -
|
| +
|
| var doc1Ref = null;
|
| if (typeof(this.doc1) != 'undefined') {
|
| doc1Ref = this.doc1;
|
| }
|
| docsLoaded += preload(doc1Ref, "doc1", "staffNS");
|
| -
|
| +
|
| var doc2Ref = null;
|
| if (typeof(this.doc2) != 'undefined') {
|
| doc2Ref = this.doc2;
|
| }
|
| docsLoaded += preload(doc2Ref, "doc2", "staff");
|
| -
|
| +
|
| if (docsLoaded == 2) {
|
| 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,
|
| @@ -75,11 +71,10 @@ function loadComplete() {
|
| }
|
| }
|
|
|
| -
|
| /**
|
| -*
|
| +*
|
| Test if XPathExpression.evaluate properly throws WRONG_DOCUMENT_ERROR
|
| -
|
| +
|
| * @author Philippe Le Hégaret
|
| * @author Bob Clary
|
| * @see http://www.w3.org/TR/2003/CR-DOM-Level-3-XPath-20030331/xpath#XPathExpression-evaluate
|
| @@ -97,13 +92,13 @@ function XPathExpression_evaluate_WRONG_DOCUMENT_ERR() {
|
| var nullResult = null;
|
|
|
| var xpathExpression;
|
| -
|
| +
|
| var doc1Ref = null;
|
| if (typeof(this.doc1) != 'undefined') {
|
| doc1Ref = this.doc1;
|
| }
|
| doc1 = load(doc1Ref, "doc1", "staffNS");
|
| -
|
| +
|
| var doc2Ref = null;
|
| if (typeof(this.doc2) != 'undefined') {
|
| doc2Ref = this.doc2;
|
| @@ -113,23 +108,19 @@ function XPathExpression_evaluate_WRONG_DOCUMENT_ERR() {
|
| xpathExpression = xpEvaluator.createExpression("//foo",nullNSResolver);
|
| root = doc2.documentElement;
|
|
|
| -
|
| - {
|
| - success = false;
|
| - try {
|
| + {
|
| + success = false;
|
| + try {
|
| result = xpathExpression.evaluate(root,0,nullResult);
|
| }
|
| - catch(ex) {
|
| + catch(ex) {
|
| success = (typeof(ex.code) != 'undefined' && ex.code == 4);
|
| - }
|
| - assertTrue("throw_WRONG_DOCUMENT_ERR",success);
|
| - }
|
| + }
|
| + assertTrue("throw_WRONG_DOCUMENT_ERR",success);
|
| + }
|
|
|
| }
|
|
|
| -
|
| -
|
| -
|
| function runTest() {
|
| XPathExpression_evaluate_WRONG_DOCUMENT_ERR();
|
| }
|
|
|