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

[jorlow at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit fb3c157ed914dddeff255310569f44c3859ac12d
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 13:15:28 2010 +0000

    2010-09-03  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Steve Block.
    
            Fix and beef up IndexedDB layout test
            https://bugs.webkit.org/show_bug.cgi?id=45035
    
            Implement some fixmes and such.
    
            * storage/indexeddb/database-basics-expected.txt:
            * storage/indexeddb/script-tests/database-basics.js:
            (openSuccess):
            (setVersionAgain):
            (createObjectStore):
            (checkObjectStore):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0f5a260..47a7f77 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-03  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Steve Block.
+
+        Fix and beef up IndexedDB layout test
+        https://bugs.webkit.org/show_bug.cgi?id=45035
+
+        Implement some fixmes and such.
+
+        * storage/indexeddb/database-basics-expected.txt:
+        * storage/indexeddb/script-tests/database-basics.js:
+        (openSuccess):
+        (setVersionAgain):
+        (createObjectStore):
+        (checkObjectStore):
+
 2010-08-31  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/LayoutTests/storage/indexeddb/database-basics-expected.txt b/LayoutTests/storage/indexeddb/database-basics-expected.txt
index 1321f4d..fc224cc 100644
--- a/LayoutTests/storage/indexeddb/database-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/database-basics-expected.txt
@@ -23,11 +23,6 @@ PASS 'readyState' in event.target is true
 PASS event.target.readyState is event.target.DONE
 
 db = event.result
-PASS db.name is "name"
-PASS db.objectStores is []
-PASS db.objectStores.length is 0
-PASS db.objectStores.contains('') is false
-
 Testing setVersion.
 db.setVersion("version a")
 PASS 'onsuccess' in result is true
@@ -36,6 +31,18 @@ PASS 'abort' in result is true
 PASS 'readyState' in result is true
 An event should fire shortly...
 
+Success event fired:
+PASS 'result' in event is true
+PASS 'code' in event is false
+PASS 'message' in event is false
+PASS 'source' in event is true
+PASS event.source != null is true
+PASS 'onsuccess' in event.target is true
+PASS 'onerror' in event.target is true
+PASS 'abort' in event.target is true
+PASS 'readyState' in event.target is true
+PASS event.target.readyState is event.target.DONE
+
 db.setVersion("version b")
 PASS 'onsuccess' in result is true
 PASS 'onerror' in result is true
@@ -43,8 +50,47 @@ PASS 'abort' in result is true
 PASS 'readyState' in result is true
 An event should fire shortly...
 
+Success event fired:
+PASS 'result' in event is true
+PASS 'code' in event is false
+PASS 'message' in event is false
+PASS 'source' in event is true
+PASS event.source != null is true
+PASS 'onsuccess' in event.target is true
+PASS 'onerror' in event.target is true
+PASS 'abort' in event.target is true
+PASS 'readyState' in event.target is true
+PASS event.target.readyState is event.target.DONE
+
 PASS db.version is "version b"
+PASS db.name is "name"
+PASS db.objectStores is []
+PASS db.objectStores.length is 0
+PASS db.objectStores.contains('') is false
+db.createObjectStore("test123")
+PASS 'onsuccess' in result is true
+PASS 'onerror' in result is true
+PASS 'abort' in result is true
+PASS 'readyState' in result is true
+An event should fire shortly...
+
+Success event fired:
+PASS 'result' in event is true
+PASS 'code' in event is false
+PASS 'message' in event is false
+PASS 'source' in event is true
+PASS event.source != null is true
+PASS 'onsuccess' in event.target is true
+PASS 'onerror' in event.target is true
+PASS 'abort' in event.target is true
+PASS 'readyState' in event.target is true
+PASS event.target.readyState is event.target.DONE
+
+PASS db.objectStores is ['test123']
+PASS db.objectStores.length is 1
+PASS db.objectStores.contains('') is false
+PASS db.objectStores.contains('test456') is false
+PASS db.objectStores.contains('test123') is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
-
diff --git a/LayoutTests/storage/indexeddb/script-tests/database-basics.js b/LayoutTests/storage/indexeddb/script-tests/database-basics.js
index 04ebbd3..10139fe 100644
--- a/LayoutTests/storage/indexeddb/script-tests/database-basics.js
+++ b/LayoutTests/storage/indexeddb/script-tests/database-basics.js
@@ -7,15 +7,13 @@ function openSuccess()
     verifySuccessEvent(event);
 
     var db = evalAndLog("db = event.result");
-    shouldBeEqualToString("db.name", "name");
-    shouldBe("db.objectStores", "[]");
-    shouldBe("db.objectStores.length", "0");
-    shouldBe("db.objectStores.contains('')", "false");
-    // FIXME: Test .item() once it's possible to get back a non-empty list.
+    deleteAllObjectStores(db);
 
-    // FIXME: Test the other properties of IDBDatabase as they're written.
+    // We must do something asynchronous before anything synchronous since
+    // deleteAllObjectStores only schedules the object stores to be removed.
+    // We don't know for sure whether it's happened until an IDBRequest object
+    // that was created after the removes fires.
 
-    debug("");
     debug("Testing setVersion.");
     result = evalAndLog('db.setVersion("version a")');
     verifyResult(result);
@@ -25,15 +23,37 @@ function openSuccess()
 
 function setVersionAgain()
 {
+    verifySuccessEvent(event);
+
     result = evalAndLog('db.setVersion("version b")');
     verifyResult(result);
-    result.onsuccess = checkVersion;
+    result.onsuccess = createObjectStore;
     result.onError = unexpectedErrorCallback;
 }
 
-function checkVersion()
+function createObjectStore()
 {
+    verifySuccessEvent(event);
     shouldBeEqualToString("db.version", "version b");
+    shouldBeEqualToString("db.name", "name");
+    shouldBe("db.objectStores", "[]");
+    shouldBe("db.objectStores.length", "0");
+    shouldBe("db.objectStores.contains('')", "false");
+
+    result = evalAndLog('db.createObjectStore("test123")');
+    verifyResult(result);
+    result.onsuccess = checkObjectStore;
+    result.onError = unexpectedErrorCallback;
+}
+
+function checkObjectStore()
+{
+    verifySuccessEvent(event);
+    shouldBe("db.objectStores", "['test123']");
+    shouldBe("db.objectStores.length", "1");
+    shouldBe("db.objectStores.contains('')", "false");
+    shouldBe("db.objectStores.contains('test456')", "false");
+    shouldBe("db.objectStores.contains('test123')", "true");
 
     done();
 }

-- 
WebKit Debian packaging