Add support for almost-recursive watches in Linux DirectoryWatcher...

base/directory_watcher_unittest.cc

 // Copyright (c) 2008 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.
 
 #include "base/directory_watcher.h"
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/string_util.h"
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif  // defined(OS_WIN)
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // For tests where we wait a bit to verify nothing happened
 const int kWaitForEventTime = 1000;
 
+}  // namespace
+
 class DirectoryWatcherTest : public testing::Test {
  public:
   // Implementation of DirectoryWatcher on Mac requires UI loop.
   DirectoryWatcherTest() : loop_(MessageLoop::TYPE_UI) {
   }
 
   void OnTestDelegateFirstNotification(const FilePath& path) {
     notified_delegates_++;
     if (notified_delegates_ >= expected_notified_delegates_)
       MessageLoop::current()->Quit();
@@ skipping 166 matching lines @@
 
   // Write a file to the test dir.
   SetExpectedNumberOfNotifiedDelegates(0);
   ASSERT_TRUE(WriteTestFile(test_dir_.AppendASCII("test_file"), "content"));
   VerifyExpectedNumberOfNotifiedDelegates();
 }
 
 TEST_F(DirectoryWatcherTest, SubDirRecursive) {
   FilePath subdir(CreateTestDirDirectoryASCII("SubDir", true));
 
-#if defined(OS_LINUX)
-  // TODO(port): Recursive watches are not implemented on Linux.
-  return;
-#endif  // !defined(OS_WIN)
-
   // Verify that modifications to a subdirectory are noticed by recursive watch.
   TestDelegate delegate(this);
   DirectoryWatcher watcher;
   ASSERT_TRUE(watcher.Watch(test_dir_, &delegate, true));
   // Write a file to the subdir.
   SetExpectedNumberOfNotifiedDelegates(1);
+  watcher.EnsureSetupFinished();
   ASSERT_TRUE(WriteTestFile(subdir.AppendASCII("test_file"), "some content"));
   VerifyExpectedNumberOfNotifiedDelegates();
 }
 
 TEST_F(DirectoryWatcherTest, SubDirNonRecursive) {
 #if defined(OS_WIN)
   // Disable this test for earlier version of Windows. It turned out to be
   // very difficult to create a reliable test for them.
   if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)
     return;
@@ skipping 64 matching lines @@
   VerifyExpectedNumberOfNotifiedDelegates();
 }
 
 TEST_F(DirectoryWatcherTest, MultipleWatchersDifferentFiles) {
   const int kNumberOfWatchers = 5;
   DirectoryWatcher watchers[kNumberOfWatchers];
   TestDelegate delegates[kNumberOfWatchers] = {this, this, this, this, this};
   FilePath subdirs[kNumberOfWatchers];
   for (int i = 0; i < kNumberOfWatchers; i++) {
     subdirs[i] = CreateTestDirDirectoryASCII("Dir" + IntToString(i), false);
-    ASSERT_TRUE(watchers[i].Watch(subdirs[i], &delegates[i], false));
+    ASSERT_TRUE(watchers[i].Watch(subdirs[i], &delegates[i], ((i % 2) == 0)));
   }
   for (int i = 0; i < kNumberOfWatchers; i++) {
     // Verify that we only get modifications from one watcher (each watcher has
     // different directory).
 
     for (int j = 0; j < kNumberOfWatchers; j++)
       delegates[j].reset();
 
     // Write a file to the subdir.
     SetExpectedNumberOfNotifiedDelegates(1);
@@ skipping 18 matching lines @@
   ASSERT_TRUE(WriteTestFile(subdir.AppendASCII("test_file"), "some content"));
   VerifyExpectedNumberOfNotifiedDelegates();
 
   delegate.reset();
 
   // Verify that changes inside the subdir are noticed.
   SetExpectedNumberOfNotifiedDelegates(1);
   ASSERT_TRUE(WriteTestFile(subdir.AppendASCII("test_file"), "other content"));
   VerifyExpectedNumberOfNotifiedDelegates();
 }
+#endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 TEST_F(DirectoryWatcherTest, RecursiveWatchDeletedSubdirectory) {
   FilePath subdir(CreateTestDirDirectoryASCII("SubDir", true));
 
   TestDelegate delegate(this);
   DirectoryWatcher watcher;
   ASSERT_TRUE(watcher.Watch(test_dir_, &delegate, true));
 
   // Write a file to the subdir.
   SetExpectedNumberOfNotifiedDelegates(1);
+  watcher.EnsureSetupFinished();
   ASSERT_TRUE(WriteTestFile(subdir.AppendASCII("test_file"), "some content"));
   VerifyExpectedNumberOfNotifiedDelegates();
 
   delegate.reset();
 
   SetExpectedNumberOfNotifiedDelegates(1);
   ASSERT_TRUE(file_util::Delete(subdir, true));
   VerifyExpectedNumberOfNotifiedDelegates();
 }
 
@@ skipping 19 matching lines @@
                               subdir2.AppendASCII("file")));
   VerifyExpectedNumberOfNotifiedDelegates();
 
   delegate1.reset();
   delegate2.reset();
 
   SetExpectedNumberOfNotifiedDelegates(1);
   ASSERT_TRUE(WriteTestFile(subdir2.AppendASCII("file"), "other content"));
   VerifyExpectedNumberOfNotifiedDelegates();
 }
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)

[Paweł Hajdan Jr., 2009/05/12 07:26:37]

Let's not move this line at this point. I will fix that.

 
 // Verify that watching a directory that doesn't exist fails, but doesn't
 // asssert.
 // Basic test: add a file and verify we notice it.
 TEST_F(DirectoryWatcherTest, NonExistentDirectory) {
   DirectoryWatcher watcher;
   ASSERT_FALSE(watcher.Watch(test_dir_.AppendASCII("does-not-exist"), NULL,
                              false));
 }
 
-}  // namespace