Changeset 120430 in webkit

Timestamp:

Jun 15, 2012, 2:33:12 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: LayoutTest http/tests/inspector/filesystem/* should clean up FileSystem after test.
​https://bugs.webkit.org/show_bug.cgi?id=89066

Patch by Taiju Tsuiki <​tzik@chromium.org> on 2012-06-15
Reviewed by Vsevolod Vlasov.

• http/tests/inspector/filesystem/filesystem-test.js:

(initialize_FileSystemTest.InspectorTest.clearFileSystem):
(dispatchCallback):
(createDirectory.gotFileSystem):
(createDirectory):
(createFile.gotFileSystem):
(clearFileSystem.gotRoot):
(clearFileSystem.gotRoot.removeAll):
(clearFileSystem.onError):

• http/tests/inspector/filesystem/read-directory.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/filesystem/filesystem-test.js (modified) (2 diffs)
• http/tests/inspector/filesystem/read-directory.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-15  Taiju Tsuiki  <tzik@chromium.org>
+
+        Web Inspector: LayoutTest http/tests/inspector/filesystem/* should clean up FileSystem after test.
+        https://bugs.webkit.org/show_bug.cgi?id=89066
+
+        Reviewed by Vsevolod Vlasov.
+
+        * http/tests/inspector/filesystem/filesystem-test.js:
+        (initialize_FileSystemTest.InspectorTest.clearFileSystem):
+        (dispatchCallback):
+        (createDirectory.gotFileSystem):
+        (createDirectory):
+        (createFile.gotFileSystem):
+        (clearFileSystem.gotRoot):
+        (clearFileSystem.gotRoot.removeAll):
+        (clearFileSystem.onError):
+        * http/tests/inspector/filesystem/read-directory.html:
+
 2012-06-15  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/http/tests/inspector/filesystem/filesystem-test.js

@@ -30 +30 @@
     };
 
+    InspectorTest.clearFileSystem = function(callback)
+    {
+        InspectorTest.evaluateInPage("clearFileSystem(" + InspectorTest.registerCallback(callback) + ")");
+    };
+
     InspectorTest.dumpReadDirectoryResult = function(requestId, errorCode, entries)
     {
@@ -52 +57 @@
 {
     var args = JSON.stringify(Array.prototype.slice.call(arguments));
-    layoutTestController.evaluateInWebInspector(0, "InspectorTest.dispatchCallback(unescape(\"" + escape(args) + "\"))");
+    testRunner.evaluateInWebInspector(999, "InspectorTest.dispatchCallback(unescape(\"" + escape(args) + "\"))");
 }
 
 function createDirectory(path, callback)
 {
-    webkitRequestFileSystem(TEMPORARY, 1, function(fs) {
-        fs.root.getDirectory(path, {create:true}, function(entry) {
+    webkitRequestFileSystem(TEMPORARY, 1, gotFileSystem);
+
+    function gotFileSystem(fileSystem)
+    {
+        fileSystem.root.getDirectory(path, {create:true}, function(entry) {
             callback();
         });
-    });
+    }
 }
 
 function createFile(path, callback)
 {
-    webkitRequestFileSystem(TEMPORARY, 1, function(fs) {
-        fs.root.getFile(path, {create:true}, function(entry) {
+    webkitRequestFileSystem(TEMPORARY, 1, gotFileSystem);
+
+    function gotFileSystem(fileSystem)
+    {
+        fileSystem.root.getFile(path, {create:true}, function(entry) {
             callback();
         });
-    });
+    }
 }
+
+function clearFileSystem(callback)
+{
+    webkitResolveLocalFileSystemURL("filesystem:" + location.origin + "/temporary/", gotRoot, onError);
+
+    function gotRoot(root)
+    {
+        var reader = root.createReader();
+        reader.readEntries(didReadEntries);
+
+        var entries = [];
+        function didReadEntries(newEntries)
+        {
+            if (newEntries.length === 0) {
+                removeAll();
+                return;
+            }
+            for (var i = 0; i < newEntries.length; ++i)
+                entries.push(newEntries[i]);
+            reader.readEntries(didReadEntries);
+        }
+
+        function removeAll()
+        {
+            if (entries.length === 0) {
+                callback();
+                return;
+            }
+            var entry = entries.shift();
+            if (entry.isDirectory)
+                entry.removeRecursively(removeAll);
+            else
+                entry.remove(removeAll);
+        }
+    }
+
+    function onError()
+    {
+        // Assume the FileSystem is uninitialized and therefore empty.
+        callback();
+    }
+}

trunk/LayoutTests/http/tests/inspector/filesystem/read-directory.html

@@ -17 +17 @@
     FileSystemAgent.enable();
 
-    step1();
+    InspectorTest.clearFileSystem(step1);
 
     function step1()
@@ -53 +53 @@
         InspectorTest.dumpReadDirectoryResult(requestId, errorCode, entries);
 
+        InspectorTest.clearFileSystem(step7);
+    }
+
+    function step7()
+    {
         InspectorTest.completeTest();
     }