Skip to content

GitLab

T
tangled
Commit 3bc1379a authored by viettrungluu@chromium.org's avatar viettrungluu@chromium.org
Browse files
Options

Mojo: MultiprocessTestBase -> MultiprocessTestHelper. 

Because inheritance sucks.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/190943003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255798 0039d316-1c4b-4281-b951-d872f2087c98
parent 3e9d30ee
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 84 deletions
mojo/common/test/multiprocess_test_base.cc → mojo/common/test/multiprocess_test_helper.cc
View file @ 3bc1379a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "mojo/common/test/multiprocess_test_base.h" #include "mojo/common/test/multiprocess_test_helper.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/logging.h" #include "base/logging.h"
...@@ -14,43 +14,29 @@ ...@@ -14,43 +14,29 @@
namespace mojo { namespace mojo {
namespace test { namespace test {
MultiprocessTestBase::MultiprocessTestBase() MultiprocessTestHelper::MultiprocessTestHelper()
: test_child_handle_(base::kNullProcessHandle) { : test_child_handle_(base::kNullProcessHandle) {
}
MultiprocessTestBase::~MultiprocessTestBase() {
CHECK_EQ(test_child_handle_, base::kNullProcessHandle);
}
void MultiprocessTestBase::SetUp() {
CHECK_EQ(test_child_handle_, base::kNullProcessHandle);
MultiProcessTest::SetUp();
platform_channel_pair_.reset(new embedder::PlatformChannelPair()); platform_channel_pair_.reset(new embedder::PlatformChannelPair());
server_platform_handle = platform_channel_pair_->PassServerHandle(); server_platform_handle = platform_channel_pair_->PassServerHandle();
} }
void MultiprocessTestBase::TearDown() { MultiprocessTestHelper::~MultiprocessTestHelper() {
CHECK_EQ(test_child_handle_, base::kNullProcessHandle); CHECK_EQ(test_child_handle_, base::kNullProcessHandle);
server_platform_handle.reset(); server_platform_handle.reset();
platform_channel_pair_.reset(); platform_channel_pair_.reset();
MultiProcessTest::TearDown();
} }
void MultiprocessTestBase::StartChild(const std::string& test_child_name) { void MultiprocessTestHelper::StartChild(const std::string& test_child_name) {
CHECK(platform_channel_pair_.get()); CHECK(platform_channel_pair_.get());
CHECK(!test_child_name.empty()); CHECK(!test_child_name.empty());
CHECK_EQ(test_child_handle_, base::kNullProcessHandle); CHECK_EQ(test_child_handle_, base::kNullProcessHandle);
std::string test_child_main = test_child_name + "TestChildMain"; std::string test_child_main = test_child_name + "TestChildMain";
CommandLine unused(CommandLine::NO_PROGRAM); CommandLine command_line(base::GetMultiProcessTestChildBaseCommandLine());
embedder::HandlePassingInformation handle_passing_info; embedder::HandlePassingInformation handle_passing_info;
platform_channel_pair_->PrepareToPassClientHandleToChildProcess( platform_channel_pair_->PrepareToPassClientHandleToChildProcess(
&unused, &handle_passing_info); &command_line, &handle_passing_info);
base::LaunchOptions options; base::LaunchOptions options;
#if defined(OS_POSIX) #if defined(OS_POSIX)
...@@ -62,39 +48,26 @@ void MultiprocessTestBase::StartChild(const std::string& test_child_name) { ...@@ -62,39 +48,26 @@ void MultiprocessTestBase::StartChild(const std::string& test_child_name) {
#error "Not supported yet." #error "Not supported yet."
#endif #endif
test_child_handle_ = SpawnChildWithOptions(test_child_main, options, false); test_child_handle_ = base::SpawnMultiProcessTestChild(
test_child_main, command_line, options, false);
platform_channel_pair_->ChildProcessLaunched(); platform_channel_pair_->ChildProcessLaunched();
CHECK_NE(test_child_handle_, base::kNullProcessHandle); CHECK_NE(test_child_handle_, base::kNullProcessHandle);
} }
int MultiprocessTestBase::WaitForChildShutdown() { int MultiprocessTestHelper::WaitForChildShutdown() {
CHECK_NE(test_child_handle_, base::kNullProcessHandle); CHECK_NE(test_child_handle_, base::kNullProcessHandle);
static const int kTimeoutSeconds = 5;
int rv = -1; int rv = -1;
CHECK(base::WaitForExitCodeWithTimeout( CHECK(base::WaitForExitCodeWithTimeout(
test_child_handle_, &rv, base::TimeDelta::FromSeconds(kTimeoutSeconds))); test_child_handle_, &rv, TestTimeouts::action_timeout()));
base::CloseProcessHandle(test_child_handle_); base::CloseProcessHandle(test_child_handle_);
test_child_handle_ = base::kNullProcessHandle; test_child_handle_ = base::kNullProcessHandle;
return rv; return rv;
} }
CommandLine MultiprocessTestBase::MakeCmdLine(const std::string& procname,
bool debug_on_start) {
CHECK(platform_channel_pair_.get());
CommandLine command_line =
base::MultiProcessTest::MakeCmdLine(procname, debug_on_start);
embedder::HandlePassingInformation unused;
platform_channel_pair_->PrepareToPassClientHandleToChildProcess(&command_line,
&unused);
return command_line;
}
// static // static
void MultiprocessTestBase::ChildSetup() { void MultiprocessTestHelper::ChildSetup() {
CHECK(CommandLine::InitializedForCurrentProcess()); CHECK(CommandLine::InitializedForCurrentProcess());
client_platform_handle = client_platform_handle =
embedder::PlatformChannelPair::PassClientHandleFromParentProcess( embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
...@@ -102,7 +75,7 @@ void MultiprocessTestBase::ChildSetup() { ...@@ -102,7 +75,7 @@ void MultiprocessTestBase::ChildSetup() {
} }
// static // static
embedder::ScopedPlatformHandle MultiprocessTestBase::client_platform_handle; embedder::ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle;
} // namespace test } // namespace test
} // namespace mojo } // namespace mojo
mojo/common/test/multiprocess_test_base.h → mojo/common/test/multiprocess_test_helper.h
View file @ 3bc1379a
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef MOJO_COMMON_TEST_MULTIPROCESS_TEST_BASE_H_ #ifndef MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
#define MOJO_COMMON_TEST_MULTIPROCESS_TEST_BASE_H_ #define MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
#include <string> #include <string>
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/process/process_handle.h" #include "base/process/process_handle.h"
#include "base/test/multiprocess_test.h" #include "base/test/multiprocess_test.h"
#include "base/test/test_timeouts.h"
#include "mojo/system/embedder/scoped_platform_handle.h" #include "mojo/system/embedder/scoped_platform_handle.h"
#include "testing/multiprocess_func_list.h" #include "testing/multiprocess_func_list.h"
...@@ -22,13 +23,10 @@ class PlatformChannelPair; ...@@ -22,13 +23,10 @@ class PlatformChannelPair;
namespace test { namespace test {
class MultiprocessTestBase : public base::MultiProcessTest { class MultiprocessTestHelper {
public: public:
MultiprocessTestBase(); MultiprocessTestHelper();
virtual ~MultiprocessTestBase(); ~MultiprocessTestHelper();
virtual void SetUp() OVERRIDE;
virtual void TearDown() OVERRIDE;
// Start a child process and run the "main" function "named" |test_child_name| // Start a child process and run the "main" function "named" |test_child_name|
// declared using |MOJO_MULTIPROCESS_TEST_CHILD_MAIN()| (below). // declared using |MOJO_MULTIPROCESS_TEST_CHILD_MAIN()| (below).
...@@ -51,26 +49,23 @@ class MultiprocessTestBase : public base::MultiProcessTest { ...@@ -51,26 +49,23 @@ class MultiprocessTestBase : public base::MultiProcessTest {
static embedder::ScopedPlatformHandle client_platform_handle; static embedder::ScopedPlatformHandle client_platform_handle;
private: private:
virtual CommandLine MakeCmdLine(const std::string& procname,
bool debug_on_start) OVERRIDE;
scoped_ptr<embedder::PlatformChannelPair> platform_channel_pair_; scoped_ptr<embedder::PlatformChannelPair> platform_channel_pair_;
// Valid after |StartChild()| and before |WaitForChildShutdown()|. // Valid after |StartChild()| and before |WaitForChildShutdown()|.
base::ProcessHandle test_child_handle_; base::ProcessHandle test_child_handle_;
DISALLOW_COPY_AND_ASSIGN(MultiprocessTestBase); DISALLOW_COPY_AND_ASSIGN(MultiprocessTestHelper);
}; };
// Use this to declare the child process's "main()" function for tests using // Use this to declare the child process's "main()" function for tests using
// |MultiprocessTestBase|. It returns an |int|, which will be the process's exit // |MultiprocessTestHelper|. It returns an |int|, which will be the process's
// code (but see the comment about |WaitForChildShutdown()|). // exit code (but see the comment about |WaitForChildShutdown()|).
#define MOJO_MULTIPROCESS_TEST_CHILD_MAIN(test_child_name) \ #define MOJO_MULTIPROCESS_TEST_CHILD_MAIN(test_child_name) \
MULTIPROCESS_TEST_MAIN_WITH_SETUP( \ MULTIPROCESS_TEST_MAIN_WITH_SETUP( \
test_child_name ## TestChildMain, \ test_child_name ## TestChildMain, \
::mojo::test::MultiprocessTestBase::ChildSetup) ::mojo::test::MultiprocessTestHelper::ChildSetup)
} // namespace test } // namespace test
} // namespace mojo } // namespace mojo
#endif // MOJO_COMMON_TEST_MULTIPROCESS_TEST_BASE_H_ #endif // MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
mojo/common/test/multiprocess_test_base_unittest.cc → mojo/common/test/multiprocess_test_helper_unittest.cc
View file @ 3bc1379a
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "mojo/common/test/multiprocess_test_base.h" #include "mojo/common/test/multiprocess_test_helper.h"
#include "base/logging.h" #include "base/logging.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "mojo/common/test/test_utils.h" #include "mojo/common/test/test_utils.h"
#include "mojo/system/embedder/scoped_platform_handle.h" #include "mojo/system/embedder/scoped_platform_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_POSIX) #if defined(OS_POSIX)
#include <fcntl.h> #include <fcntl.h>
...@@ -55,41 +56,44 @@ bool ReadByte(const embedder::PlatformHandle& handle, char* c) { ...@@ -55,41 +56,44 @@ bool ReadByte(const embedder::PlatformHandle& handle, char* c) {
return bytes_read == 1; return bytes_read == 1;
} }
typedef MultiprocessTestBase MultiprocessTestBaseTest; typedef testing::Test MultiprocessTestHelperTest;
TEST_F(MultiprocessTestBaseTest, RunChild) { TEST_F(MultiprocessTestHelperTest, RunChild) {
if (SkipTest()) if (SkipTest())
return; return;
EXPECT_TRUE(server_platform_handle.is_valid()); MultiprocessTestHelper helper;
EXPECT_TRUE(helper.server_platform_handle.is_valid());
StartChild("RunChild"); helper.StartChild("RunChild");
EXPECT_EQ(123, WaitForChildShutdown()); EXPECT_EQ(123, helper.WaitForChildShutdown());
} }
MOJO_MULTIPROCESS_TEST_CHILD_MAIN(RunChild) { MOJO_MULTIPROCESS_TEST_CHILD_MAIN(RunChild) {
CHECK(MultiprocessTestBaseTest::client_platform_handle.is_valid()); CHECK(MultiprocessTestHelper::client_platform_handle.is_valid());
return 123; return 123;
} }
TEST_F(MultiprocessTestBaseTest, TestChildMainNotFound) { TEST_F(MultiprocessTestHelperTest, TestChildMainNotFound) {
if (SkipTest()) if (SkipTest())
return; return;
StartChild("NoSuchTestChildMain"); MultiprocessTestHelper helper;
int result = WaitForChildShutdown(); helper.StartChild("NoSuchTestChildMain");
int result = helper.WaitForChildShutdown();
EXPECT_FALSE(result >= 0 && result <= 127); EXPECT_FALSE(result >= 0 && result <= 127);
} }
TEST_F(MultiprocessTestBaseTest, PassedChannel) { TEST_F(MultiprocessTestHelperTest, PassedChannel) {
if (SkipTest()) if (SkipTest())
return; return;
EXPECT_TRUE(server_platform_handle.is_valid()); MultiprocessTestHelper helper;
StartChild("PassedChannel"); EXPECT_TRUE(helper.server_platform_handle.is_valid());
helper.StartChild("PassedChannel");
// Take ownership of the handle. // Take ownership of the handle.
embedder::ScopedPlatformHandle handle = server_platform_handle.Pass(); embedder::ScopedPlatformHandle handle = helper.server_platform_handle.Pass();
// The handle should be non-blocking. // The handle should be non-blocking.
EXPECT_TRUE(IsNonBlocking(handle.get())); EXPECT_TRUE(IsNonBlocking(handle.get()));
...@@ -104,15 +108,15 @@ TEST_F(MultiprocessTestBaseTest, PassedChannel) { ...@@ -104,15 +108,15 @@ TEST_F(MultiprocessTestBaseTest, PassedChannel) {
EXPECT_EQ(c + 1, d); EXPECT_EQ(c + 1, d);
// And return it, incremented again. // And return it, incremented again.
EXPECT_EQ(c + 2, WaitForChildShutdown()); EXPECT_EQ(c + 2, helper.WaitForChildShutdown());
} }
MOJO_MULTIPROCESS_TEST_CHILD_MAIN(PassedChannel) { MOJO_MULTIPROCESS_TEST_CHILD_MAIN(PassedChannel) {
CHECK(MultiprocessTestBaseTest::client_platform_handle.is_valid()); CHECK(MultiprocessTestHelper::client_platform_handle.is_valid());
// Take ownership of the handle. // Take ownership of the handle.
embedder::ScopedPlatformHandle handle = embedder::ScopedPlatformHandle handle =
MultiprocessTestBaseTest::client_platform_handle.Pass(); MultiprocessTestHelper::client_platform_handle.Pass();
// The handle should be non-blocking. // The handle should be non-blocking.
EXPECT_TRUE(IsNonBlocking(handle.get())); EXPECT_TRUE(IsNonBlocking(handle.get()));
......
mojo/mojo.gyp
View file @ 3bc1379a
...@@ -262,8 +262,8 @@ ...@@ -262,8 +262,8 @@
'mojo_system_impl', 'mojo_system_impl',
], ],
'sources': [ 'sources': [
'common/test/multiprocess_test_base.cc', 'common/test/multiprocess_test_helper.cc',
'common/test/multiprocess_test_base.h', 'common/test/multiprocess_test_helper.h',
'common/test/test_utils.h', 'common/test/test_utils.h',
'common/test/test_utils_posix.cc', 'common/test/test_utils_posix.cc',
'common/test/test_utils_win.cc', 'common/test/test_utils_win.cc',
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
'common/common_type_converters_unittest.cc', 'common/common_type_converters_unittest.cc',
'common/handle_watcher_unittest.cc', 'common/handle_watcher_unittest.cc',
'common/message_pump_mojo_unittest.cc', 'common/message_pump_mojo_unittest.cc',
'common/test/multiprocess_test_base_unittest.cc', 'common/test/multiprocess_test_helper_unittest.cc',
], ],
}, },
{ {
......
mojo/system/multiprocess_message_pipe_unittest.cc
View file @ 3bc1379a
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "mojo/common/test/multiprocess_test_base.h" #include "mojo/common/test/multiprocess_test_helper.h"
#include "mojo/system/channel.h" #include "mojo/system/channel.h"
#include "mojo/system/embedder/scoped_platform_handle.h" #include "mojo/system/embedder/scoped_platform_handle.h"
#include "mojo/system/local_message_pipe_endpoint.h" #include "mojo/system/local_message_pipe_endpoint.h"
...@@ -25,11 +25,13 @@ ...@@ -25,11 +25,13 @@
#include "mojo/system/proxy_message_pipe_endpoint.h" #include "mojo/system/proxy_message_pipe_endpoint.h"
#include "mojo/system/test_utils.h" #include "mojo/system/test_utils.h"
#include "mojo/system/waiter.h" #include "mojo/system/waiter.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo { namespace mojo {
namespace system { namespace system {
namespace { namespace {
// TODO(vtl): Replace this with a |TestIOThread|.
class IOThreadWrapper { class IOThreadWrapper {
public: public:
IOThreadWrapper() : io_thread_("io_thread") {} IOThreadWrapper() : io_thread_("io_thread") {}
...@@ -110,7 +112,7 @@ class IOThreadWrapper { ...@@ -110,7 +112,7 @@ class IOThreadWrapper {
DISALLOW_COPY_AND_ASSIGN(IOThreadWrapper); DISALLOW_COPY_AND_ASSIGN(IOThreadWrapper);
}; };
class MultiprocessMessagePipeTest : public mojo::test::MultiprocessTestBase { class MultiprocessMessagePipeTest : public testing::Test {
public: public:
MultiprocessMessagePipeTest() {} MultiprocessMessagePipeTest() {}
virtual ~MultiprocessMessagePipeTest() {} virtual ~MultiprocessMessagePipeTest() {}
...@@ -118,15 +120,18 @@ class MultiprocessMessagePipeTest : public mojo::test::MultiprocessTestBase { ...@@ -118,15 +120,18 @@ class MultiprocessMessagePipeTest : public mojo::test::MultiprocessTestBase {
virtual void TearDown() OVERRIDE { virtual void TearDown() OVERRIDE {
if (io_thread_wrapper_.is_initialized()) if (io_thread_wrapper_.is_initialized())
io_thread_wrapper_.Shutdown(); io_thread_wrapper_.Shutdown();
mojo::test::MultiprocessTestBase::TearDown();
} }
protected:
void Init(scoped_refptr<MessagePipe> mp) { void Init(scoped_refptr<MessagePipe> mp) {
io_thread_wrapper_.Init(server_platform_handle.Pass(), mp); io_thread_wrapper_.Init(helper_.server_platform_handle.Pass(), mp);
} }
mojo::test::MultiprocessTestHelper* helper() { return &helper_; }
private: private:
IOThreadWrapper io_thread_wrapper_; IOThreadWrapper io_thread_wrapper_;
mojo::test::MultiprocessTestHelper helper_;
DISALLOW_COPY_AND_ASSIGN(MultiprocessMessagePipeTest); DISALLOW_COPY_AND_ASSIGN(MultiprocessMessagePipeTest);
}; };
...@@ -153,7 +158,7 @@ MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp, MojoWaitFlags flags) { ...@@ -153,7 +158,7 @@ MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp, MojoWaitFlags flags) {
MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) { MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) {
IOThreadWrapper io_thread_wrapper; IOThreadWrapper io_thread_wrapper;
embedder::ScopedPlatformHandle client_platform_handle = embedder::ScopedPlatformHandle client_platform_handle =
MultiprocessMessagePipeTest::client_platform_handle.Pass(); mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
CHECK(client_platform_handle.is_valid()); CHECK(client_platform_handle.is_valid());
scoped_refptr<MessagePipe> mp(new MessagePipe( scoped_refptr<MessagePipe> mp(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()), scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
...@@ -203,7 +208,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) { ...@@ -203,7 +208,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) {
// Sends "hello" to child, and expects "hellohello" back. // Sends "hello" to child, and expects "hellohello" back.
TEST_F(MultiprocessMessagePipeTest, Basic) { TEST_F(MultiprocessMessagePipeTest, Basic) {
StartChild("EchoEcho"); helper()->StartChild("EchoEcho");
scoped_refptr<MessagePipe> mp(new MessagePipe( scoped_refptr<MessagePipe> mp(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()), scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
...@@ -233,13 +238,13 @@ TEST_F(MultiprocessMessagePipeTest, Basic) { ...@@ -233,13 +238,13 @@ TEST_F(MultiprocessMessagePipeTest, Basic) {
mp->Close(0); mp->Close(0);
// We sent one message. // We sent one message.
EXPECT_EQ(1 % 100, WaitForChildShutdown()); EXPECT_EQ(1 % 100, helper()->WaitForChildShutdown());
} }
// Sends a bunch of messages to the child. Expects them "repeated" back. Waits // Sends a bunch of messages to the child. Expects them "repeated" back. Waits
// for the child to close its end before quitting. // for the child to close its end before quitting.
TEST_F(MultiprocessMessagePipeTest, QueueMessages) { TEST_F(MultiprocessMessagePipeTest, QueueMessages) {
StartChild("EchoEcho"); helper()->StartChild("EchoEcho");
scoped_refptr<MessagePipe> mp(new MessagePipe( scoped_refptr<MessagePipe> mp(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()), scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
...@@ -287,7 +292,8 @@ TEST_F(MultiprocessMessagePipeTest, QueueMessages) { ...@@ -287,7 +292,8 @@ TEST_F(MultiprocessMessagePipeTest, QueueMessages) {
mp->Close(0); mp->Close(0);
EXPECT_EQ(static_cast<int>(kNumMessages % 100), WaitForChildShutdown()); EXPECT_EQ(static_cast<int>(kNumMessages % 100),
helper()->WaitForChildShutdown());
} }
} // namespace } // namespace
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment