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 351 matching lines @@
     },
     // Wait for a file list change.
     function(result) {
       chrome.test.assertTrue(result);
       callRemoteTestUtil('waitForFileListChange', appId,
                          [fileListBefore.length], steps.shift());
     },
     // Verify the result.
     function(fileList) {
       chrome.test.assertTrue(isCopyPresent(filename, fileList));
-      checkIfNoErrorsOccured(chrome.test.succeed);
-    }
+      checkIfNoErrorsOccured(steps.shift());
+    },
+    function() {}
   ];
   steps = steps.map(function(f) { return chrome.test.callbackPass(f); });
   steps.shift()();
 };
 
 /**
  * Tests deleting a file and and waits until the file lists changes.
  * @param {string} path Directory path to be tested.
  */
 testcase.intermediate.keyboardDelete = function(path) {
   // 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));
-      checkIfNoErrorsOccured(chrome.test.succeed);
-    }
+      chrome.test.assertFalse(isFilePresent(directoryName, fileList));
+      checkIfNoErrorsOccured(steps.shift());
+    },
+    function() {}
   ];
   steps = steps.map(function(f) { return chrome.test.callbackPass(f); });
   steps.shift()();
 };
 
 testcase.fileDisplayDownloads = function() {
   testcase.intermediate.fileDisplay('/Downloads');
 };
 
 testcase.galleryOpenDownloads = function() {
@@ skipping 318 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);
 };