diff options
55 files changed, 443 insertions, 621 deletions
diff --git a/app/app.gyp b/app/app.gyp index e146fb7..3b10824 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -26,7 +26,6 @@ 'dependencies': [ 'app_base', 'app_resources', - '../base/base.gyp:test_support_base', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', diff --git a/app/test_suite.h b/app/test_suite.h index 4c14c96..15276df 100644 --- a/app/test_suite.h +++ b/app/test_suite.h @@ -19,7 +19,7 @@ #include "base/scoped_nsautorelease_pool.h" #include "base/test/test_suite.h" -class AppTestSuite : public base::TestSuite { +class AppTestSuite : public TestSuite { public: AppTestSuite(int argc, char** argv) : TestSuite(argc, argv) { } @@ -5,6 +5,9 @@ include_rules = [ "+third_party/modp_b64", "+third_party/tcmalloc", + # Testing stuff shouldn't be used by the general base code. + "-base/test", + # ICU dependendencies must be separate from the rest of base. "-i18n", ] diff --git a/base/base.gyp b/base/base.gyp index 06cd124..213b5f3 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -55,7 +55,9 @@ 'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC', 'sources': [ # Infrastructure files. + 'multiprocess_test.h', 'test/run_all_unittests.cc', + 'test/test_suite.h', # Tests. 'at_exit_unittest.cc', @@ -167,7 +169,6 @@ 'dependencies': [ 'base', 'base_i18n', - 'test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', ], @@ -224,21 +225,13 @@ 'type': '<(library)', 'dependencies': [ 'base', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', ], 'sources': [ - 'test/multiprocess_test.cc', - 'test/multiprocess_test.h', - 'test/perf_test_suite.cc', - 'test/perf_test_suite.h', 'test/test_file_util.h', 'test/test_file_util_linux.cc', 'test/test_file_util_mac.cc', 'test/test_file_util_posix.cc', 'test/test_file_util_win.cc', - 'test/test_suite.cc', - 'test/test_suite.h', ], }, { diff --git a/base/base_switches.cc b/base/base_switches.cc index b5e145f..2613623 100644 --- a/base/base_switches.cc +++ b/base/base_switches.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-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. @@ -11,27 +11,27 @@ namespace switches { // seconds for the debugger to attach to itself. Then a break point will be hit. const char kDebugOnStart[] = "debug-on-start"; +// Will wait for 60 seconds for a debugger to come to attach to the process. +const char kWaitForDebugger[] = "wait-for-debugger"; + +// Suppresses all error dialogs when present. +const char kNoErrorDialogs[] = "noerrdialogs"; + // Disables the crash reporting. const char kDisableBreakpad[] = "disable-breakpad"; -// Enable DCHECKs in release mode. -const char kEnableDCHECK[] = "enable-dcheck"; - // Generates full memory crash dump. const char kFullMemoryCrashReport[] = "full-memory-crash-report"; -// Suppresses all error dialogs when present. -const char kNoErrorDialogs[] = "noerrdialogs"; +// The value of this switch determines whether the process is started as a +// renderer or plugin host. If it's empty, it's the browser. +const char kProcessType[] = "type"; + +// Enable DCHECKs in release mode. +const char kEnableDCHECK[] = "enable-dcheck"; // Disable win_util::MessageBox. This is useful when running as part of // scripts that do not have a user interface. const char kNoMessageBox[] = "no-message-box"; -// When running certain tests that spawn child processes, this switch indicates -// to the test framework that the current process is a child process. -const char kTestChildProcess[] = "test-child-process"; - -// Will wait for 60 seconds for a debugger to come to attach to the process. -const char kWaitForDebugger[] = "wait-for-debugger"; - } // namespace switches diff --git a/base/base_switches.h b/base/base_switches.h index 6fe3842..4c01d1f 100644 --- a/base/base_switches.h +++ b/base/base_switches.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-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. @@ -11,13 +11,13 @@ namespace switches { extern const char kDebugOnStart[]; +extern const char kWaitForDebugger[]; extern const char kDisableBreakpad[]; -extern const char kEnableDCHECK[]; extern const char kFullMemoryCrashReport[]; extern const char kNoErrorDialogs[]; +extern const char kProcessType[]; +extern const char kEnableDCHECK[]; extern const char kNoMessageBox[]; -extern const char kTestChildProcess[]; -extern const char kWaitForDebugger[]; } // namespace switches diff --git a/base/multiprocess_test.h b/base/multiprocess_test.h new file mode 100644 index 0000000..37d5228 --- /dev/null +++ b/base/multiprocess_test.h @@ -0,0 +1,121 @@ +// Copyright (c) 2009 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. + +#ifndef BASE_MULTIPROCESS_TEST_H_ +#define BASE_MULTIPROCESS_TEST_H_ +#pragma once + +#include "base/base_switches.h" +#include "base/command_line.h" +#include "base/process_util.h" +#include "base/string_util.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "testing/multiprocess_func_list.h" +#include "testing/platform_test.h" + +#if defined(OS_POSIX) +#include <sys/types.h> +#include <unistd.h> +#endif + +// Command line switch to invoke a child process rather than +// to run the normal test suite. +static const char kRunClientProcess[] = "client"; + +// A MultiProcessTest is a test class which makes it easier to +// write a test which requires code running out of process. +// +// To create a multiprocess test simply follow these steps: +// +// 1) Derive your test from MultiProcessTest. Example: +// +// class MyTest : public MultiProcessTest { +// }; +// +// TEST_F(MyTest, TestCaseName) { +// ... +// } +// +// 2) Create a mainline function for the child processes and include +// testing/multiprocess_func_list.h. +// See the declaration of the MULTIPROCESS_TEST_MAIN macro +// in that file for an example. +// 3) Call SpawnChild("foo"), where "foo" is the name of +// the function you wish to run in the child processes. +// That's it! +// +class MultiProcessTest : public PlatformTest { + protected: + // Run a child process. + // 'procname' is the name of a function which the child will + // execute. It must be exported from this library in order to + // run. + // + // Example signature: + // extern "C" int __declspec(dllexport) FooBar() { + // // do client work here + // } + // + // Returns the handle to the child, or NULL on failure + // + // TODO(darin): re-enable this once we have base/debug_util.h + // ProcessDebugFlags(&cl, DebugUtil::UNKNOWN, false); + base::ProcessHandle SpawnChild(const std::string& procname) { + return SpawnChild(procname, false); + } + + base::ProcessHandle SpawnChild(const std::string& procname, + bool debug_on_start) { +#if defined(OS_WIN) + return SpawnChildImpl(procname, debug_on_start); +#elif defined(OS_POSIX) + base::file_handle_mapping_vector empty_file_list; + return SpawnChildImpl(procname, empty_file_list, debug_on_start); +#endif + } + +#if defined(OS_POSIX) + base::ProcessHandle SpawnChild( + const std::string& procname, + const base::file_handle_mapping_vector& fds_to_map, + bool debug_on_start) { + return SpawnChildImpl(procname, fds_to_map, debug_on_start); + } +#endif + +protected: + CommandLine MakeCmdLine(const std::string& procname, bool debug_on_start) { + CommandLine cl(*CommandLine::ForCurrentProcess()); + cl.AppendSwitchASCII(kRunClientProcess, procname); + if (debug_on_start) + cl.AppendSwitch(switches::kDebugOnStart); + return cl; + } + + private: +#if defined(OS_WIN) + base::ProcessHandle SpawnChildImpl(const std::string& procname, + bool debug_on_start) { + base::ProcessHandle handle = static_cast<base::ProcessHandle>(NULL); + base::LaunchApp(MakeCmdLine(procname, debug_on_start), + false, true, &handle); + return handle; + } + +#elif defined(OS_POSIX) + // TODO(port): with the CommandLine refactoring, this code is very similar + // to the Windows code. Investigate whether this can be made shorter. + base::ProcessHandle SpawnChildImpl( + const std::string& procname, + const base::file_handle_mapping_vector& fds_to_map, + bool debug_on_start) { + base::ProcessHandle handle = base::kNullProcessHandle; + base::LaunchApp(MakeCmdLine(procname, debug_on_start).argv(), + fds_to_map, false, &handle); + return handle; + } +#endif +}; + +#endif // BASE_MULTIPROCESS_TEST_H_ diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index f69fe5d..8da89b0 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -9,14 +9,13 @@ #include "base/command_line.h" #include "base/eintr_wrapper.h" #include "base/file_path.h" +#include "base/multiprocess_test.h" #include "base/path_service.h" #include "base/platform_thread.h" #include "base/process_util.h" #include "base/scoped_ptr.h" -#include "base/test/multiprocess_test.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "testing/multiprocess_func_list.h" #if defined(OS_LINUX) #include <errno.h> @@ -63,7 +62,7 @@ void SignalChildren(const char* filename) { } // namespace -class ProcessUtilTest : public base::MultiProcessTest { +class ProcessUtilTest : public MultiProcessTest { #if defined(OS_POSIX) public: // Spawn a child process that counts how many file descriptors are open. @@ -76,7 +75,7 @@ MULTIPROCESS_TEST_MAIN(SimpleChildProcess) { } TEST_F(ProcessUtilTest, SpawnChild) { - base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess", false); + base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess"); ASSERT_NE(base::kNullProcessHandle, handle); EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000)); base::CloseProcessHandle(handle); @@ -89,7 +88,7 @@ MULTIPROCESS_TEST_MAIN(SlowChildProcess) { TEST_F(ProcessUtilTest, KillSlowChild) { remove("SlowChildProcess.die"); - base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false); + base::ProcessHandle handle = this->SpawnChild("SlowChildProcess"); ASSERT_NE(base::kNullProcessHandle, handle); SignalChildren("SlowChildProcess.die"); EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000)); @@ -99,7 +98,7 @@ TEST_F(ProcessUtilTest, KillSlowChild) { TEST_F(ProcessUtilTest, DidProcessCrash) { remove("SlowChildProcess.die"); - base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false); + base::ProcessHandle handle = this->SpawnChild("SlowChildProcess"); ASSERT_NE(base::kNullProcessHandle, handle); bool child_exited = true; @@ -119,7 +118,7 @@ TEST_F(ProcessUtilTest, DidProcessCrash) { // Note: a platform may not be willing or able to lower the priority of // a process. The calls to SetProcessBackground should be noops then. TEST_F(ProcessUtilTest, SetProcessBackgrounded) { - base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess", false); + base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess"); base::Process process(handle); int old_priority = process.GetPriority(); process.SetProcessBackgrounded(true); diff --git a/base/shared_memory_unittest.cc b/base/shared_memory_unittest.cc index 4e83311..88b5fa0 100644 --- a/base/shared_memory_unittest.cc +++ b/base/shared_memory_unittest.cc @@ -3,13 +3,12 @@ // found in the LICENSE file. #include "base/basictypes.h" +#include "base/multiprocess_test.h" #include "base/platform_thread.h" #include "base/scoped_nsautorelease_pool.h" #include "base/shared_memory.h" #include "base/scoped_ptr.h" -#include "base/test/multiprocess_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "testing/multiprocess_func_list.h" static const int kNumThreads = 5; static const int kNumTasks = 5; @@ -272,11 +271,13 @@ TEST(SharedMemoryTest, AnonymousPrivate) { for (int i = 0; i < count; i++) { memories[i].Close(); } + } + // On POSIX it is especially important we test shmem across processes, // not just across threads. But the test is enabled on all platforms. -class SharedMemoryProcessTest : public base::MultiProcessTest { +class SharedMemoryProcessTest : public MultiProcessTest { public: static void CleanUp() { @@ -325,7 +326,7 @@ TEST_F(SharedMemoryProcessTest, Tasks) { base::ProcessHandle handles[kNumTasks]; for (int index = 0; index < kNumTasks; ++index) { - handles[index] = SpawnChild("SharedMemoryTestMain", false); + handles[index] = SpawnChild("SharedMemoryTestMain"); } int exit_code = 0; @@ -341,4 +342,5 @@ MULTIPROCESS_TEST_MAIN(SharedMemoryTestMain) { return SharedMemoryProcessTest::TaskTestMain(); } + } // namespace base diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc index db8057c..848ef97 100644 --- a/base/stats_table_unittest.cc +++ b/base/stats_table_unittest.cc @@ -7,14 +7,12 @@ #include <windows.h> #endif +#include "base/multiprocess_test.h" #include "base/platform_thread.h" #include "base/simple_thread.h" #include "base/shared_memory.h" #include "base/stats_table.h" #include "base/stats_counters.h" -#include "base/string_piece.h" -#include "base/string_util.h" -#include "base/test/multiprocess_test.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/multiprocess_func_list.h" @@ -206,7 +204,7 @@ TEST_F(StatsTableTest, MultipleProcesses) { // Spawn the processes. for (int16 index = 0; index < kMaxProcs; index++) { - procs[index] = this->SpawnChild("StatsTableMultipleProcessMain", false); + procs[index] = this->SpawnChild("StatsTableMultipleProcessMain"); EXPECT_NE(base::kNullProcessHandle, procs[index]); } diff --git a/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc deleted file mode 100644 index a1a3bbe..0000000 --- a/base/test/multiprocess_test.cc +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) 2010 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/multiprocess_test.h" - -#include "base/base_switches.h" -#include "base/command_line.h" - -#if defined(OS_POSIX) -#include <sys/types.h> -#include <unistd.h> -#endif - -namespace base { - -MultiProcessTest::MultiProcessTest() { -} - -ProcessHandle MultiProcessTest::SpawnChild(const std::string& procname, - bool debug_on_start) { -#if defined(OS_WIN) - return SpawnChildImpl(procname, debug_on_start); -#elif defined(OS_POSIX) - file_handle_mapping_vector empty_file_list; - return SpawnChildImpl(procname, empty_file_list, debug_on_start); -#endif -} - -#if defined(OS_POSIX) -ProcessHandle MultiProcessTest::SpawnChild( - const std::string& procname, - const file_handle_mapping_vector& fds_to_map, - bool debug_on_start) { - return SpawnChildImpl(procname, fds_to_map, debug_on_start); -} -#endif - -CommandLine MultiProcessTest::MakeCmdLine(const std::string& procname, - bool debug_on_start) { - CommandLine cl(*CommandLine::ForCurrentProcess()); - cl.AppendSwitchASCII(switches::kTestChildProcess, procname); - if (debug_on_start) - cl.AppendSwitch(switches::kDebugOnStart); - return cl; -} - -#if defined(OS_WIN) - -ProcessHandle MultiProcessTest::SpawnChildImpl(const std::string& procname, - bool debug_on_start) { - ProcessHandle handle = static_cast<ProcessHandle>(NULL); - LaunchApp(MakeCmdLine(procname, debug_on_start), - false, true, &handle); - return handle; -} - -#elif defined(OS_POSIX) - -// TODO(port): with the CommandLine refactoring, this code is very similar -// to the Windows code. Investigate whether this can be made shorter. -ProcessHandle MultiProcessTest::SpawnChildImpl( - const std::string& procname, - const file_handle_mapping_vector& fds_to_map, - bool debug_on_start) { - ProcessHandle handle = kNullProcessHandle; - LaunchApp(MakeCmdLine(procname, debug_on_start).argv(), - fds_to_map, false, &handle); - return handle; -} - -#endif - -} // namespace base diff --git a/base/test/multiprocess_test.h b/base/test/multiprocess_test.h deleted file mode 100644 index 5126abe..0000000 --- a/base/test/multiprocess_test.h +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) 2010 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. - -#ifndef BASE_TEST_MULTIPROCESS_TEST_H_ -#define BASE_TEST_MULTIPROCESS_TEST_H_ -#pragma once - -#include <string> - -#include "base/basictypes.h" -#include "base/process.h" -#include "base/process_util.h" -#include "build/build_config.h" -#include "testing/platform_test.h" - -class CommandLine; - -namespace base { - -// A MultiProcessTest is a test class which makes it easier to -// write a test which requires code running out of process. -// -// To create a multiprocess test simply follow these steps: -// -// 1) Derive your test from MultiProcessTest. Example: -// -// class MyTest : public MultiProcessTest { -// }; -// -// TEST_F(MyTest, TestCaseName) { -// ... -// } -// -// 2) Create a mainline function for the child processes and include -// testing/multiprocess_func_list.h. -// See the declaration of the MULTIPROCESS_TEST_MAIN macro -// in that file for an example. -// 3) Call SpawnChild("foo"), where "foo" is the name of -// the function you wish to run in the child processes. -// That's it! -class MultiProcessTest : public PlatformTest { - public: - MultiProcessTest(); - - protected: - // Run a child process. - // 'procname' is the name of a function which the child will - // execute. It must be exported from this library in order to - // run. - // - // Example signature: - // extern "C" int __declspec(dllexport) FooBar() { - // // do client work here - // } - // - // Returns the handle to the child, or NULL on failure - ProcessHandle SpawnChild(const std::string& procname, bool debug_on_start); - -#if defined(OS_POSIX) - ProcessHandle SpawnChild(const std::string& procname, - const file_handle_mapping_vector& fds_to_map, - bool debug_on_start); -#endif - - CommandLine MakeCmdLine(const std::string& procname, bool debug_on_start); - - private: -#if defined(OS_WIN) - ProcessHandle SpawnChildImpl(const std::string& procname, - bool debug_on_start); - -#elif defined(OS_POSIX) - // TODO(port): with the CommandLine refactoring, this code is very similar - // to the Windows code. Investigate whether this can be made shorter. - ProcessHandle SpawnChildImpl(const std::string& procname, - const file_handle_mapping_vector& fds_to_map, - bool debug_on_start); -#endif - - DISALLOW_COPY_AND_ASSIGN(MultiProcessTest); -}; - -} // namespace base - -#endif // BASE_TEST_MULTIPROCESS_TEST_H_ diff --git a/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc deleted file mode 100644 index 77e5b52..0000000 --- a/base/test/perf_test_suite.cc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2010 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/perf_test_suite.h" - -#include "base/command_line.h" -#include "base/debug_util.h" -#include "base/file_path.h" -#include "base/path_service.h" -#include "base/perftimer.h" -#include "base/process_util.h" -#include "base/test/test_suite.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace base { - -PerfTestSuite::PerfTestSuite(int argc, char** argv) : TestSuite(argc, argv) { -} - -void PerfTestSuite::Initialize() { - TestSuite::Initialize(); - - // Initialize the perf timer log - FilePath log_path = - CommandLine::ForCurrentProcess()->GetSwitchValuePath("log-file"); - if (log_path.empty()) { - FilePath exe; - PathService::Get(FILE_EXE, &exe); - log_path = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); - log_path = log_path.InsertBeforeExtension(FILE_PATH_LITERAL("_perf")); - } - ASSERT_TRUE(InitPerfLog(log_path)); - - // Raise to high priority to have more precise measurements. Since we don't - // aim at 1% precision, it is not necessary to run at realtime level. - if (!DebugUtil::BeingDebugged()) - RaiseProcessToHighPriority(); -} - -void PerfTestSuite::Shutdown() { - TestSuite::Shutdown(); - FinalizePerfLog(); -} - -} // namespace base diff --git a/base/test/perf_test_suite.h b/base/test/perf_test_suite.h index 5dc0e21..bac5a63 100644 --- a/base/test/perf_test_suite.h +++ b/base/test/perf_test_suite.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -6,22 +6,44 @@ #define BASE_TEST_PERF_TEST_SUITE_H_ #pragma once -#include "base/basictypes.h" +#include "base/command_line.h" +#include "base/debug_util.h" +#include "base/file_path.h" +#include "base/perftimer.h" +#include "base/process_util.h" +#include "base/string_util.h" #include "base/test/test_suite.h" -namespace base { - class PerfTestSuite : public TestSuite { public: - PerfTestSuite(int argc, char** argv); - - virtual void Initialize(); - virtual void Shutdown(); - - private: - DISALLOW_COPY_AND_ASSIGN(PerfTestSuite); + PerfTestSuite(int argc, char** argv) : TestSuite(argc, argv) { + } + + virtual void Initialize() { + TestSuite::Initialize(); + + // Initialize the perf timer log + FilePath log_path = + CommandLine::ForCurrentProcess()->GetSwitchValuePath("log-file"); + if (log_path.empty()) { + FilePath exe; + PathService::Get(base::FILE_EXE, &exe); + log_path = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); + log_path = log_path.InsertBeforeExtension(FILE_PATH_LITERAL("_perf")); + } + ASSERT_TRUE(InitPerfLog(log_path)); + + // Raise to high priority to have more precise measurements. Since we don't + // aim at 1% precision, it is not necessary to run at realtime level. + if (!DebugUtil::BeingDebugged()) + base::RaiseProcessToHighPriority(); + } + + virtual void Shutdown() { + TestSuite::Shutdown(); + + FinalizePerfLog(); + } }; -} // namespace base - #endif // BASE_TEST_PERF_TEST_SUITE_H_ diff --git a/base/test/run_all_perftests.cc b/base/test/run_all_perftests.cc index 2b4c628..6d0a8ee 100644 --- a/base/test/run_all_perftests.cc +++ b/base/test/run_all_perftests.cc @@ -5,5 +5,5 @@ #include "base/test/perf_test_suite.h" int main(int argc, char** argv) { - return base::PerfTestSuite(argc, argv).Run(); + return PerfTestSuite(argc, argv).Run(); } diff --git a/base/test/run_all_unittests.cc b/base/test/run_all_unittests.cc index 470f76b..7b90358 100644 --- a/base/test/run_all_unittests.cc +++ b/base/test/run_all_unittests.cc @@ -5,7 +5,7 @@ #include "base/test/test_suite.h" int main(int argc, char** argv) { - base::TestSuite test_suite(argc, argv); + TestSuite test_suite(argc, argv); test_suite.EnforceTestIsolation(); return test_suite.Run(); } diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc deleted file mode 100644 index 5fb8639..0000000 --- a/base/test/test_suite.cc +++ /dev/null @@ -1,244 +0,0 @@ -// Copyright (c) 2010 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" -#include "base/debug_on_start.h" -#include "base/debug_util.h" -#include "base/file_path.h" -#include "base/i18n/icu_util.h" -#include "base/logging.h" -#include "base/nss_util.h" -#include "base/path_service.h" -#include "base/process_util.h" -#include "base/scoped_nsautorelease_pool.h" -#include "base/scoped_ptr.h" -#include "base/test/multiprocess_test.h" -#include "base/time.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "testing/multiprocess_func_list.h" - -#if defined(OS_POSIX) && !defined(OS_MACOSX) -#include <gtk/gtk.h> -#endif - -namespace base { - -namespace { - -// By setting up a shadow AtExitManager, this test event listener ensures that -// no state is carried between tests (like singletons, lazy instances, etc). -// Of course it won't help if the code under test corrupts memory. -class TestIsolationEnforcer : public testing::EmptyTestEventListener { - public: - virtual void OnTestStart(const testing::TestInfo& test_info) { - ASSERT_FALSE(exit_manager_.get()); - exit_manager_.reset(new ShadowingAtExitManager()); - } - - virtual void OnTestEnd(const testing::TestInfo& test_info) { - ASSERT_TRUE(exit_manager_.get()); - exit_manager_.reset(); - } - - private: - scoped_ptr<ShadowingAtExitManager> exit_manager_; -}; - -class MaybeTestDisabler : public testing::EmptyTestEventListener { - public: - virtual void OnTestStart(const testing::TestInfo& test_info) { - ASSERT_FALSE(TestSuite::IsMarkedMaybe(test_info)) - << "Probably the OS #ifdefs don't include all of the necessary " - "platforms. Please ensure that no tests have the MAYBE_ prefix " - "after the code is preprocessed."; - } -}; - -} // namespace - -// static -const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling"; - -TestSuite::TestSuite(int argc, char** argv) { - EnableTerminationOnHeapCorruption(); - CommandLine::Init(argc, argv); - testing::InitGoogleTest(&argc, argv); -#if defined(OS_POSIX) && !defined(OS_MACOSX) - g_thread_init(NULL); - gtk_init_check(&argc, &argv); -#endif // defined(OS_LINUX) - // Don't add additional code to this constructor. Instead add it to - // Initialize(). See bug 6436. -} - -TestSuite::~TestSuite() { - CommandLine::Reset(); -} - -// static -bool TestSuite::IsMarkedFlaky(const testing::TestInfo& test) { - return strncmp(test.name(), "FLAKY_", 6) == 0; -} - -// static -bool TestSuite::IsMarkedFailing(const testing::TestInfo& test) { - return strncmp(test.name(), "FAILS_", 6) == 0; -} - -// static -bool TestSuite::IsMarkedMaybe(const testing::TestInfo& test) { - return strncmp(test.name(), "MAYBE_", 6) == 0; -} - -// static -bool TestSuite::ShouldIgnoreFailure(const testing::TestInfo& test) { - if (CommandLine::ForCurrentProcess()->HasSwitch(kStrictFailureHandling)) - return false; - return IsMarkedFlaky(test) || IsMarkedFailing(test); -} - -// static -bool TestSuite::NonIgnoredFailures(const testing::TestInfo& test) { - return test.should_run() && test.result()->Failed() && - !ShouldIgnoreFailure(test); -} - -int TestSuite::GetTestCount(TestMatch test_match) { - testing::UnitTest* instance = testing::UnitTest::GetInstance(); - int count = 0; - - for (int i = 0; i < instance->total_test_case_count(); ++i) { - const testing::TestCase& test_case = *instance->GetTestCase(i); - for (int j = 0; j < test_case.total_test_count(); ++j) { - if (test_match(*test_case.GetTestInfo(j))) { - count++; - } - } - } - - return count; -} - -void TestSuite::EnforceTestIsolation() { - testing::TestEventListeners& listeners = - testing::UnitTest::GetInstance()->listeners(); - listeners.Append(new TestIsolationEnforcer); -} - -void TestSuite::CatchMaybeTests() { - testing::TestEventListeners& listeners = - testing::UnitTest::GetInstance()->listeners(); - listeners.Append(new MaybeTestDisabler); -} - -// Don't add additional code to this method. Instead add it to -// Initialize(). See bug 6436. -int TestSuite::Run() { - ScopedNSAutoreleasePool scoped_pool; - - Initialize(); - std::string client_func = - CommandLine::ForCurrentProcess()->GetSwitchValueASCII( - switches::kTestChildProcess); - // Check to see if we are being run as a client process. - if (!client_func.empty()) - return multi_process_function_list::InvokeChildProcessTest(client_func); - int result = RUN_ALL_TESTS(); - - // If there are failed tests, see if we should ignore the failures. - if (result != 0 && GetTestCount(&TestSuite::NonIgnoredFailures) == 0) - result = 0; - - // Display the number of flaky tests. - int flaky_count = GetTestCount(&TestSuite::IsMarkedFlaky); - if (flaky_count) { - printf(" YOU HAVE %d FLAKY %s\n\n", flaky_count, - flaky_count == 1 ? "TEST" : "TESTS"); - } - - // Display the number of tests with ignored failures (FAILS). - int failing_count = GetTestCount(&TestSuite::IsMarkedFailing); - if (failing_count) { - printf(" YOU HAVE %d %s with ignored failures (FAILS prefix)\n\n", - failing_count, failing_count == 1 ? "test" : "tests"); - } - - // This MUST happen before Shutdown() since Shutdown() tears down - // objects (such as NotificationService::current()) that Cocoa - // objects use to remove themselves as observers. - scoped_pool.Recycle(); - - Shutdown(); - - return result; -} - -// static -void TestSuite::UnitTestAssertHandler(const std::string& str) { - RAW_LOG(FATAL, str.c_str()); -} - -void TestSuite::SuppressErrorDialogs() { -#if defined(OS_WIN) - UINT new_flags = SEM_FAILCRITICALERRORS | - SEM_NOGPFAULTERRORBOX | - SEM_NOOPENFILEERRORBOX; - - // Preserve existing error mode, as discussed at - // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx - UINT existing_flags = SetErrorMode(new_flags); - SetErrorMode(existing_flags | new_flags); -#endif // defined(OS_WIN) -} - -void TestSuite::Initialize() { - // Initialize logging. - FilePath exe; - PathService::Get(FILE_EXE, &exe); - FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); - logging::InitLogging(log_filename.value().c_str(), - logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, - logging::LOCK_LOG_FILE, - logging::DELETE_OLD_LOG_FILE); - // We want process and thread IDs because we may have multiple processes. - // Note: temporarily enabled timestamps in an effort to catch bug 6361. - logging::SetLogItems(true, true, true, true); - - CHECK(EnableInProcessStackDumping()); -#if defined(OS_WIN) - // Make sure we run with high resolution timer to minimize differences - // between production code and test code. - Time::EnableHighResolutionTimer(true); -#endif // defined(OS_WIN) - - // In some cases, we do not want to see standard error dialogs. - if (!DebugUtil::BeingDebugged() && - !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) { - SuppressErrorDialogs(); - DebugUtil::SuppressDialogs(); - logging::SetLogAssertHandler(UnitTestAssertHandler); - } - - icu_util::Initialize(); - -#if defined(USE_NSS) - // Trying to repeatedly initialize and cleanup NSS and NSPR may result in - // a deadlock. Such repeated initialization will happen when using test - // isolation. Prevent problems by initializing NSS here, so that the cleanup - // will be done only on process exit. - EnsureNSSInit(); -#endif // defined(USE_NSS) - - CatchMaybeTests(); -} - -void TestSuite::Shutdown() { -} - -} // namespace base diff --git a/base/test/test_suite.h b/base/test/test_suite.h index c1fd546..eb688f4 100644 --- a/base/test/test_suite.h +++ b/base/test/test_suite.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -10,81 +10,254 @@ // instantiate this class in your main function and call its Run method to run // any gtest based tests that are linked into your executable. -#include <string> - #include "base/at_exit.h" +#include "base/base_paths.h" +#include "base/debug_on_start.h" +#include "base/debug_util.h" +#include "base/file_path.h" +#include "base/i18n/icu_util.h" +#include "base/multiprocess_test.h" +#include "base/nss_util.h" +#include "base/path_service.h" +#include "base/process_util.h" +#include "base/scoped_nsautorelease_pool.h" +#include "base/scoped_ptr.h" +#include "base/time.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "testing/multiprocess_func_list.h" + +#if defined(TOOLKIT_USES_GTK) +#include <gtk/gtk.h> +#endif -namespace testing { -class TestInfo; -} +// A command-line flag that makes a test failure always result in a non-zero +// process exit code. +const char kStrictFailureHandling[] = "strict_failure_handling"; -namespace base { +// Match function used by the GetTestCount method. +typedef bool (*TestMatch)(const testing::TestInfo&); + +// By setting up a shadow AtExitManager, this test event listener ensures that +// no state is carried between tests (like singletons, lazy instances, etc). +// Of course it won't help if the code under test corrupts memory. +class TestIsolationEnforcer : public testing::EmptyTestEventListener { + public: + virtual void OnTestStart(const testing::TestInfo& test_info) { + ASSERT_FALSE(exit_manager_.get()); + exit_manager_.reset(new base::ShadowingAtExitManager()); + } + + virtual void OnTestEnd(const testing::TestInfo& test_info) { + ASSERT_TRUE(exit_manager_.get()); + exit_manager_.reset(); + } + + private: + scoped_ptr<base::ShadowingAtExitManager> exit_manager_; +}; class TestSuite { public: - // Match function used by the GetTestCount method. - typedef bool (*TestMatch)(const testing::TestInfo&); + TestSuite(int argc, char** argv) { + base::EnableTerminationOnHeapCorruption(); + CommandLine::Init(argc, argv); + testing::InitGoogleTest(&argc, argv); +#if defined(TOOLKIT_USES_GTK) + g_thread_init(NULL); + gtk_init_check(&argc, &argv); +#endif // defined(TOOLKIT_USES_GTK) + // Don't add additional code to this constructor. Instead add it to + // Initialize(). See bug 6436. + } - TestSuite(int argc, char** argv); - virtual ~TestSuite(); + virtual ~TestSuite() { + CommandLine::Reset(); + } // Returns true if the test is marked as flaky. - static bool IsMarkedFlaky(const testing::TestInfo& test); + static bool IsMarkedFlaky(const testing::TestInfo& test) { + return strncmp(test.name(), "FLAKY_", 6) == 0; + } // Returns true if the test is marked as failing. - static bool IsMarkedFailing(const testing::TestInfo& test); + static bool IsMarkedFailing(const testing::TestInfo& test) { + return strncmp(test.name(), "FAILS_", 6) == 0; + } // Returns true if the test is marked as "MAYBE_". // When using different prefixes depending on platform, we use MAYBE_ and // preprocessor directives to replace MAYBE_ with the target prefix. - static bool IsMarkedMaybe(const testing::TestInfo& test); + static bool IsMarkedMaybe(const testing::TestInfo& test) { + return strncmp(test.name(), "MAYBE_", 6) == 0; + } // Returns true if the test failure should be ignored. - static bool ShouldIgnoreFailure(const testing::TestInfo& test); + static bool ShouldIgnoreFailure(const testing::TestInfo& test) { + if (CommandLine::ForCurrentProcess()->HasSwitch(kStrictFailureHandling)) + return false; + return IsMarkedFlaky(test) || IsMarkedFailing(test); + } // Returns true if the test failed and the failure shouldn't be ignored. - static bool NonIgnoredFailures(const testing::TestInfo& test); + static bool NonIgnoredFailures(const testing::TestInfo& test) { + return test.should_run() && test.result()->Failed() && + !ShouldIgnoreFailure(test); + } // Returns the number of tests where the match function returns true. - int GetTestCount(TestMatch test_match); + int GetTestCount(TestMatch test_match) { + testing::UnitTest* instance = testing::UnitTest::GetInstance(); + int count = 0; + + for (int i = 0; i < instance->total_test_case_count(); ++i) { + const testing::TestCase& test_case = *instance->GetTestCase(i); + for (int j = 0; j < test_case.total_test_count(); ++j) { + if (test_match(*test_case.GetTestInfo(j))) { + count++; + } + } + } + + return count; + } // TODO(phajdan.jr): Enforce isolation for all tests once it's stable. - void EnforceTestIsolation(); + void EnforceTestIsolation() { + testing::TestEventListeners& listeners = + testing::UnitTest::GetInstance()->listeners(); + listeners.Append(new TestIsolationEnforcer); + } + + void CatchMaybeTests() { + testing::TestEventListeners& listeners = + testing::UnitTest::GetInstance()->listeners(); + listeners.Append(new MaybeTestDisabler); + } + + // Don't add additional code to this method. Instead add it to + // Initialize(). See bug 6436. + int Run() { + base::ScopedNSAutoreleasePool scoped_pool; + + Initialize(); + std::string client_func = + CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + kRunClientProcess); + // Check to see if we are being run as a client process. + if (!client_func.empty()) + return multi_process_function_list::InvokeChildProcessTest(client_func); + int result = RUN_ALL_TESTS(); + + // If there are failed tests, see if we should ignore the failures. + if (result != 0 && GetTestCount(&TestSuite::NonIgnoredFailures) == 0) + result = 0; - void CatchMaybeTests(); + // Display the number of flaky tests. + int flaky_count = GetTestCount(&TestSuite::IsMarkedFlaky); + if (flaky_count) { + printf(" YOU HAVE %d FLAKY %s\n\n", flaky_count, + flaky_count == 1 ? "TEST" : "TESTS"); + } - int Run(); + // Display the number of tests with ignored failures (FAILS). + int failing_count = GetTestCount(&TestSuite::IsMarkedFailing); + if (failing_count) { + printf(" YOU HAVE %d %s with ignored failures (FAILS prefix)\n\n", + failing_count, failing_count == 1 ? "test" : "tests"); + } - // A command-line flag that makes a test failure always result in a non-zero - // process exit code. - static const char kStrictFailureHandling[]; + // This MUST happen before Shutdown() since Shutdown() tears down + // objects (such as NotificationService::current()) that Cocoa + // objects use to remove themselves as observers. + scoped_pool.Recycle(); + + Shutdown(); + + return result; + } protected: + class MaybeTestDisabler : public testing::EmptyTestEventListener { + public: + virtual void OnTestStart(const testing::TestInfo& test_info) { + ASSERT_FALSE(TestSuite::IsMarkedMaybe(test_info)) + << "Probably the OS #ifdefs don't include all of the necessary " + "platforms.\nPlease ensure that no tests have the MAYBE_ prefix " + "after the code is preprocessed."; + } + }; + // By default fatal log messages (e.g. from DCHECKs) result in error dialogs // which gum up buildbots. Use a minimalistic assert handler which just // terminates the process. - static void UnitTestAssertHandler(const std::string& str); + static void UnitTestAssertHandler(const std::string& str) { + RAW_LOG(FATAL, str.c_str()); + } // Disable crash dialogs so that it doesn't gum up the buildbot - virtual void SuppressErrorDialogs(); + virtual void SuppressErrorDialogs() { +#if defined(OS_WIN) + UINT new_flags = SEM_FAILCRITICALERRORS | + SEM_NOGPFAULTERRORBOX | + SEM_NOOPENFILEERRORBOX; + + // Preserve existing error mode, as discussed at + // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx + UINT existing_flags = SetErrorMode(new_flags); + SetErrorMode(existing_flags | new_flags); +#endif // defined(OS_WIN) + } // Override these for custom initialization and shutdown handling. Use these // instead of putting complex code in your constructor/destructor. - virtual void Initialize(); - virtual void Shutdown(); + virtual void Initialize() { + // Initialize logging. + FilePath exe; + PathService::Get(base::FILE_EXE, &exe); + FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); + logging::InitLogging(log_filename.value().c_str(), + logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, + logging::LOCK_LOG_FILE, + logging::DELETE_OLD_LOG_FILE); + // We want process and thread IDs because we may have multiple processes. + // Note: temporarily enabled timestamps in an effort to catch bug 6361. + logging::SetLogItems(true, true, true, true); + + CHECK(base::EnableInProcessStackDumping()); +#if defined(OS_WIN) + // Make sure we run with high resolution timer to minimize differences + // between production code and test code. + base::Time::EnableHighResolutionTimer(true); +#endif // defined(OS_WIN) + + // In some cases, we do not want to see standard error dialogs. + if (!DebugUtil::BeingDebugged() && + !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) { + SuppressErrorDialogs(); + DebugUtil::SuppressDialogs(); + logging::SetLogAssertHandler(UnitTestAssertHandler); + } + + icu_util::Initialize(); + +#if defined(USE_NSS) + // Trying to repeatedly initialize and cleanup NSS and NSPR may result in + // a deadlock. Such repeated initialization will happen when using test + // isolation. Prevent problems by initializing NSS here, so that the cleanup + // will be done only on process exit. + base::EnsureNSSInit(); +#endif // defined(USE_NSS) + + CatchMaybeTests(); + } + + virtual void Shutdown() { + } // Make sure that we setup an AtExitManager so Singleton objects will be // destroyed. base::AtExitManager at_exit_manager_; - - DISALLOW_COPY_AND_ASSIGN(TestSuite); }; -} // namespace base - -// TODO(brettw) remove this. This is a temporary hack to allow WebKit to compile -// until we can update it to use "base::" (preventing a two-sided patch). -using base::TestSuite; - #endif // BASE_TEST_TEST_SUITE_H_ diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc index c3a9533..a21f5b5 100644 --- a/chrome/app/breakpad_win.cc +++ b/chrome/app/breakpad_win.cc @@ -22,7 +22,6 @@ #include "breakpad/src/client/windows/handler/exception_handler.h" #include "chrome/app/hard_error_handler_win.h" #include "chrome/common/child_process_logging.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" #include "chrome/common/result_codes.h" #include "chrome/common/policy_constants.h" diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index aab12c5..d3d7046 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -66,7 +66,6 @@ 'installer_util_strings', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', - '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/testing/gtest.gyp:gtest', ], @@ -145,7 +144,6 @@ 'installer_util', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', - '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'include_dirs': [ @@ -295,7 +293,6 @@ 'installer_util', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', - '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/testing/gtest.gyp:gtest', ], diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 4deba43..32cbdca 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -752,10 +752,6 @@ const char kProcessPerSite[] = "process-per-site"; // script connections to each other). const char kProcessPerTab[] = "process-per-tab"; -// The value of this switch determines whether the process is started as a -// renderer or plugin host. If it's empty, it's the browser. -const char kProcessType[] = "type"; - // Output the product version information and quit. Used as an internal api to // detect the installed version of Chrome on Linux. const char kProductVersion[] = "product-version"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 4767574..0db5f99 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -220,7 +220,6 @@ extern const char kPrelaunchGpuProcess[]; extern const char kPrint[]; extern const char kProcessPerSite[]; extern const char kProcessPerTab[]; -extern const char kProcessType[]; extern const char kProductVersion[]; extern const char kProfileImportProcess[]; extern const char kProxyAutoDetect[]; diff --git a/chrome/common/process_watcher_unittest.cc b/chrome/common/process_watcher_unittest.cc index 9bde1ac..159ebb59 100644 --- a/chrome/common/process_watcher_unittest.cc +++ b/chrome/common/process_watcher_unittest.cc @@ -8,12 +8,11 @@ #include <sys/wait.h> #include "base/eintr_wrapper.h" +#include "base/multiprocess_test.h" #include "base/process_util.h" -#include "base/test/multiprocess_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "testing/multiprocess_func_list.h" -class ProcessWatcherTest : public base::MultiProcessTest { +class ProcessWatcherTest : public MultiProcessTest { }; namespace { @@ -30,7 +29,7 @@ bool IsProcessDead(base::ProcessHandle child) { TEST_F(ProcessWatcherTest, DelayedTermination) { base::ProcessHandle child_process = - SpawnChild("process_watcher_test_never_die", false); + SpawnChild("process_watcher_test_never_die"); ProcessWatcher::EnsureProcessTerminated(child_process); base::WaitForSingleProcess(child_process, 5000); @@ -48,7 +47,7 @@ MULTIPROCESS_TEST_MAIN(process_watcher_test_never_die) { TEST_F(ProcessWatcherTest, ImmediateTermination) { base::ProcessHandle child_process = - SpawnChild("process_watcher_test_die_immediately", false); + SpawnChild("process_watcher_test_die_immediately"); // Give it time to die. sleep(2); ProcessWatcher::EnsureProcessTerminated(child_process); diff --git a/chrome/common/sandbox_mac_unittest_helper.h b/chrome/common/sandbox_mac_unittest_helper.h index 960a4cf..3006576 100644 --- a/chrome/common/sandbox_mac_unittest_helper.h +++ b/chrome/common/sandbox_mac_unittest_helper.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_ #pragma once -#include "base/test/multiprocess_test.h" +#include "base/multiprocess_test.h" #include "chrome/common/sandbox_mac.h" namespace sandboxtest { @@ -43,7 +43,7 @@ namespace sandboxtest { // Base test type with helper functions to spawn a subprocess that exercises // a given test in the sandbox. -class MacSandboxTest : public base::MultiProcessTest { +class MacSandboxTest : public MultiProcessTest { public: // Runs a test specified by |test_name| in a sandbox of the type specified // by |sandbox_type|. |test_data| is a custom string that a test can pass diff --git a/chrome/common/sandbox_mac_unittest_helper.mm b/chrome/common/sandbox_mac_unittest_helper.mm index 5b421c6..5ad7260 100644 --- a/chrome/common/sandbox_mac_unittest_helper.mm +++ b/chrome/common/sandbox_mac_unittest_helper.mm @@ -8,12 +8,8 @@ extern "C" { #include <sandbox.h> } -#include <map> - -#include "base/logging.h" #include "base/scoped_ptr.h" #include "chrome/common/sandbox_mac.h" -#include "testing/multiprocess_func_list.h" namespace { @@ -75,8 +71,7 @@ bool MacSandboxTest::RunTestInSandbox(sandbox::SandboxProcessType sandbox_type, if (test_data) setenv(kTestDataKey, test_data, 1); - base::ProcessHandle child_process = SpawnChild("mac_sandbox_test_runner", - false); + base::ProcessHandle child_process = SpawnChild("mac_sandbox_test_runner"); int code = -1; if (!base::WaitForExitCode(child_process, &code)) { LOG(WARNING) << "base::WaitForExitCode failed"; diff --git a/chrome/renderer/renderer_main_unittest.cc b/chrome/renderer/renderer_main_unittest.cc index f30103c..f329337 100644 --- a/chrome/renderer/renderer_main_unittest.cc +++ b/chrome/renderer/renderer_main_unittest.cc @@ -1,16 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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/message_loop.h" +#include "base/multiprocess_test.h" #include "base/process_util.h" -#include "base/test/multiprocess_test.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/main_function_params.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_switches.h" #include "testing/gtest/include/gtest/gtest.h" -#include "testing/multiprocess_func_list.h" // TODO(port): Bring up this test this on other platforms. #if defined(OS_POSIX) @@ -23,8 +22,9 @@ extern int RendererMain(const MainFunctionParams& parameters); // TODO(port): The IPC Channel tests have a class with extremely similar // functionality, we should combine them. -class RendererMainTest : public base::MultiProcessTest { +class RendererMainTest : public MultiProcessTest { protected: + // Create a new MessageLoopForIO For each test. virtual void SetUp(); virtual void TearDown(); diff --git a/chrome/test/mini_installer_test/run_all_unittests.cc b/chrome/test/mini_installer_test/run_all_unittests.cc index a0f6159..0549e1a 100644 --- a/chrome/test/mini_installer_test/run_all_unittests.cc +++ b/chrome/test/mini_installer_test/run_all_unittests.cc @@ -4,7 +4,6 @@ #include "base/command_line.h" #include "base/file_util.h" -#include "base/process_util.h" #include "base/test/test_suite.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/util_constants.h" @@ -45,7 +44,7 @@ int main(int argc, char** argv) { // with cleaning the system or make a backup before continuing. CommandLine::Init(argc, argv); const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - base::TestSuite test_suite(argc, argv); + TestSuite test_suite = TestSuite(argc, argv); if (command_line.HasSwitch(switches::kInstallerTestClean)) { printf("Current version of Chrome will be uninstalled " "from all levels before proceeding with tests.\n"); diff --git a/chrome/test/perf/perftests.cc b/chrome/test/perf/perftests.cc index dd00b65..904d44e 100644 --- a/chrome/test/perf/perftests.cc +++ b/chrome/test/perf/perftests.cc @@ -7,7 +7,7 @@ #include "chrome/common/chrome_paths.cc" int main(int argc, char **argv) { - base::PerfTestSuite suite(argc, argv); + PerfTestSuite suite(argc, argv); chrome::RegisterPathProvider(); MessageLoop main_message_loop; diff --git a/chrome/test/test_launcher/out_of_proc_test_runner.cc b/chrome/test/test_launcher/out_of_proc_test_runner.cc index 290bec0..eb4e172 100644 --- a/chrome/test/test_launcher/out_of_proc_test_runner.cc +++ b/chrome/test/test_launcher/out_of_proc_test_runner.cc @@ -78,7 +78,7 @@ class OutOfProcTestRunner : public tests::TestRunner { // Do not let the child ignore failures. We need to propagate the // failure status back to the parent. - new_cmd_line.AppendSwitch(base::TestSuite::kStrictFailureHandling); + new_cmd_line.AppendSwitch(kStrictFailureHandling); base::ProcessHandle process_handle; if (!base::LaunchApp(new_cmd_line, false, false, &process_handle)) diff --git a/chrome/test/test_launcher/test_runner.cc b/chrome/test/test_launcher/test_runner.cc index de448a36..1b75318 100644 --- a/chrome/test/test_launcher/test_runner.cc +++ b/chrome/test/test_launcher/test_runner.cc @@ -237,7 +237,7 @@ bool RunTests(const TestRunnerFactory& test_runner_factory) { ++test_run_count; if (!test_runner->RunTest(test_name.c_str())) { failed_tests.push_back(test_name); - bool ignore_failure = base::TestSuite::ShouldIgnoreFailure(*test_info); + bool ignore_failure = TestSuite::ShouldIgnoreFailure(*test_info); printer.OnTestEnd(test_info->name(), test_case->name(), true, true, ignore_failure, (base::Time::Now() - start_time).InMillisecondsF()); diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index 1cdd90f..b788879 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -12,11 +12,9 @@ #include "app/app_paths.h" #include "app/resource_bundle.h" -#include "base/command_line.h" #include "base/stats_table.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/process_util.h" #include "base/ref_counted.h" #include "base/scoped_nsautorelease_pool.h" #include "base/test/test_suite.h" @@ -30,7 +28,6 @@ #include "chrome/test/testing_browser_process.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" -#include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) #include "base/mac_util.h" @@ -84,10 +81,10 @@ class WarningHostResolverProc : public net::HostResolverProc { } }; -class ChromeTestSuite : public base::TestSuite { +class ChromeTestSuite : public TestSuite { public: ChromeTestSuite(int argc, char** argv) - : base::TestSuite(argc, argv), + : TestSuite(argc, argv), stats_table_(NULL), created_user_data_dir_(false) { } @@ -97,7 +94,7 @@ class ChromeTestSuite : public base::TestSuite { virtual void Initialize() { base::ScopedNSAutoreleasePool autorelease_pool; - base::TestSuite::Initialize(); + TestSuite::Initialize(); chrome::RegisterChromeSchemes(); host_resolver_proc_ = new WarningHostResolverProc(); @@ -175,7 +172,7 @@ class ChromeTestSuite : public base::TestSuite { file_util::Delete(user_data_dir, true); file_util::Delete(user_data_dir.DirName(), false); } - base::TestSuite::Shutdown(); + TestSuite::Shutdown(); } void SetBrowserDirectory(const FilePath& browser_dir) { diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 92623ab..7d36d33 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -115,9 +115,8 @@ 'type': 'executable', 'msvs_guid': '17D98CCA-0F6A-470F-9DF9-56DC6CC1A0BE', 'dependencies': [ - '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', - '../chrome/chrome.gyp:browser', + '../chrome/chrome.gyp:browser', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:debugger', '../chrome/chrome.gyp:nacl', @@ -204,7 +203,6 @@ 'msvs_guid': '1D25715A-C8CE-4448-AFA3-8515AF22D235', 'type': 'executable', 'dependencies': [ - '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', @@ -436,7 +434,6 @@ 'type': 'executable', 'msvs_guid': 'A1440368-4089-4E14-8864-D84D3C5714A7', 'dependencies': [ - '../base/base.gyp:test_support_base', '../chrome/chrome.gyp:browser', '../chrome/chrome.gyp:renderer', '../testing/gtest.gyp:gtest', diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 319f17e..308ac13 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -9,6 +9,7 @@ #include "app/app_paths.h" #include "app/resource_bundle.h" #include "app/win_util.h" + #include "base/command_line.h" #include "base/debug_util.h" #include "base/file_util.h" @@ -16,7 +17,7 @@ #include "base/i18n/icu_util.h" #include "base/path_service.h" #include "base/scoped_comptr_win.h" -#include "base/string_util.h" + #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/browser_prefs.h" #include "chrome/browser/plugin_service.h" @@ -36,7 +37,6 @@ #include "chrome_frame/test/simulate_input.h" #include "chrome_frame/test/win_event_receiver.h" #include "chrome_frame/test/net/test_automation_resource_message_filter.h" -#include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome_frame/test/perf/run_all.cc b/chrome_frame/test/perf/run_all.cc index 26c6e99..a5f4738 100644 --- a/chrome_frame/test/perf/run_all.cc +++ b/chrome_frame/test/perf/run_all.cc @@ -1,7 +1,6 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2010 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/platform_thread.h" #include "base/test/perf_test_suite.h" #include "base/scoped_ptr.h" @@ -11,7 +10,7 @@ #include "chrome_frame/utils.h" int main(int argc, char **argv) { - base::PerfTestSuite perf_suite(argc, argv); + PerfTestSuite perf_suite(argc, argv); chrome::RegisterPathProvider(); PlatformThread::SetName("ChromeFrame perf tests"); diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp index c45b3ac..7ca3dbe6 100644 --- a/courgette/courgette.gyp +++ b/courgette/courgette.gyp @@ -92,7 +92,6 @@ 'courgette_lib', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'conditions': [ @@ -118,7 +117,6 @@ 'courgette_lib', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'conditions': [ diff --git a/courgette/encoded_program_fuzz_unittest.cc b/courgette/encoded_program_fuzz_unittest.cc index 9f7e053..ccbf787 100644 --- a/courgette/encoded_program_fuzz_unittest.cc +++ b/courgette/encoded_program_fuzz_unittest.cc @@ -231,5 +231,5 @@ TEST_F(DecodeFuzzTest, All) { } int main(int argc, char** argv) { - return base::TestSuite(argc, argv).Run(); + return TestSuite(argc, argv).Run(); } diff --git a/courgette/run_all_unittests.cc b/courgette/run_all_unittests.cc index 8bfeb3b..841b353 100644 --- a/courgette/run_all_unittests.cc +++ b/courgette/run_all_unittests.cc @@ -5,5 +5,5 @@ #include "base/test/test_suite.h" int main(int argc, char** argv) { - return base::TestSuite(argc, argv).Run(); + return TestSuite(argc, argv).Run(); } diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp index 33fbc21..5947c4a 100644 --- a/gfx/gfx.gyp +++ b/gfx/gfx.gyp @@ -17,7 +17,6 @@ 'dependencies': [ 'gfx', 'gfx_resources', - '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], diff --git a/gfx/test_suite.h b/gfx/test_suite.h index 14d4ac9..0b8de49 100644 --- a/gfx/test_suite.h +++ b/gfx/test_suite.h @@ -11,7 +11,6 @@ #include <string> #include "gfx/gfx_paths.h" -#include "base/file_path.h" #include "base/path_service.h" #if defined(OS_MACOSX) #include "base/mac_util.h" @@ -19,7 +18,7 @@ #include "base/scoped_nsautorelease_pool.h" #include "base/test/test_suite.h" -class GfxTestSuite : public base::TestSuite { +class GfxTestSuite : public TestSuite { public: GfxTestSuite(int argc, char** argv) : TestSuite(argc, argv) { } diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index ebc590a..69da83b 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -38,7 +38,6 @@ 'ipc', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'include_dirs': [ diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc index 925eb5d..5f399da 100644 --- a/ipc/ipc_send_fds_test.cc +++ b/ipc/ipc_send_fds_test.cc @@ -18,7 +18,6 @@ extern "C" { #include "base/message_loop.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message_utils.h" -#include "testing/multiprocess_func_list.h" #if defined(OS_POSIX) diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc index 90be687..6118e58 100644 --- a/ipc/ipc_tests.cc +++ b/ipc/ipc_tests.cc @@ -536,7 +536,7 @@ int main(int argc, char** argv) { #ifdef PERFORMANCE_TEST int retval = PerfTestSuite(argc, argv).Run(); #else - int retval = base::TestSuite(argc, argv).Run(); + int retval = TestSuite(argc, argv).Run(); #endif return retval; } diff --git a/ipc/ipc_tests.h b/ipc/ipc_tests.h index bfefb4c..09a5ab8 100644 --- a/ipc/ipc_tests.h +++ b/ipc/ipc_tests.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef IPC_IPC_TESTS_H_ -#define IPC_IPC_TESTS_H_ +#ifndef IPC_IPC_TESTS_H__ +#define IPC_IPC_TESTS_H__ #pragma once -#include "base/test/multiprocess_test.h" +#include "base/multiprocess_test.h" #include "base/process.h" // This unit test uses 3 types of child processes, a regular pipe client, @@ -32,7 +32,7 @@ class Channel; } // namespace IPC //Base class to facilitate Spawning IPC Client processes. -class IPCChannelTest : public base::MultiProcessTest { +class IPCChannelTest : public MultiProcessTest { protected: // Create a new MessageLoopForIO For each test. @@ -46,4 +46,4 @@ class IPCChannelTest : public base::MultiProcessTest { MessageLoopForIO* message_loop_; }; -#endif // IPC_IPC_TESTS_H_ +#endif // IPC_IPC_TESTS_H__ diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index eafe96b..b3edc24 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -95,6 +95,7 @@ 'sources': [ # TODO(akalin): Write our own test suite and runner. '../base/test/run_all_unittests.cc', + '../base/test/test_suite.h', 'notifier/base/chrome_async_socket_unittest.cc', 'notifier/listener/talk_mediator_unittest.cc', 'notifier/listener/send_update_task_unittest.cc', @@ -107,7 +108,6 @@ 'dependencies': [ 'notifier', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../testing/gmock.gyp:gmock', diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index b715a328b..b9a5529 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -5,5 +5,5 @@ #include "base/test/test_suite.h" int main(int argc, char** argv) { - return base::TestSuite(argc, argv).Run(); + return TestSuite(argc, argv).Run(); } diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index 343486e..14b117d 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -42,7 +42,7 @@ #include "testing/gtest/include/gtest/gtest.h" int main(int argc, char** argv) { - return base::PerfTestSuite(argc, argv).Run(); + return PerfTestSuite(argc, argv).Run(); } namespace media { diff --git a/media/media.gyp b/media/media.gyp index b2c3a74..bb35b5e 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -182,7 +182,6 @@ 'media', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', '../testing/gtest.gyp:gtest', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', @@ -217,7 +216,6 @@ 'media', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', @@ -472,7 +470,6 @@ 'omx_wrapper', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'conditions': [ diff --git a/media/omx/run_all_unittests.cc b/media/omx/run_all_unittests.cc index b28ef94..dbc6ea8 100644 --- a/media/omx/run_all_unittests.cc +++ b/media/omx/run_all_unittests.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" -#include "base/logging.h" #include "base/test/test_suite.h" #include "media/base/media.h" @@ -13,5 +11,5 @@ int main(int argc, char** argv) { LOG(ERROR) << "Unable to initialize OpenMAX library."; return -1; } - return base::TestSuite(argc, argv).Run(); + return TestSuite(argc, argv).Run(); } diff --git a/net/base/net_test_suite.h b/net/base/net_test_suite.h index eab3a53..804db01 100644 --- a/net/base/net_test_suite.h +++ b/net/base/net_test_suite.h @@ -11,7 +11,7 @@ #include "base/test/test_suite.h" #include "net/base/mock_host_resolver.h" -class NetTestSuite : public base::TestSuite { +class NetTestSuite : public TestSuite { public: NetTestSuite(int argc, char** argv) : TestSuite(argc, argv) { } diff --git a/net/base/run_all_unittests.cc b/net/base/run_all_unittests.cc index 16ecc41..85bda7d 100644 --- a/net/base/run_all_unittests.cc +++ b/net/base/run_all_unittests.cc @@ -4,7 +4,6 @@ #include "build/build_config.h" #include "base/histogram.h" -#include "base/nss_util.h" #include "net/base/net_test_suite.h" #if defined(OS_WIN) #include "net/socket/ssl_client_socket_nss_factory.h" diff --git a/net/net.gyp b/net/net.gyp index 63b2601..fb7b0cc 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -658,7 +658,6 @@ 'net_test_support', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/zlib/zlib.gyp:zlib', diff --git a/printing/printing.gyp b/printing/printing.gyp index 48e31a1..ec1872a 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -87,7 +87,6 @@ 'dependencies': [ 'printing', '../testing/gtest.gyp:gtest', - '../base/base.gyp:test_support_base', ], 'sources': [ 'emf_win_unittest.cc', diff --git a/printing/run_all_unittests.cc b/printing/run_all_unittests.cc index b715a328b..b9a5529 100644 --- a/printing/run_all_unittests.cc +++ b/printing/run_all_unittests.cc @@ -5,5 +5,5 @@ #include "base/test/test_suite.h" int main(int argc, char** argv) { - return base::TestSuite(argc, argv).Run(); + return TestSuite(argc, argv).Run(); } diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 693aa2f..51afbbf 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -342,7 +342,6 @@ 'chromoting_jingle_glue', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../gfx/gfx.gyp:gfx', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', diff --git a/remoting/run_all_unittests.cc b/remoting/run_all_unittests.cc index 2571950..f008d3e 100644 --- a/remoting/run_all_unittests.cc +++ b/remoting/run_all_unittests.cc @@ -5,5 +5,5 @@ #include "base/test/test_suite.h" int main(int argc, char** argv) { - return base::TestSuite(argc, argv).Run(); + return TestSuite(argc, argv).Run(); } |