Checks for Javascript errors in Files.app's tests.

This patch verifies if there are no Javascript errors at the end of each test. Along the way it removes callbackPass instances, which are not reliable and can cause false positives.

TEST=Run browser_tests --test_filter="*FileManagerBrowser*"
BUG=233142, 233141

Review URL: https://chromiumcodereview.appspot.com/14241010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195194 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/file_manager/js/test_util.js

@@ -42,6 +42,20 @@ test.util.openMainWindow = function(path, callback) {
   helper();
 };
 
+/**
+ * Gets total Javascript error count from each app window.
+ * @return {number} Error count.
+ */
+test.util.getErrorCount = function() {
+  var totalCount = 0;
+  for (var appId in appWindows) {
+    var contentWindow = appWindows[appId].contentWindow;
+    if (contentWindow.JSErrorCount)
+      totalCount += contentWindow.JSErrorCount;
+  }
+  return totalCount;
+};
+
 /**
  * Returns an array with the files currently selected in the file manager.
  *
@@ -307,6 +321,9 @@ test.util.registerRemoteTestUtils = function() {
         case 'openMainWindow':
           test.util.openMainWindow(request.args[0], sendResponse);
           return true;
+        case 'getErrorCount':
+          sendResponse(test.util.getErrorCount());
+          return true;
         default:
           console.error('Global function ' + request.func + ' not found.');
       }

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

@@ -64,9 +64,21 @@ function setupAndWaitUntilReady(path, callback) {
   });
 }
 
+/**
+ * Verifies if there are no Javascript errors in any of the app windows.
+ * @param {function()} Completion callback.
+ */
+function checkIfNoErrorsOccured(callback) {
+  callRemoteTestUtil('getErrorCount', null, [], function(count) {
+    chrome.test.assertEq(0, count);
+    callback();
+  });
+}
+
 /**
  * Expected files shown in "Recent". Directories (e.g. 'photos') are not in this
  * list as they are not expected in "Recent".
+ *
  * @type {Array.<Array.<string>>}
  * @const
  */
@@ -128,10 +140,10 @@ testcase.intermediate.fileDisplay = function(path) {
       callRemoteTestUtil(
           'waitForFileListChange',
           appId,
-          [expectedFilesBefore.length],
-          chrome.test.callbackPass(function(actualFilesAfter) {
+          [expectedFilesBefore.length], function(actualFilesAfter) {
             chrome.test.assertEq(expectedFilesAfter, actualFilesAfter);
-          }));
+            checkIfNoErrorsOccured(chrome.test.succeed);
+          });
     });
   });
 };
@@ -142,14 +154,15 @@ testcase.intermediate.fileDisplay = function(path) {
  *
  * @param {string} path Directory path to be tested.
  */
-testcase.intermediate.keyboardCopy = function(path) {
+testcase.intermediate.keyboardCopy = function(path, callback) {
   setupAndWaitUntilReady(path, function(appId) {
     callRemoteTestUtil('copyFile', appId, ['world.mpeg'], function(result) {
       chrome.test.assertFalse(!result);
       callRemoteTestUtil('waitForFileListChange',
                          appId,
                          [getExpectedFilesBefore(path == '/drive/root').length],
-                         chrome.test.succeed);
+                         checkIfNoErrorsOccured.bind(null,
+                                                     chrome.test.succeed));
     });
   });
 };
@@ -167,7 +180,7 @@ testcase.intermediate.keyboardDelete = function(path) {
             'waitForFileListChange',
             appId,
             [getExpectedFilesBefore(path == '/drive/root').length],
-            chrome.test.succeed);
+            checkIfNoErrorsOccured.bind(null, chrome.test.succeed));
       });
     });
   });
@@ -204,9 +217,10 @@ testcase.keyboardDeleteDrive = function() {
  * Drive.
  */
 testcase.openSidebarRecent = function() {
-  var onFileListChange = chrome.test.callbackPass(function(actualFilesAfter) {
+  var onFileListChange = function(actualFilesAfter) {
     chrome.test.assertEq(EXPECTED_FILES_IN_RECENT, actualFilesAfter);
-  });
+    checkIfNoErrorsOccured(chrome.test.succeed);
+  };
 
   setupAndWaitUntilReady('/drive/root', function(appId) {
     // Use the icon for a click target.
@@ -230,9 +244,10 @@ testcase.openSidebarRecent = function() {
  * entries cached by DriveCache.
  */
 testcase.openSidebarOffline = function() {
-  var onFileListChange = chrome.test.callbackPass(function(actualFilesAfter) {
+  var onFileListChange = function(actualFilesAfter) {
     chrome.test.assertEq(EXPECTED_FILES_IN_OFFLINE, actualFilesAfter);
-  });
+    checkIfNoErrorsOccured(chrome.test.succeed);
+  };
 
   setupAndWaitUntilReady('/drive/root/', function(appId) {
     // Use the icon for a click target.
@@ -284,10 +299,10 @@ testcase.autocomplete = function() {
     'hello.txt\n',
   ];
 
-  var onAutocompleteListShown = chrome.test.callbackPass(
-      function(autocompleteList) {
-        chrome.test.assertEq(EXPECTED_AUTOCOMPLETE_LIST, autocompleteList);
-      });
+  var onAutocompleteListShown = function(autocompleteList) {
+    chrome.test.assertEq(EXPECTED_AUTOCOMPLETE_LIST, autocompleteList);
+    checkIfNoErrorsOccured(chrome.test.succeed);
+  };
 
   setupAndWaitUntilReady('/drive/root', function(appId, list) {
     callRemoteTestUtil('performAutocompleteAndWait',