Files.app: Test local delete and directory delete

chrome/test/data/extensions/api_test/file_manager_browsertest/test_cases.js

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Expected files before tests are performed. Entries for Local tests.
  * @type {Array.<Array.<string>>}
  * @const
  */
 var EXPECTED_FILES_BEFORE_LOCAL = [
@@ skipping 298 matching lines @@
   // Returns true if |fileList| contains |filename|.
   var isFilePresent = function(filename, fileList) {
     for (var i = 0; i < fileList.length; i++) {
       if (getFileName(fileList[i]) == filename)
         return true;
     }
     return false;
   }
 
   var filename = 'world.ogv';
+  var directoryName = 'photos';
   var appId, fileListBefore;
   var steps = [
     // Set up File Manager.
     function() {
       setupAndWaitUntilReady(path, steps.shift());
     },
     // Delete the file.
     function(inAppId, inFileListBefore) {
       appId = inAppId;
       fileListBefore = inFileListBefore;
       chrome.test.assertTrue(isFilePresent(filename, fileListBefore));
       callRemoteTestUtil('deleteFile', appId, [filename], steps.shift());
     },
     // Reply to a dialog.
     function(result) {
       chrome.test.assertTrue(result);
       callRemoteTestUtil('waitAndAcceptDialog', appId, [], steps.shift());
     },
     // Wait for a file list change.
     function() {
       callRemoteTestUtil('waitForFileListChange', appId,
                          [fileListBefore.length], steps.shift());
     },
+    // Delete the directory.
+    function(fileList) {
+      fileListBefore = fileList;
+      chrome.test.assertFalse(isFilePresent(filename, fileList));
+      chrome.test.assertTrue(isFilePresent(directoryName, fileList));
+      callRemoteTestUtil('deleteFile', appId, [directoryName], steps.shift());
+    },
+    // Reply to a dialog.
+    function(result) {
+      chrome.test.assertTrue(result);
+      callRemoteTestUtil('waitAndAcceptDialog', appId, [], steps.shift());
+    },
+    // Wait for a file list change.
+    function() {
+      callRemoteTestUtil('waitForFileListChange', appId,
+                         [fileListBefore.length], steps.shift());
+    },
     // Verify the result.
     function(fileList) {
-      chrome.test.assertFalse(isFilePresent(filename, fileList));
+      chrome.test.assertFalse(isFilePresent(directoryName, fileList));
       checkIfNoErrorsOccured(chrome.test.succeed);

[mtomasz, 2013/05/28 11:07:17]

This will not work. We have to wrap it with a callbackPass or move the
chrome.test.succeed to a separate step.

[hashimoto, 2013/05/29 06:26:26]

Done.
Should we fix other tests doing the same thing in this file?

BTW, do we need to use callbackPass in this file at all?
As far as I looked at
chrome/renderer/resources/extensions/test_custom_bindings.js, callbackPass is
necessary only when chrome.test.runTests is used and we don't use it.
Perhaps, we should use chrome.test.runTests instead of manually dispatching test
case name with ExtensionTestMessageListener? (the only obstacle to do this seems
to be DoTestFileDisplay which uses an additional ExtensionTestMessageListener to
add a new file.)

[mtomasz, 2013/05/29 06:40:11]

I'm going to do it here: crbug.com/244327 today together with other cleanup.
We do use runTests, see background.js in file_manager_browsertest. The
testRunner function just queries for a test name. I guess this is to make js
tests with c++ test cases synchronized.

If we don't use callbackPass, then the test case will finish prematurely. AFAIR
we do not need to call chrome.test.succeed since it is called by the last queued
callbackPass, but I may be wrong here.

[hashimoto, 2013/05/29 06:53:16]

Ah, I see.

     }
   ];
   steps = steps.map(function(f) { return chrome.test.callbackPass(f); });
   steps.shift()();
 };
 
 testcase.fileDisplayDownloads = function() {
   testcase.intermediate.fileDisplay('/Downloads');
 };
 
@@ skipping 311 matching lines @@
 /**
  * Tests copy from drive's offline to drive's root.
  */
 testcase.transferFromOfflineToDrive = function() {
   testcase.intermediate.copyBetweenVolumes('Test Document.gdoc',
                                            'drive_offline',
                                            EXPECTED_FILES_IN_OFFLINE,
                                            'drive',
                                            EXPECTED_FILES_BEFORE_DRIVE);
 };