Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1019)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/system/remote_message_pipe_posix_unittest.cc

Issue 140503005: Mojo: foo_[0-9] -> foo[0-9]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/system/message_pipe_dispatcher_unittest.cc ('k') | mojo/system/waiter_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/remote_message_pipe_posix_unittest.cc
diff --git a/mojo/system/remote_message_pipe_posix_unittest.cc b/mojo/system/remote_message_pipe_posix_unittest.cc
index 1493f0ef41642fa369e930651472b987e0332157..f390509cf1b4227185c81cf790b430014013ec4b 100644
--- a/mojo/system/remote_message_pipe_posix_unittest.cc
+++ b/mojo/system/remote_message_pipe_posix_unittest.cc
@@ -51,13 +51,13 @@ class RemoteMessagePipeTest : public test::TestWithIOThreadBase {
// This connects MP 0, port 1 and MP 1, port 0 (leaving MP 0, port 0 and MP 1,
// port 1 as the user-visible endpoints) to channel 0 and 1, respectively. MP
// 0, port 1 and MP 1, port 0 must have |ProxyMessagePipeEndpoint|s.
- void ConnectMessagePipes(scoped_refptr<MessagePipe> mp_0,
- scoped_refptr<MessagePipe> mp_1) {
+ void ConnectMessagePipes(scoped_refptr<MessagePipe> mp0,
+ scoped_refptr<MessagePipe> mp1) {
test::PostTaskAndWait(
io_thread_task_runner(),
FROM_HERE,
base::Bind(&RemoteMessagePipeTest::ConnectMessagePipesOnIOThread,
- base::Unretained(this), mp_0, mp_1));
+ base::Unretained(this), mp0, mp1));
}
// This connects |mp|'s port |channel_index ^ 1| to channel |channel_index|.
@@ -91,8 +91,8 @@ class RemoteMessagePipeTest : public test::TestWithIOThreadBase {
platform_handles_[channel_index].Pass()));
}
- void ConnectMessagePipesOnIOThread(scoped_refptr<MessagePipe> mp_0,
- scoped_refptr<MessagePipe> mp_1) {
+ void ConnectMessagePipesOnIOThread(scoped_refptr<MessagePipe> mp0,
+ scoped_refptr<MessagePipe> mp1) {
CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
if (!channels_[0].get())
@@ -100,13 +100,13 @@ class RemoteMessagePipeTest : public test::TestWithIOThreadBase {
if (!channels_[1].get())
CreateAndInitChannel(1);
- MessageInTransit::EndpointId local_id_0 =
- channels_[0]->AttachMessagePipeEndpoint(mp_0, 1);
- MessageInTransit::EndpointId local_id_1 =
- channels_[1]->AttachMessagePipeEndpoint(mp_1, 0);
+ MessageInTransit::EndpointId local_id0 =
+ channels_[0]->AttachMessagePipeEndpoint(mp0, 1);
+ MessageInTransit::EndpointId local_id1 =
+ channels_[1]->AttachMessagePipeEndpoint(mp1, 0);
- channels_[0]->RunMessagePipeEndpoint(local_id_0, local_id_1);
- channels_[1]->RunMessagePipeEndpoint(local_id_1, local_id_0);
+ channels_[0]->RunMessagePipeEndpoint(local_id0, local_id1);
+ channels_[1]->RunMessagePipeEndpoint(local_id1, local_id0);
}
void BootstrapMessagePipeOnIOThread(unsigned channel_index,
@@ -152,13 +152,13 @@ TEST_F(RemoteMessagePipeTest, Basic) {
// connected to MP 1, port 0, which will be attached to channel 1. This leaves
// MP 0, port 0 and MP 1, port 1 as the "user-facing" endpoints.
- scoped_refptr<MessagePipe> mp_0(new MessagePipe(
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp_1(new MessagePipe(
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
- ConnectMessagePipes(mp_0, mp_1);
+ ConnectMessagePipes(mp0, mp1);
// Write in one direction: MP 0, port 0 -> ... -> MP 1, port 1.
@@ -166,25 +166,25 @@ TEST_F(RemoteMessagePipeTest, Basic) {
// it later, it might already be readable.)
waiter.Init();
EXPECT_EQ(MOJO_RESULT_OK,
- mp_1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
+ mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
// Write to MP 0, port 0.
EXPECT_EQ(MOJO_RESULT_OK,
- mp_0->WriteMessage(0,
- hello, sizeof(hello),
- NULL,
- MOJO_WRITE_MESSAGE_FLAG_NONE));
+ mp0->WriteMessage(0,
+ hello, sizeof(hello),
+ NULL,
+ MOJO_WRITE_MESSAGE_FLAG_NONE));
// Wait.
EXPECT_EQ(123, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
- mp_1->RemoveWaiter(1, &waiter);
+ mp1->RemoveWaiter(1, &waiter);
// Read from MP 1, port 1.
EXPECT_EQ(MOJO_RESULT_OK,
- mp_1->ReadMessage(1,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp1->ReadMessage(1,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
EXPECT_EQ(sizeof(hello), static_cast<size_t>(buffer_size));
EXPECT_EQ(0, strcmp(buffer, hello));
@@ -192,44 +192,44 @@ TEST_F(RemoteMessagePipeTest, Basic) {
waiter.Init();
EXPECT_EQ(MOJO_RESULT_OK,
- mp_0->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 456));
+ mp0->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 456));
EXPECT_EQ(MOJO_RESULT_OK,
- mp_1->WriteMessage(1,
- world, sizeof(world),
- NULL,
- MOJO_WRITE_MESSAGE_FLAG_NONE));
+ mp1->WriteMessage(1,
+ world, sizeof(world),
+ NULL,
+ MOJO_WRITE_MESSAGE_FLAG_NONE));
EXPECT_EQ(456, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
- mp_0->RemoveWaiter(0, &waiter);
+ mp0->RemoveWaiter(0, &waiter);
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_OK,
- mp_0->ReadMessage(0,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp0->ReadMessage(0,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
EXPECT_EQ(sizeof(world), static_cast<size_t>(buffer_size));
EXPECT_EQ(0, strcmp(buffer, world));
// Close MP 0, port 0.
- mp_0->Close(0);
+ mp0->Close(0);
// Try to wait for MP 1, port 1 to become readable. This will eventually fail
// when it realizes that MP 0, port 0 has been closed. (It may also fail
// immediately.)
waiter.Init();
- MojoResult result = mp_1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789);
+ MojoResult result = mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789);
if (result == MOJO_RESULT_OK) {
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
waiter.Wait(MOJO_DEADLINE_INDEFINITE));
- mp_1->RemoveWaiter(1, &waiter);
+ mp1->RemoveWaiter(1, &waiter);
} else {
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
}
// And MP 1, port 1.
- mp_1->Close(1);
+ mp1->Close(1);
}
TEST_F(RemoteMessagePipeTest, Multiplex) {
@@ -241,66 +241,66 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
// Connect message pipes as in the |Basic| test.
- scoped_refptr<MessagePipe> mp_0(new MessagePipe(
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp_1(new MessagePipe(
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
- ConnectMessagePipes(mp_0, mp_1);
+ ConnectMessagePipes(mp0, mp1);
// Now put another message pipe on the channel.
- scoped_refptr<MessagePipe> mp_2(new MessagePipe(
+ scoped_refptr<MessagePipe> mp2(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp_3(new MessagePipe(
+ scoped_refptr<MessagePipe> mp3(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
- ConnectMessagePipes(mp_2, mp_3);
+ ConnectMessagePipes(mp2, mp3);
// Write: MP 2, port 0 -> MP 3, port 1.
waiter.Init();
EXPECT_EQ(MOJO_RESULT_OK,
- mp_3->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789));
+ mp3->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789));
EXPECT_EQ(MOJO_RESULT_OK,
- mp_2->WriteMessage(0,
- hello, sizeof(hello),
- NULL,
- MOJO_WRITE_MESSAGE_FLAG_NONE));
+ mp2->WriteMessage(0,
+ hello, sizeof(hello),
+ NULL,
+ MOJO_WRITE_MESSAGE_FLAG_NONE));
EXPECT_EQ(789, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
- mp_3->RemoveWaiter(1, &waiter);
+ mp3->RemoveWaiter(1, &waiter);
// Make sure there's nothing on MP 0, port 0 or MP 1, port 1 or MP 2, port 0.
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
- mp_0->ReadMessage(0,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp0->ReadMessage(0,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
- mp_1->ReadMessage(1,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp1->ReadMessage(1,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
- mp_2->ReadMessage(0,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp2->ReadMessage(0,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
// Read from MP 3, port 1.
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_OK,
- mp_3->ReadMessage(1,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp3->ReadMessage(1,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
EXPECT_EQ(sizeof(hello), static_cast<size_t>(buffer_size));
EXPECT_EQ(0, strcmp(buffer, hello));
@@ -308,43 +308,43 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
waiter.Init();
EXPECT_EQ(MOJO_RESULT_OK,
- mp_1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
+ mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
EXPECT_EQ(MOJO_RESULT_OK,
- mp_0->WriteMessage(0,
- world, sizeof(world),
- NULL,
- MOJO_WRITE_MESSAGE_FLAG_NONE));
+ mp0->WriteMessage(0,
+ world, sizeof(world),
+ NULL,
+ MOJO_WRITE_MESSAGE_FLAG_NONE));
EXPECT_EQ(123, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
- mp_1->RemoveWaiter(1, &waiter);
+ mp1->RemoveWaiter(1, &waiter);
// Make sure there's nothing on the other ports.
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
- mp_0->ReadMessage(0,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp0->ReadMessage(0,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
- mp_2->ReadMessage(0,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp2->ReadMessage(0,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
- mp_3->ReadMessage(1,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp3->ReadMessage(1,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_OK,
- mp_1->ReadMessage(1,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp1->ReadMessage(1,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
EXPECT_EQ(sizeof(world), static_cast<size_t>(buffer_size));
EXPECT_EQ(0, strcmp(buffer, world));
}
@@ -359,24 +359,24 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) {
// connected to MP 1, port 0, which will be attached to channel 1. This leaves
// MP 0, port 0 and MP 1, port 1 as the "user-facing" endpoints.
- scoped_refptr<MessagePipe> mp_0(new MessagePipe(
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
// Write to MP 0, port 0.
EXPECT_EQ(MOJO_RESULT_OK,
- mp_0->WriteMessage(0,
- hello, sizeof(hello),
- NULL,
- MOJO_WRITE_MESSAGE_FLAG_NONE));
+ mp0->WriteMessage(0,
+ hello, sizeof(hello),
+ NULL,
+ MOJO_WRITE_MESSAGE_FLAG_NONE));
- BootstrapMessagePipeNoWait(0, mp_0);
+ BootstrapMessagePipeNoWait(0, mp0);
// Close MP 0, port 0 before channel 1 is even connected.
- mp_0->Close(0);
+ mp0->Close(0);
- scoped_refptr<MessagePipe> mp_1(new MessagePipe(
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(
scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
@@ -384,26 +384,27 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) {
// it later, it might already be readable.)
waiter.Init();
EXPECT_EQ(MOJO_RESULT_OK,
- mp_1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
+ mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
- BootstrapMessagePipeNoWait(1, mp_1);
+ BootstrapMessagePipeNoWait(1, mp1);
// Wait.
EXPECT_EQ(123, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
- mp_1->RemoveWaiter(1, &waiter);
+ mp1->RemoveWaiter(1, &waiter);
// Read from MP 1, port 1.
EXPECT_EQ(MOJO_RESULT_OK,
- mp_1->ReadMessage(1,
- buffer, &buffer_size,
- NULL, NULL,
- MOJO_READ_MESSAGE_FLAG_NONE));
+ mp1->ReadMessage(1,
+ buffer, &buffer_size,
+ NULL, NULL,
+ MOJO_READ_MESSAGE_FLAG_NONE));
EXPECT_EQ(sizeof(hello), static_cast<size_t>(buffer_size));
EXPECT_EQ(0, strcmp(buffer, hello));
// And MP 1, port 1.
- mp_1->Close(1);
+ mp1->Close(1);
}
+
} // namespace
} // namespace system
} // namespace mojo
« no previous file with comments | « mojo/system/message_pipe_dispatcher_unittest.cc ('k') | mojo/system/waiter_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698