[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit ec51430820a757d10ea9f19771b643f589860abf
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 10:11:05 2010 +0000

    2010-08-24  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            r65878 broke fast/dom/document-attribute-js-null.html
    
            * fast/dom/document-attribute-js-null-expected.txt:
            * fast/dom/document-attribute-js-null.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65885 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 69a8997..59f42dc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-24  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        r65878 broke fast/dom/document-attribute-js-null.html
+
+        * fast/dom/document-attribute-js-null-expected.txt:
+        * fast/dom/document-attribute-js-null.html:
+
 2010-08-24  Roland Steiner  <rolandsteiner at chromium.org>
 
         Unreviewed: trim duplicated entry from Chromium test_expectations.txt
diff --git a/LayoutTests/fast/dom/document-attribute-js-null-expected.txt b/LayoutTests/fast/dom/document-attribute-js-null-expected.txt
index fa5934b..9e15ea1 100644
--- a/LayoutTests/fast/dom/document-attribute-js-null-expected.txt
+++ b/LayoutTests/fast/dom/document-attribute-js-null-expected.txt
@@ -1,6 +1,6 @@
 This test setting various attributes of documents to JavaScript null.
 
-TEST SUCCEEDED: The value was null. [tested Document.xmlVersion]
+TEST SUCCEEDED: Got the expected exception (9). [tested Document.xmlVersion]
 TEST SUCCEEDED: The value was null. [tested Document.documentURI]
 TEST SUCCEEDED: The value was undefined. [tested Document.charset]
 TEST SUCCEEDED: The value was null. [tested Document.selectedStylesheetSet]
diff --git a/LayoutTests/fast/dom/document-attribute-js-null.html b/LayoutTests/fast/dom/document-attribute-js-null.html
index 60d9d83..df0d16e 100644
--- a/LayoutTests/fast/dom/document-attribute-js-null.html
+++ b/LayoutTests/fast/dom/document-attribute-js-null.html
@@ -24,15 +24,24 @@
             return "the string '" + result + "'";
         }
 
-        function nullTestDocumentAttribute(documentType, doc, attr, expected)
+        function nullTestDocumentAttribute(documentType, doc, attr, expected, expectedExceptionCode)
         {
-            doc[attr] = null;
-
             var result;
-            if (doc[attr] === expected)
-                result = "<span class='pass'>TEST SUCCEEDED:</span> The value was " + resultStringifier(expected) + ".";
-            else
-                result = "<span class='fail'>TEST FAILED:</span> The value should have been " + resultStringifier(expected) + " but was " + resultStringifier(doc[attr]) + ".";
+            try {
+                doc[attr] = null;
+                if (expectedExceptionCode != undefined)
+                    result = "<span class='fail'>TEST FAILED:</span> Should've thrown " + expectedExceptionCode + " but threw nothing.";
+                else if (doc[attr] === expected)
+                    result = "<span class='pass'>TEST SUCCEEDED:</span> The value was " + resultStringifier(expected) + ".";
+                else
+                    result = "<span class='fail'>TEST FAILED:</span> The value should have been " + resultStringifier(expected) + " but was " + resultStringifier(doc[attr]) + ".";
+
+            } catch (ex) {
+                if (ex.code == expectedExceptionCode)
+                    result = "<span class='pass'>TEST SUCCEEDED:</span> Got the expected exception (" + ex.code + ").";
+                else
+                    result = "<span class='fail'>TEST FAILED:</span> Should've thrown " + expectedExceptionCode + " but threw " + ex.code + ".";
+            }
 
             result += " [tested " + documentType + "." + attr + "]";
             printOut(result);
@@ -55,7 +64,7 @@
                     typeName: 'Document',
                     docToUse: xmlDoc,
                     attributes: [
-                        {name: 'xmlVersion', expectedNull: null},
+                        {name: 'xmlVersion', expectedExceptionCode: 9},
                         {name: 'documentURI', expectedNull: null},
                         {name: 'charset', expectedNull: undefined},
                         {name: 'selectedStylesheetSet', expectedNull: null}
@@ -83,7 +92,7 @@
                 var docToUse = listing[doc].docToUse;
                 var attrs = listing[doc].attributes;
                 for (attr in attrs) {
-                    nullTestDocumentAttribute(typeName, docToUse, attrs[attr].name, attrs[attr].expectedNull);
+                    nullTestDocumentAttribute(typeName, docToUse, attrs[attr].name, attrs[attr].expectedNull, attrs[attr].expectedExceptionCode);
                 }
                 printOut('');
             }

-- 
WebKit Debian packaging