For unit tests, track additions to AtExitManager and warn.

base/test/test_suite.cc

 // Copyright (c) 2012 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/test/test_suite.h"
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 51 matching lines @@
   }
 
  private:
   CommandLine old_command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(TestClientInitializer);
 };
 
 }  // namespace
 
+namespace base {
+
+class TestWatchAtExitManager : public testing::EmptyTestEventListener {
+ public:
+  TestWatchAtExitManager() { }
+  ~TestWatchAtExitManager() { }
+
+  virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
+    base::ShadowingAtExitManager at_exit_manager;
+    initial_top_manager_ = at_exit_manager.next_manager_;
+    at_exit_stack_size_ = initial_top_manager_->stack_.size();
+  }
+
+  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+    base::ShadowingAtExitManager at_exit_manager;
+    base::AtExitManager* new_top_manager = at_exit_manager.next_manager_;
+    size_t new_stack_size = new_top_manager->stack_.size();
+
+    if (initial_top_manager_ != new_top_manager) {
+      LOG(ERROR) << "AtExitManager: stack changed depth across test " <<
+          test_info.test_case_name() << "." << test_info.name();
+    } else if (new_stack_size != at_exit_stack_size_) {
+      // TODO(scottbyer): clean up all the errors that result from this and
+      // turn this into a test failure with ADD_FAILURE().
+      ADD_FAILURE() <<
+          "AtExitManager: items added to the callback list by " <<
+          test_info.test_case_name() << "." << test_info.name() <<
+          ". Test should be surrounded by a ShadowingAtExitManager.";
+    }
+  }
+
+ private:
+  base::AtExitManager* initial_top_manager_;
+  size_t at_exit_stack_size_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestWatchAtExitManager);
+};
+
+}  // namespace base
+
 const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling";
 
 TestSuite::TestSuite(int argc, char** argv) : initialized_command_line_(false) {
   PreInitialize(argc, argv, true);
 }
 
 TestSuite::TestSuite(int argc, char** argv, bool create_at_exit_manager)
     : initialized_command_line_(false) {
   PreInitialize(argc, argv, create_at_exit_manager);
 }
@@ skipping 81 matching lines @@
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new MaybeTestDisabler);
 }
 
 void TestSuite::ResetCommandLine() {
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestClientInitializer);
 }
 
+void TestSuite::WatchAtExitManager() {
+  LOG(INFO) << "Adding watcher for AtExitManager.";

[Paweł Hajdan Jr., 2012/06/20 07:47:13]

This shouldn't be needed.

[Scott Byer, 2012/06/21 00:05:41]

Oops. Was doing local diagnostics and left it in. Done.

+  testing::TestEventListeners& listeners =
+      testing::UnitTest::GetInstance()->listeners();
+  listeners.Append(new TestWatchAtExitManager);
+}
+
 // Don't add additional code to this method.  Instead add it to
 // Initialize().  See bug 6436.
 int TestSuite::Run() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool scoped_pool;
 #endif
 
   Initialize();
   std::string client_func =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 102 matching lines @@
   icu_util::Initialize();
 
   CatchMaybeTests();
   ResetCommandLine();
 
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }