| Index: LayoutTests/dom/xhtml/level3/core/canonicalform06.js
|
| diff --git a/LayoutTests/dom/xhtml/level3/core/canonicalform06.js b/LayoutTests/dom/xhtml/level3/core/canonicalform06.js
|
| index 8ba9e2fa96b0094827d78e2d7bd0cab8adb5b379..e4a1f938c43fc716e28c4a48da7c49cc74d80d64 100644
|
| --- a/LayoutTests/dom/xhtml/level3/core/canonicalform06.js
|
| +++ b/LayoutTests/dom/xhtml/level3/core/canonicalform06.js
|
| @@ -1,17 +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
|
| */
|
|
|
| -
|
| -
|
| /**
|
| * Gets URI that identifies the test.
|
| * @return uri identifier of test
|
| @@ -41,20 +38,18 @@ function setUpPage() {
|
| builder = createConfiguredBuilder();
|
|
|
| docsLoaded = 0;
|
| -
|
| +
|
| if (docsLoaded == 0) {
|
| 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,
|
| @@ -68,9 +63,9 @@ function loadComplete() {
|
|
|
| //DOMErrorMonitor's require a document level variable named errorMonitor
|
| var errorMonitor;
|
| -
|
| +
|
| /**
|
| -*
|
| +*
|
| Create a document with an XML 1.1 valid but XML 1.0 invalid element and
|
| normalize document with canonical-form set to true.
|
|
|
| @@ -91,7 +86,7 @@ function canonicalform06() {
|
| var retval;
|
| var domConfig;
|
| errorMonitor = new DOMErrorMonitor();
|
| -
|
| +
|
| var errors = new Array();
|
|
|
| var error;
|
| @@ -102,31 +97,30 @@ function canonicalform06() {
|
| var canSet;
|
| domImpl = getImplementation();
|
| doc = domImpl.createDocument(nullString,nullString,nullDoctype);
|
| -
|
| - {
|
| - success = false;
|
| - try {
|
| +
|
| + {
|
| + success = false;
|
| + try {
|
| elem = doc.createElementNS("http://www.example.org/domts/wellformed01","LegalNameࢎ");
|
| }
|
| - catch(ex) {
|
| + catch(ex) {
|
| success = (typeof(ex.code) != 'undefined' && ex.code == 5);
|
| - }
|
| - assertTrue("xml10InvalidName",success);
|
| - }
|
| + }
|
| + assertTrue("xml10InvalidName",success);
|
| + }
|
|
|
| try {
|
| doc.xmlVersion = "1.1";
|
|
|
| -
|
| } catch (ex) {
|
| - if (typeof(ex.code) != 'undefined') {
|
| + if (typeof(ex.code) != 'undefined') {
|
| switch(ex.code) {
|
| case /* NOT_SUPPORTED_ERR */ 9 :
|
| return ;
|
| default:
|
| throw ex;
|
| }
|
| - } else {
|
| + } else {
|
| throw ex;
|
| }
|
| }
|
| @@ -137,13 +131,13 @@ doc = domImpl.createDocument(nullString,nullString,nullDoctype);
|
| domConfig = doc.domConfig;
|
|
|
| canSet = domConfig.canSetParameter("canonical-form",true);
|
| -
|
| - if(
|
| - canSet
|
| - ) {
|
| - domConfig.setParameter("canonical-form", true);
|
| - domConfig.setParameter("error-handler", errorMonitor.handleError);
|
| - doc.normalizeDocument();
|
| +
|
| + if(
|
| + canSet
|
| + ) {
|
| + domConfig.setParameter("canonical-form", true);
|
| + domConfig.setParameter("error-handler", errorMonitor.handleError);
|
| + doc.normalizeDocument();
|
| errors = errorMonitor.allErrors;
|
| for(var indexN100B7 = 0;indexN100B7 < errors.length; indexN100B7++) {
|
| error = errors[indexN100B7];
|
| @@ -159,15 +153,12 @@ for(var indexN100B7 = 0;indexN100B7 < errors.length; indexN100B7++) {
|
|
|
| assertSame("relatedNode",elem,relatedNode);
|
|
|
| - }
|
| + }
|
| assertSize("oneError",1,errors);
|
|
|
| - }
|
| -
|
| -}
|
| -
|
| -
|
| + }
|
|
|
| +}
|
|
|
| function runTest() {
|
| canonicalform06();
|
|
|