[webkit-changes] [133742] trunk/LayoutTests

Wed, 07 Nov 2012 05:34:07 -0800

Title: [133742] trunk/LayoutTests
Revision
133742
Author
vse...@chromium.org
Date
2012-11-07 05:35:35 -0800 (Wed, 07 Nov 2012)

Log Message

Unreviewed inspector test polish.
Made http/tests/indexeddb/database-data.html test faster, added more verbose errors for test debugging.

* http/tests/inspector/indexeddb/database-data-expected.txt:
* http/tests/inspector/indexeddb/database-data.html:
* http/tests/inspector/indexeddb/indexeddb-test.js:
(onIndexedDBError):
(onIndexedDBBlocked):
(doWithDatabase):

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (133741 => 133742)


--- trunk/LayoutTests/ChangeLog	2012-11-07 13:35:13 UTC (rev 133741)
+++ trunk/LayoutTests/ChangeLog	2012-11-07 13:35:35 UTC (rev 133742)
@@ -1,3 +1,15 @@
+2012-11-07  Vsevolod Vlasov  <vse...@chromium.org>
+
+        Unreviewed inspector test polish.
+        Made http/tests/indexeddb/database-data.html test faster, added more verbose errors for test debugging.
+
+        * http/tests/inspector/indexeddb/database-data-expected.txt:
+        * http/tests/inspector/indexeddb/database-data.html:
+        * http/tests/inspector/indexeddb/indexeddb-test.js:
+        (onIndexedDBError):
+        (onIndexedDBBlocked):
+        (doWithDatabase):
+
 2012-11-07  Raphael Kubo da Costa  <raphael.kubo.da.co...@intel.com>
 
         [EFL] Gardening. Add or fix a few pixel expectations.

Modified: trunk/LayoutTests/http/tests/inspector/indexeddb/database-data-expected.txt (133741 => 133742)


--- trunk/LayoutTests/http/tests/inspector/indexeddb/database-data-expected.txt	2012-11-07 13:35:13 UTC (rev 133741)
+++ trunk/LayoutTests/http/tests/inspector/indexeddb/database-data-expected.txt	2012-11-07 13:35:35 UTC (rev 133742)
@@ -9,80 +9,60 @@
 CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback7
 CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback8
 CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback9
+CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
 CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback10
+CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
 CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback11
 CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback12
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback13
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback14
-CONSOLE MESSAGE: line 108: InspectorTest.IndexedDB_callback15
 Tests that data is correctly loaded by IndexedDBModel from IndexedDB object store and index.
 
-Dumping values, fromIndex = false, skipCount = 0, pageSize = 3, idbKeyRange = null
+Dumping values, fromIndex = false, skipCount = 0, pageSize = 2, idbKeyRange = null
     Key = key_01, primaryKey = key_01, value = {"key":"key_01","value":"value_01"}
     Key = key_02, primaryKey = key_02, value = {"key":"key_02","value":"value_02"}
-    Key = key_03, primaryKey = key_03, value = {"key":"key_03","value":"value_03"}
     hasMore = true
-Dumping values, fromIndex = false, skipCount = 3, pageSize = 3, idbKeyRange = null
+Dumping values, fromIndex = false, skipCount = 2, pageSize = 2, idbKeyRange = null
+    Key = key_03, primaryKey = key_03, value = {"key":"key_03","value":"value_03"}
     Key = key_04, primaryKey = key_04, value = {"key":"key_04","value":"value_04"}
+    hasMore = true
+Dumping values, fromIndex = false, skipCount = 4, pageSize = 2, idbKeyRange = null
     Key = key_05, primaryKey = key_05, value = {"key":"key_05","value":"value_05"}
     Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
-    hasMore = true
-Dumping values, fromIndex = false, skipCount = 6, pageSize = 3, idbKeyRange = null
-    Key = key_07, primaryKey = key_07, value = {"key":"key_07","value":"value_07"}
-    Key = key_08, primaryKey = key_08, value = {"key":"key_08","value":"value_08"}
-    Key = key_09, primaryKey = key_09, value = {"key":"key_09","value":"value_09"}
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 7, pageSize = 3, idbKeyRange = null
-    Key = key_08, primaryKey = key_08, value = {"key":"key_08","value":"value_08"}
-    Key = key_09, primaryKey = key_09, value = {"key":"key_09","value":"value_09"}
+Dumping values, fromIndex = false, skipCount = 5, pageSize = 2, idbKeyRange = null
+    Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 9, pageSize = 3, idbKeyRange = null
+Dumping values, fromIndex = false, skipCount = 6, pageSize = 2, idbKeyRange = null
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 10, pageSize = 3, idbKeyRange = null
+Dumping values, fromIndex = false, skipCount = 7, pageSize = 2, idbKeyRange = null
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 0, pageSize = 4, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_07",upperOpen:false}
+Dumping values, fromIndex = false, skipCount = 0, pageSize = 2, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_05",upperOpen:false}
     Key = key_03, primaryKey = key_03, value = {"key":"key_03","value":"value_03"}
     Key = key_04, primaryKey = key_04, value = {"key":"key_04","value":"value_04"}
-    Key = key_05, primaryKey = key_05, value = {"key":"key_05","value":"value_05"}
-    Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
     hasMore = true
-Dumping values, fromIndex = false, skipCount = 0, pageSize = 5, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_07",upperOpen:false}
+Dumping values, fromIndex = false, skipCount = 0, pageSize = 3, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_05",upperOpen:false}
     Key = key_03, primaryKey = key_03, value = {"key":"key_03","value":"value_03"}
     Key = key_04, primaryKey = key_04, value = {"key":"key_04","value":"value_04"}
     Key = key_05, primaryKey = key_05, value = {"key":"key_05","value":"value_05"}
-    Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
-    Key = key_07, primaryKey = key_07, value = {"key":"key_07","value":"value_07"}
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 0, pageSize = 6, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_07",upperOpen:false}
+Dumping values, fromIndex = false, skipCount = 0, pageSize = 4, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_05",upperOpen:false}
     Key = key_03, primaryKey = key_03, value = {"key":"key_03","value":"value_03"}
     Key = key_04, primaryKey = key_04, value = {"key":"key_04","value":"value_04"}
     Key = key_05, primaryKey = key_05, value = {"key":"key_05","value":"value_05"}
-    Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
-    Key = key_07, primaryKey = key_07, value = {"key":"key_07","value":"value_07"}
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 1, pageSize = 4, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_07",upperOpen:false}
+Dumping values, fromIndex = false, skipCount = 1, pageSize = 2, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_05",upperOpen:false}
     Key = key_04, primaryKey = key_04, value = {"key":"key_04","value":"value_04"}
     Key = key_05, primaryKey = key_05, value = {"key":"key_05","value":"value_05"}
-    Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
-    Key = key_07, primaryKey = key_07, value = {"key":"key_07","value":"value_07"}
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 1, pageSize = 5, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_07",upperOpen:false}
+Dumping values, fromIndex = false, skipCount = 1, pageSize = 3, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_05",upperOpen:false}
     Key = key_04, primaryKey = key_04, value = {"key":"key_04","value":"value_04"}
     Key = key_05, primaryKey = key_05, value = {"key":"key_05","value":"value_05"}
-    Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
-    Key = key_07, primaryKey = key_07, value = {"key":"key_07","value":"value_07"}
     hasMore = false
-Dumping values, fromIndex = false, skipCount = 1, pageSize = 6, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_07",upperOpen:false}
+Dumping values, fromIndex = false, skipCount = 1, pageSize = 4, idbKeyRange = {lower:"key_02",lowerOpen:true,upper:"key_05",upperOpen:false}
     Key = key_04, primaryKey = key_04, value = {"key":"key_04","value":"value_04"}
     Key = key_05, primaryKey = key_05, value = {"key":"key_05","value":"value_05"}
-    Key = key_06, primaryKey = key_06, value = {"key":"key_06","value":"value_06"}
-    Key = key_07, primaryKey = key_07, value = {"key":"key_07","value":"value_07"}
     hasMore = false
-Dumping values, fromIndex = true, skipCount = 0, pageSize = 3, idbKeyRange = null
+Dumping values, fromIndex = true, skipCount = 0, pageSize = 2, idbKeyRange = null
     Key = value_01, primaryKey = key_01, value = {"key":"key_01","value":"value_01"}
     Key = value_02, primaryKey = key_02, value = {"key":"key_02","value":"value_02"}
-    Key = value_03, primaryKey = key_03, value = {"key":"key_03","value":"value_03"}
     hasMore = true

Modified: trunk/LayoutTests/http/tests/inspector/indexeddb/database-data.html (133741 => 133742)


--- trunk/LayoutTests/http/tests/inspector/indexeddb/database-data.html	2012-11-07 13:35:13 UTC (rev 133741)
+++ trunk/LayoutTests/http/tests/inspector/indexeddb/database-data.html	2012-11-07 13:35:35 UTC (rev 133742)
@@ -91,7 +91,7 @@
 
         function step4()
         {
-            addIDBValues(9, refreshDatabaseNames);
+            addIDBValues(6, refreshDatabaseNames);
         }
     }
 
@@ -110,61 +110,61 @@
     function runObjectStoreTests()
     {
         indexedDBModel.removeEventListener(WebInspector.IndexedDBModel.EventTypes.DatabaseLoaded, runObjectStoreTests);
-        loadValuesAndDump(false, null, 0, 3, step2)
+        loadValuesAndDump(false, null, 0, 2, step2)
 
         function step2()
         {
-            loadValuesAndDump(false, null, 3, 3, step3)
+            loadValuesAndDump(false, null, 2, 2, step3)
         }
 
         function step3()
         {
-            loadValuesAndDump(false, null, 6, 3, step4);
+            loadValuesAndDump(false, null, 4, 2, step4);
         }
 
         function step4()
         {
-            loadValuesAndDump(false, null, 7, 3, step5);
+            loadValuesAndDump(false, null, 5, 2, step5);
         }
 
         function step5()
         {
-            loadValuesAndDump(false, null, 9, 3, step6);
+            loadValuesAndDump(false, null, 6, 2, step6);
         }
 
         function step6()
         {
-            loadValuesAndDump(false, null, 10, 3, step7);
+            loadValuesAndDump(false, null, 7, 2, step7);
         }
 
         function step7()
         {
-            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_07", true, false), 0, 4, step8);
+            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_05", true, false), 0, 2, step8);
         }
 
         function step8()
         {
-            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_07", true, false), 0, 5, step9);
+            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_05", true, false), 0, 3, step9);
         }
 
         function step9()
         {
-            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_07", true, false), 0, 6, step10);
+            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_05", true, false), 0, 4, step10);
         }
 
         function step10()
         {
-            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_07", true, false), 1, 4, step11);
+            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_05", true, false), 1, 2, step11);
         }
 
         function step11()
         {
-            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_07", true, false), 1, 5, step12);
+            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_05", true, false), 1, 3, step12);
         }
 
         function step12()
         {
-            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_07", true, false), 1, 6, step13);
+            loadValuesAndDump(false, IDBKeyRange.bound("key_02", "key_05", true, false), 1, 4, step13);
         }
 
         function step13()
@@ -175,7 +175,7 @@
 
     function runIndexTests()
     {
-        loadValuesAndDump(true, null, 0, 3, step2)
+        loadValuesAndDump(true, null, 0, 2, step2)
 
         function step2()
         {

Modified: trunk/LayoutTests/http/tests/inspector/indexeddb/indexeddb-test.js (133741 => 133742)


--- trunk/LayoutTests/http/tests/inspector/indexeddb/indexeddb-test.js	2012-11-07 13:35:13 UTC (rev 133741)
+++ trunk/LayoutTests/http/tests/inspector/indexeddb/indexeddb-test.js	2012-11-07 13:35:35 UTC (rev 133742)
@@ -110,9 +110,14 @@
 
 function onIndexedDBError(e)
 {
-    console.log(e);
+    console.error("IndexedDB error: " + e);
 }
 
+function onIndexedDBBlocked(e)
+{
+    console.error("IndexedDB blocked: " + e);
+}
+
 function doWithDatabase(databaseName, callback)
 {
     function innerCallback()
@@ -122,7 +127,7 @@
     }
 
     var request = indexedDB.open(databaseName);
-    request._onblocked_ = onIndexedDBError;
+    request._onblocked_ = onIndexedDBBlocked;
     request._onerror_ = onIndexedDBError;
     request._onsuccess_ = innerCallback;
 }
@@ -134,7 +139,7 @@
     function step2(db)
     {
         var request = db.setVersion(Number(db.version) + 1);
-        request._onblocked_ = onIndexedDBError;
+        request._onblocked_ = onIndexedDBBlocked;
         request._onerror_ = onIndexedDBError;
         request._onsuccess_ = step3;
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to