Break test cases on inner asserts.

chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc

 // 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.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
@@ skipping 117 matching lines @@
     : path_(path),
       condition_(condition),
       quit_closure_(run_loop_.QuitClosure()),
       failed_(false) {
 }
 
 void TestFilePathWatcher::StartWatching() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
   watcher_.reset(new base::FilePathWatcher);
-  bool ok = watcher_->Watch(
+  failed_ = !watcher_->Watch(
       path_, false /*recursive*/,
       base::Bind(&TestFilePathWatcher::FilePathWatcherCallback,
                  base::Unretained(this)));
-  ASSERT_TRUE(ok);
 
-  // If the condition was already met before FilePathWatcher was launched,
+  // If failed to start the watcher, then quit the message loop immediately.
+  // Also, if the condition was already met before FilePathWatcher was launched,
   // FilePathWatcher won't be able to detect a change, so check the condition
   // here.
-  if (condition_.Run(path_)) {
+  if (failed_ || condition_.Run(path_)) {
     watcher_.reset();
     content::BrowserThread::PostTask(content::BrowserThread::UI,
                                      FROM_HERE,
                                      quit_closure_);
     return;
   }
 }
 
 void TestFilePathWatcher::FilePathWatcherCallback(const base::FilePath& path,
                                                   bool failed) {
@@ skipping 111 matching lines @@
       CreateFile(entry.source_file_name, entry.target_name,
                  entry.last_modified_time_as_string);
     } else {
       NOTREACHED();
     }
   }
 
   void CreateFile(const std::string& source_file_name,
                   const std::string& target_name,
                   const std::string& modification_time) {
-
     std::string content_data;
     base::FilePath test_file_path =
         google_apis::test_util::GetTestFilePath("chromeos/file_manager").
             AppendASCII(source_file_name);
 
     base::FilePath path = local_path_.AppendASCII(target_name);
     ASSERT_TRUE(file_util::PathExists(test_file_path))
         << "Test file doesn't exist: " << test_file_path.value();
     ASSERT_TRUE(file_util::CopyFile(test_file_path, path));
     ASSERT_TRUE(file_util::PathExists(path))
@@ skipping 336 matching lines @@
 
 void FileManagerBrowserTestBase::CreateTestEntries(
     TestVolume* volume, const TestEntryInfo* entries, size_t num_entries) {
   for (size_t i = 0; i < num_entries; ++i) {
     volume->CreateEntry(entries[i]);
   }
 }
 
 void FileManagerBrowserTestBase::DoTestFileDisplay(TestVolume* volume) {
   ResultCatcher catcher;
-  StartTest("fileDisplay" + volume->GetName());
+  ASSERT_NO_FATAL_FAILURE(StartTest("fileDisplay" + volume->GetName()));
 
   ExtensionTestMessageListener listener("initial check done", true);
   ASSERT_TRUE(listener.WaitUntilSatisfied());
   const TestEntryInfo entry = {
     FILE,
     "music.ogg",  // Prototype file name.
     "newly added file.ogg",  // Target file name.
     "audio/ogg",
     NONE,
     "4 Sep 1998 00:00:00"
   };
   volume->CreateEntry(entry);
   listener.Reply("file added");
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 void FileManagerBrowserTestBase::DoTestGalleryOpen(TestVolume* volume) {
   ResultCatcher catcher;
   StartTest("galleryOpen" + volume->GetName());
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 void FileManagerBrowserTestBase::DoTestKeyboardCopy(TestVolume* volume) {
   base::FilePath copy_path =
       volume->GetRootPath().AppendASCII(kKeyboardTestFileCopyName);
   ASSERT_FALSE(volume->PathExists(copy_path));
 
   ResultCatcher catcher;
-  StartTest("keyboardCopy" + volume->GetName());
+  ASSERT_NO_FATAL_FAILURE(StartTest("keyboardCopy" + volume->GetName()));
 
   const int64 kKeyboardTestFileSize = 59943;
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
   ASSERT_TRUE(volume->WaitUntilFilePresentWithSize(
       copy_path, kKeyboardTestFileSize));
 
   // Check that it was a copy, not a move.
   base::FilePath source_path =
       volume->GetRootPath().AppendASCII(kKeyboardTestFileName);
   ASSERT_TRUE(volume->PathExists(source_path));
 }
 
 void FileManagerBrowserTestBase::DoTestKeyboardDelete(TestVolume* volume) {
   base::FilePath delete_path =
       volume->GetRootPath().AppendASCII(kKeyboardTestFileName);
   ASSERT_TRUE(volume->PathExists(delete_path));
 
   ResultCatcher catcher;
-  StartTest("keyboardDelete" + volume->GetName());
+  ASSERT_NO_FATAL_FAILURE(StartTest("keyboardDelete" + volume->GetName()));
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
   ASSERT_TRUE(volume->WaitUntilFileNotPresent(delete_path));
 }
 
 // A class to test local volumes.
 class FileManagerBrowserLocalTest : public FileManagerBrowserTestBase {
  public:
   FileManagerBrowserLocalTest() : volume_("Downloads") {}
 
@@ skipping 80 matching lines @@
   DriveTestVolume drive_volume_;
 };
 
 // FileManagerBrowserTransferTest depends on Drive and Drive is not supported in
 // the guest mode.
 INSTANTIATE_TEST_CASE_P(InNonGuestMode,
                         FileManagerBrowserTransferTest,
                         ::testing::Values(false));
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserLocalTest, TestFileDisplay) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   DoTestFileDisplay(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserLocalTest, TestGalleryOpen) {
   PrepareVolume();
   DoTestGalleryOpen(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestGalleryOpen) {
   PrepareVolume();
   DoTestGalleryOpen(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestKeyboardCopy) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   DoTestKeyboardCopy(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestKeyboardDelete) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   DoTestKeyboardDelete(&volume_);
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestOpenRecent) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("openSidebarRecent");
+  ASSERT_NO_FATAL_FAILURE(StartTest("openSidebarRecent"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // TODO(hirono): Bring back the offline feature. http://crbug.com/238545
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, DISABLED_TestOpenOffline) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("openSidebarOffline");
+  ASSERT_NO_FATAL_FAILURE(StartTest("openSidebarOffline"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestOpenSharedWithMe) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("openSidebarSharedWithMe");
+  ASSERT_NO_FATAL_FAILURE(StartTest("openSidebarSharedWithMe"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestAutocomplete) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("autocomplete");
+  ASSERT_NO_FATAL_FAILURE(StartTest("autocomplete"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromDriveToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromDriveToDownloads");
+  ASSERT_NO_FATAL_FAILURE(
+      StartTest("transferFromDriveToDownloads"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromDownloadsToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromDownloadsToDrive");
+  ASSERT_NO_FATAL_FAILURE(
+      StartTest("transferFromDownloadsToDrive"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromSharedToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromSharedToDownloads");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromSharedToDownloads"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromSharedToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromSharedToDrive");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromSharedToDrive"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromRecentToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromRecentToDownloads");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromRecentToDownloads"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        TransferFromRecentToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromRecentToDrive");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromRecentToDrive"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // TODO(hirono): Bring back the offline feature. http://crbug.com/238545
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        DISABLED_TransferFromOfflineToDownloads) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromOfflineToDownloads");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromOfflineToDownloads"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // TODO(hirono): Bring back the offline feature. http://crbug.com/238545
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTransferTest,
                        DISABLED_TransferFromOfflineToDrive) {
-  PrepareVolume();
+  ASSERT_NO_FATAL_FAILURE(PrepareVolume());
   ResultCatcher catcher;
-  StartTest("transferFromOfflineToDrive");
+  ASSERT_NO_FATAL_FAILURE(StartTest("transferFromOfflineToDrive"));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace