summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/test/run_all_unittests.cc25
-rw-r--r--base/test/test_suite.cc15
-rw-r--r--base/test/test_suite.h7
-rw-r--r--dbus/run_all_unittests.cc24
-rw-r--r--gpu/command_buffer/client/cmd_buffer_helper_test.cc1
-rw-r--r--gpu/command_buffer/client/fenced_allocator_test.cc1
-rw-r--r--gpu/command_buffer/client/mapped_memory_unittest.cc1
-rw-r--r--gpu/command_buffer/client/ring_buffer_test.cc1
-rw-r--r--gpu/command_buffer/common/unittest_main.cc43
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h2
-rw-r--r--gpu/command_buffer/service/gpu_scheduler_unittest.cc1
-rw-r--r--gpu/command_buffer/service/gpu_service_test.h2
-rw-r--r--ipc/run_all_unittests.cc25
-rw-r--r--net/test/net_test_suite.cc5
-rw-r--r--net/test/net_test_suite.h5
-rw-r--r--remoting/test/app_remoting_test_driver.cc22
-rw-r--r--remoting/test/chromoting_test_driver.cc23
-rw-r--r--ui/snapshot/test/run_all_unittests.cc28
18 files changed, 43 insertions, 188 deletions
diff --git a/base/test/run_all_unittests.cc b/base/test/run_all_unittests.cc
index 93cb8cb..e5c5975 100644
--- a/base/test/run_all_unittests.cc
+++ b/base/test/run_all_unittests.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/at_exit.h"
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
@@ -12,29 +11,13 @@
#include "base/test/test_file_util.h"
#endif
-namespace {
-
-class NoAtExitBaseTestSuite : public base::TestSuite {
- public:
- NoAtExitBaseTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv, false) {
- }
-};
-
-int RunTestSuite(int argc, char** argv) {
- return NoAtExitBaseTestSuite(argc, argv).Run();
-}
-
-} // namespace
-
int main(int argc, char** argv) {
#if defined(OS_ANDROID)
JNIEnv* env = base::android::AttachCurrentThread();
base::RegisterContentUriTestUtils(env);
-#else
- base::AtExitManager at_exit;
#endif
- return base::LaunchUnitTests(argc,
- argv,
- base::Bind(&RunTestSuite, argc, argv));
+ base::TestSuite test_suite(argc, argv);
+ return base::LaunchUnitTests(
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 57f4241..3a6c2b0 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -97,24 +97,18 @@ int RunUnitTestsUsingBaseTestSuite(int argc, char **argv) {
}
TestSuite::TestSuite(int argc, char** argv) : initialized_command_line_(false) {
- PreInitialize(true);
+ PreInitialize();
InitializeFromCommandLine(argc, argv);
}
#if defined(OS_WIN)
TestSuite::TestSuite(int argc, wchar_t** argv)
: initialized_command_line_(false) {
- PreInitialize(true);
+ PreInitialize();
InitializeFromCommandLine(argc, argv);
}
#endif // defined(OS_WIN)
-TestSuite::TestSuite(int argc, char** argv, bool create_at_exit_manager)
- : initialized_command_line_(false) {
- PreInitialize(create_at_exit_manager);
- InitializeFromCommandLine(argc, argv);
-}
-
TestSuite::~TestSuite() {
if (initialized_command_line_)
CommandLine::Reset();
@@ -139,7 +133,7 @@ void TestSuite::InitializeFromCommandLine(int argc, wchar_t** argv) {
}
#endif // defined(OS_WIN)
-void TestSuite::PreInitialize(bool create_at_exit_manager) {
+void TestSuite::PreInitialize() {
#if defined(OS_WIN)
testing::GTEST_FLAG(catch_exceptions) = false;
#endif
@@ -154,8 +148,7 @@ void TestSuite::PreInitialize(bool create_at_exit_manager) {
// On Android, AtExitManager is created in
// testing/android/native_test_wrapper.cc before main() is called.
#if !defined(OS_ANDROID)
- if (create_at_exit_manager)
- at_exit_manager_.reset(new AtExitManager);
+ at_exit_manager_.reset(new AtExitManager);
#endif
// Don't add additional code to this function. Instead add it to
diff --git a/base/test/test_suite.h b/base/test/test_suite.h
index cf0dd3a..e63ef32 100644
--- a/base/test/test_suite.h
+++ b/base/test/test_suite.h
@@ -49,11 +49,6 @@ class TestSuite {
int Run();
protected:
- // This constructor is only accessible to specialized test suite
- // implementations which need to control the creation of an AtExitManager
- // instance for the duration of the test.
- TestSuite(int argc, char** argv, bool create_at_exit_manager);
-
// 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.
@@ -79,7 +74,7 @@ class TestSuite {
#endif // defined(OS_WIN)
// Basic initialization for the test suite happens here.
- void PreInitialize(bool create_at_exit_manager);
+ void PreInitialize();
test::TraceToFile trace_to_file_;
diff --git a/dbus/run_all_unittests.cc b/dbus/run_all_unittests.cc
index e90849c..dac4a3c 100644
--- a/dbus/run_all_unittests.cc
+++ b/dbus/run_all_unittests.cc
@@ -2,29 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/at_exit.h"
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-namespace {
-
-class NoAtExitBaseTestSuite : public base::TestSuite {
- public:
- NoAtExitBaseTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv, false) {
- }
-};
-
-int RunTestSuite(int argc, char** argv) {
- return NoAtExitBaseTestSuite(argc, argv).Run();
-}
-
-} // namespace
-
int main(int argc, char** argv) {
- base::AtExitManager at_exit;
- return base::LaunchUnitTestsSerially(argc,
- argv,
- base::Bind(&RunTestSuite, argc, argv));
+ base::TestSuite test_suite(argc, argv);
+ return base::LaunchUnitTests(
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
diff --git a/gpu/command_buffer/client/cmd_buffer_helper_test.cc b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
index 48c1895..bf7902e 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper_test.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
@@ -259,6 +259,7 @@ class CommandBufferHelperTest : public testing::Test {
std::list<linked_ptr<std::vector<CommandBufferEntry> > > test_command_args_;
unsigned int test_command_next_id_;
Sequence sequence_;
+ base::MessageLoop message_loop_;
};
// Checks immediate_entry_count_ changes based on 'usable' state.
diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc
index 94faf0c..8635d0b 100644
--- a/gpu/command_buffer/client/fenced_allocator_test.cc
+++ b/gpu/command_buffer/client/fenced_allocator_test.cc
@@ -74,6 +74,7 @@ class BaseFencedAllocatorTest : public testing::Test {
scoped_ptr<CommandBufferService> command_buffer_;
scoped_ptr<GpuScheduler> gpu_scheduler_;
scoped_ptr<CommandBufferHelper> helper_;
+ base::MessageLoop message_loop_;
};
#ifndef _MSC_VER
diff --git a/gpu/command_buffer/client/mapped_memory_unittest.cc b/gpu/command_buffer/client/mapped_memory_unittest.cc
index 73da176..2bfb157 100644
--- a/gpu/command_buffer/client/mapped_memory_unittest.cc
+++ b/gpu/command_buffer/client/mapped_memory_unittest.cc
@@ -72,6 +72,7 @@ class MappedMemoryTestBase : public testing::Test {
scoped_ptr<CommandBufferService> command_buffer_;
scoped_ptr<GpuScheduler> gpu_scheduler_;
scoped_ptr<CommandBufferHelper> helper_;
+ base::MessageLoop message_loop_;
};
#ifndef _MSC_VER
diff --git a/gpu/command_buffer/client/ring_buffer_test.cc b/gpu/command_buffer/client/ring_buffer_test.cc
index 86b420d..ac3c8d7 100644
--- a/gpu/command_buffer/client/ring_buffer_test.cc
+++ b/gpu/command_buffer/client/ring_buffer_test.cc
@@ -101,6 +101,7 @@ class BaseRingBufferTest : public testing::Test {
scoped_ptr<int8[]> buffer_;
int8* buffer_start_;
+ base::MessageLoop message_loop_;
};
#ifndef _MSC_VER
diff --git a/gpu/command_buffer/common/unittest_main.cc b/gpu/command_buffer/common/unittest_main.cc
index 17b6114..ed03dca 100644
--- a/gpu/command_buffer/common/unittest_main.cc
+++ b/gpu/command_buffer/common/unittest_main.cc
@@ -2,48 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/at_exit.h"
#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(OS_MACOSX)
-#include "base/mac/scoped_nsautorelease_pool.h"
-#endif
-
-namespace {
-
-class NoAtExitBaseTestSuite : public base::TestSuite {
- public:
- NoAtExitBaseTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv, false) {
- }
-};
-
-int RunTestSuite(int argc, char** argv) {
- base::MessageLoop message_loop;
- return NoAtExitBaseTestSuite(argc, argv).Run();
-}
-
-} // namespace
int main(int argc, char** argv) {
- // On Android, AtExitManager is created in
- // testing/android/native_test_wrapper.cc before main() is called.
- // The same thing is also done in base/test/test_suite.cc
-#if !defined(OS_ANDROID)
- base::AtExitManager exit_manager;
-#endif
- base::CommandLine::Init(argc, argv);
-#if defined(OS_MACOSX)
- base::mac::ScopedNSAutoreleasePool autorelease_pool;
-#endif
- testing::InitGoogleMock(&argc, argv);
- return base::LaunchUnitTests(argc,
- argv,
- base::Bind(&RunTestSuite, argc, argv));
+ base::TestSuite test_suite(argc, argv);
+ return base::LaunchUnitTests(
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index dcc7160..3e45b9f 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -5,6 +5,7 @@
#ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
#define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
+#include "base/message_loop/message_loop.h"
#include "gpu/command_buffer/common/gles2_cmd_format.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
#include "gpu/command_buffer/service/buffer_manager.h"
@@ -721,6 +722,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_;
scoped_refptr<ContextGroup> group_;
MockGLStates gl_states_;
+ base::MessageLoop message_loop_;
};
class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase {
diff --git a/gpu/command_buffer/service/gpu_scheduler_unittest.cc b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
index c1c2ef7..b8a19f6 100644
--- a/gpu/command_buffer/service/gpu_scheduler_unittest.cc
+++ b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
@@ -72,6 +72,7 @@ class GpuSchedulerTest : public testing::Test {
int32* buffer_;
scoped_ptr<gles2::MockGLES2Decoder> decoder_;
scoped_ptr<GpuScheduler> scheduler_;
+ base::MessageLoop message_loop_;
};
TEST_F(GpuSchedulerTest, SchedulerDoesNothingIfRingBufferIsEmpty) {
diff --git a/gpu/command_buffer/service/gpu_service_test.h b/gpu/command_buffer/service/gpu_service_test.h
index 7c9c978..e547ff1 100644
--- a/gpu/command_buffer/service/gpu_service_test.h
+++ b/gpu/command_buffer/service/gpu_service_test.h
@@ -7,6 +7,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_mock.h"
@@ -36,6 +37,7 @@ class GpuServiceTest : public testing::Test {
bool ran_setup_;
bool ran_teardown_;
scoped_refptr<gfx::GLContextStubWithExtensions> context_;
+ base::MessageLoop message_loop_;
};
} // namespace gles2
diff --git a/ipc/run_all_unittests.cc b/ipc/run_all_unittests.cc
index a488802..047c614 100644
--- a/ipc/run_all_unittests.cc
+++ b/ipc/run_all_unittests.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/at_exit.h"
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
@@ -12,29 +11,13 @@
#include "base/test/test_file_util.h"
#endif
-namespace {
-
-class NoAtExitBaseTestSuite : public base::TestSuite {
- public:
- NoAtExitBaseTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv, false) {
- }
-};
-
-int RunTestSuite(int argc, char** argv) {
- return NoAtExitBaseTestSuite(argc, argv).Run();
-}
-
-} // namespace
-
int main(int argc, char** argv) {
#if defined(OS_ANDROID)
JNIEnv* env = base::android::AttachCurrentThread();
base::RegisterContentUriTestUtils(env);
-#else
- base::AtExitManager at_exit;
#endif
- return base::LaunchUnitTestsSerially(argc,
- argv,
- base::Bind(&RunTestSuite, argc, argv));
+ base::TestSuite test_suite(argc, argv);
+ return base::LaunchUnitTests(
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
diff --git a/net/test/net_test_suite.cc b/net/test/net_test_suite.cc
index b14e3fe..a657d26 100644
--- a/net/test/net_test_suite.cc
+++ b/net/test/net_test_suite.cc
@@ -24,11 +24,6 @@ NetTestSuite::NetTestSuite(int argc, char** argv)
: TestSuite(argc, argv) {
}
-NetTestSuite::NetTestSuite(int argc, char** argv,
- bool create_at_exit_manager)
- : TestSuite(argc, argv, create_at_exit_manager) {
-}
-
NetTestSuite::~NetTestSuite() {}
void NetTestSuite::Initialize() {
diff --git a/net/test/net_test_suite.h b/net/test/net_test_suite.h
index e0f601e..92f079c 100644
--- a/net/test/net_test_suite.h
+++ b/net/test/net_test_suite.h
@@ -28,11 +28,6 @@ class NetTestSuite : public base::TestSuite {
void Shutdown() override;
protected:
- // This constructor is only accessible to specialized net test
- // implementations which need to control the creation of an AtExitManager
- // instance for the duration of the test.
- NetTestSuite(int argc, char** argv, bool create_at_exit_manager);
-
// Called from within Initialize(), but separate so that derived classes
// can initialize the NetTestSuite instance only and not
// TestSuite::Initialize(). TestSuite::Initialize() performs some global
diff --git a/remoting/test/app_remoting_test_driver.cc b/remoting/test/app_remoting_test_driver.cc
index 577ea63..e036363 100644
--- a/remoting/test/app_remoting_test_driver.cc
+++ b/remoting/test/app_remoting_test_driver.cc
@@ -143,26 +143,11 @@ void PrintJsonFileInfo() {
switches::kRefreshTokenFileSwitchName);
}
-// This class exists so that we can create a test suite which does not create
-// its own AtExitManager. The problem we are working around occurs when
-// the test suite does not create an AtExitManager (e.g. if no tests are run)
-// and the environment object destroys its MessageLoop, then a crash will occur.
-class NoAtExitBaseTestSuite : public base::TestSuite {
- public:
- NoAtExitBaseTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv, false) {}
-
- static int RunTestSuite(int argc, char** argv) {
- return NoAtExitBaseTestSuite(argc, argv).Run();
- }
-};
-
} // namespace
int main(int argc, char** argv) {
- base::AtExitManager at_exit;
+ base::TestSuite test_suite(argc, argv);
base::MessageLoopForIO message_loop;
- testing::InitGoogleTest(&argc, argv);
if (!base::CommandLine::InitializedForCurrentProcess()) {
if (!base::CommandLine::Init(argc, argv)) {
@@ -197,7 +182,7 @@ int main(int argc, char** argv) {
PrintAuthCodeInfo();
return base::LaunchUnitTestsSerially(
argc, argv,
- base::Bind(&NoAtExitBaseTestSuite::RunTestSuite, argc, argv));
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
remoting::test::AppRemotingTestDriverEnvironment::EnvironmentOptions options;
@@ -265,5 +250,6 @@ int main(int argc, char** argv) {
// Because many tests may access the same remoting host(s), we need to run
// the tests sequentially so they do not interfere with each other.
return base::LaunchUnitTestsSerially(
- argc, argv, base::Bind(&NoAtExitBaseTestSuite::RunTestSuite, argc, argv));
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
diff --git a/remoting/test/chromoting_test_driver.cc b/remoting/test/chromoting_test_driver.cc
index c9df6c6..e8c977f 100644
--- a/remoting/test/chromoting_test_driver.cc
+++ b/remoting/test/chromoting_test_driver.cc
@@ -133,26 +133,11 @@ void PrintJsonFileInfo() {
switches::kHostNameSwitchName, switches::kRefreshTokenPathSwitchName);
}
-// This class exists so that we can create a test suite which does not create
-// its own AtExitManager. The problem we are working around occurs when
-// the test suite does not create an AtExitManager (e.g. if no tests are run)
-// and the environment object destroys its MessageLoop, then a crash will occur.
-class NoAtExitBaseTestSuite : public base::TestSuite {
- public:
- NoAtExitBaseTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv, false) {}
-
- static int RunTestSuite(int argc, char** argv) {
- return NoAtExitBaseTestSuite(argc, argv).Run();
- }
-};
-
} // namespace
int main(int argc, char* argv[]) {
- base::AtExitManager at_exit;
+ base::TestSuite test_suite(argc, argv);
base::MessageLoopForIO message_loop;
- testing::InitGoogleTest(&argc, argv);
if (!base::CommandLine::InitializedForCurrentProcess()) {
if (!base::CommandLine::Init(argc, argv)) {
@@ -180,7 +165,8 @@ int main(int argc, char* argv[]) {
PrintJsonFileInfo();
PrintAuthCodeInfo();
return base::LaunchUnitTestsSerially(
- argc, argv, base::Bind(&NoAtExitBaseTestSuite::RunTestSuite, argc, argv));
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
// Update the logging verbosity level if user specified one.
@@ -254,5 +240,6 @@ int main(int argc, char* argv[]) {
// Running the tests serially will avoid clients from connecting to the same
// host.
return base::LaunchUnitTestsSerially(
- argc, argv, base::Bind(&NoAtExitBaseTestSuite::RunTestSuite, argc, argv));
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
diff --git a/ui/snapshot/test/run_all_unittests.cc b/ui/snapshot/test/run_all_unittests.cc
index 238e0be..ef63441 100644
--- a/ui/snapshot/test/run_all_unittests.cc
+++ b/ui/snapshot/test/run_all_unittests.cc
@@ -7,23 +7,6 @@
#include "base/test/test_suite.h"
#include "ui/compositor/test/test_suite.h"
-namespace {
-
-#if !defined(USE_AURA)
-class NoAtExitBaseTestSuite : public base::TestSuite {
- public:
- NoAtExitBaseTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv, false) {
- }
-};
-
-int RunTestSuite(int argc, char** argv) {
- return NoAtExitBaseTestSuite(argc, argv).Run();
-}
-#endif // !defined(USE_AURA)
-
-} // namespace
-
int main(int argc, char** argv) {
#if defined(USE_AURA)
ui::test::CompositorTestSuite test_suite(argc, argv);
@@ -32,12 +15,9 @@ int main(int argc, char** argv) {
argc, argv, base::Bind(&ui::test::CompositorTestSuite::Run,
base::Unretained(&test_suite)));
#else
-
-#if !defined(OS_ANDROID)
- base::AtExitManager at_exit;
-#endif
- return base::LaunchUnitTests(argc,
- argv,
- base::Bind(&RunTestSuite, argc, argv));
+ base::TestSuite test_suite(argc, argv);
+ return base::LaunchUnitTests(
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
#endif
}
generated by cgit v1.1 at 2024-05-13 10:42:12 +0000