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

yurys at chromium.org yurys at chromium.org
Wed Dec 22 13:13:48 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6a5b30563521898288b3e5ec45a08a693a21d26e
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 06:58:42 2010 +0000

    2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: add a sanity test for DOM storage view in the storage panel
            https://bugs.webkit.org/show_bug.cgi?id=45294
    
            * inspector/storage-panel-dom-storage-expected.txt: Added.
            * inspector/storage-panel-dom-storage.html: Added.
    2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: add a sanity test for DOM storage view in the storage panel
            https://bugs.webkit.org/show_bug.cgi?id=45294
    
            * src/js/Tests.js: removed testStoragePanel which was superseded by inspector layout tests.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67067 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1d97b1d..7502f2c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: add a sanity test for DOM storage view in the storage panel
+        https://bugs.webkit.org/show_bug.cgi?id=45294
+
+        * inspector/storage-panel-dom-storage-expected.txt: Added.
+        * inspector/storage-panel-dom-storage.html: Added.
+
 2010-09-08  Fumitoshi Ukai  <ukai at chromium.org>
 
         Unreviewed.
diff --git a/LayoutTests/inspector/storage-panel-dom-storage-expected.txt b/LayoutTests/inspector/storage-panel-dom-storage-expected.txt
new file mode 100644
index 0000000..b7d210f
--- /dev/null
+++ b/LayoutTests/inspector/storage-panel-dom-storage-expected.txt
@@ -0,0 +1,11 @@
+Test that storage panel is present and that it contains correct data for local and session DOM storages.
+
+Populated local and session storage
+Did show: Local storage
+Did show: Session storage
+Local storage content: 
+KeyValuea0=value0, a6=value6, a8=value8, a4=value4, a2=value2, a1=value1, a9=value9, a3=value3, a7=value7, a5=value5, 
+Session storage content: 
+KeyValueb5=value15, b4=value14, b3=value13, b6=value16, b7=value17, b0=value10, b9=value19, b8=value18, b2=value12, b1=value11, 
+DONE
+
diff --git a/LayoutTests/inspector/storage-panel-dom-storage.html b/LayoutTests/inspector/storage-panel-dom-storage.html
new file mode 100644
index 0000000..73988bf
--- /dev/null
+++ b/LayoutTests/inspector/storage-panel-dom-storage.html
@@ -0,0 +1,61 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test2.js"></script>
+<script src="../http/tests/inspector/debugger-test2.js"></script>
+<script>
+
+function populateDOMStorage()
+{
+    localStorage.clear();
+    sessionStorage.clear();
+    // Fill local and session storage with some random strings.
+    for (var i = 0; i < 10; i++) {
+        localStorage["a" + i] = "=value" + i + ", ";
+        sessionStorage["b" + i] = "=value" + (i+10) + ", ";
+    }
+}
+
+function test()
+{
+    WebInspector.showPanel("storage");
+
+    InspectorTest.evaluateInConsole("populateDOMStorage()", function(result) {
+        InspectorTest.addResult("Populated local and session storage");
+    });
+    function name(storage) {
+        return storage.isLocalStorage ? "Local storage" : "Session storage";
+    }
+    InspectorTest.runAfterPendingDispatches(function() {
+        var storages = WebInspector.panels.storage._domStorage;
+        if (storages) {
+            for (var i = 0; i < storages.length; i++) {
+                var storage = storages[i];
+                WebInspector.currentPanel.showDOMStorage(storage);
+                InspectorTest.addResult("Did show: " + name(storage));
+            }
+        } else
+            InspectorTest.addResult("FAIL: no DOM storages found.");
+
+        InspectorTest.runAfterPendingDispatches(function() {
+            var storages = WebInspector.panels.storage._domStorage;
+            for (var i = 0; i < storages.length; i++) {
+                var storage = storages[i];
+                InspectorTest.addResult(name(storage) + " content: ");
+                InspectorTest.addResult(storage._domStorageView.element.textContent);
+            }
+            InspectorTest.addResult("DONE");
+            InspectorTest.completeTest();
+        });
+    });
+}
+
+</script>
+</head>
+
+<body onload="runTest()">
+<p>
+Test that storage panel is present and that it contains correct data for local and session DOM storages.
+</p>
+
+</body>
+</html>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b5e654f..357779b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Joseph Pecoraro.
 
+        Web Inspector: add a sanity test for DOM storage view in the storage panel
+        https://bugs.webkit.org/show_bug.cgi?id=45294
+
+        * src/js/Tests.js: removed testStoragePanel which was superseded by inspector layout tests.
+
+2010-09-08  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
         Web Inspector: test that debugger won't pause on syntax errors
         https://bugs.webkit.org/show_bug.cgi?id=45388
 
diff --git a/WebKit/chromium/src/js/Tests.js b/WebKit/chromium/src/js/Tests.js
index 40bb130..2233463 100644
--- a/WebKit/chromium/src/js/Tests.js
+++ b/WebKit/chromium/src/js/Tests.js
@@ -1237,43 +1237,6 @@ TestSuite.createKeyEvent = function(keyIdentifier)
 
 
 /**
- * Tests that Storage panel can be open and that local DOM storage is added
- * to the panel.
- */
-TestSuite.prototype.testShowStoragePanel = function()
-{
-    var test = this;
-    this.addSniffer(WebInspector.panels.storage, "addDOMStorage",
-        function(storage) {
-            var orig = storage.getEntries;
-            storage.getEntries = function(callback) {
-                orig.call(this, function(entries) {
-                    callback(entries);
-                    test.releaseControl();
-                });
-            };
-            try {
-                WebInspector.currentPanel.selectDOMStorage(storage.id);
-                storage.getEntries = orig;
-            } catch (e) {
-                test.fail("Exception in selectDOMStorage: " + e);
-            }
-        });
-    this.showPanel("storage");
-
-    // Access localStorage so that it's pushed to the frontend.
-    this.evaluateInConsole_(
-        'setTimeout("localStorage.x = 10" , 0)',
-        function(resultText) {
-            test.assertTrue(!isNaN(resultText), "Failed to get timer id: " + resultText);
-        });
-
-    // Wait until DOM storage is added to the panel.
-    this.takeControl();
-};
-
-
-/**
  * Test runner for the test suite.
  */
 var uiTests = {};

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list