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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/public/tests/system/core_cpp_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/public/system/core_cpp.h ('k') | mojo/public/tests/system/core_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/tests/system/core_cpp_unittest.cc
diff --git a/mojo/public/tests/system/core_cpp_unittest.cc b/mojo/public/tests/system/core_cpp_unittest.cc
index 8bce421dab79d6d14643ff9512075b5141f1eef6..7fe3a32a179f8e21e7ca5588be8fcc07b6f5e2b4 100644
--- a/mojo/public/tests/system/core_cpp_unittest.cc
+++ b/mojo/public/tests/system/core_cpp_unittest.cc
@@ -23,58 +23,58 @@ TEST(CoreCppTest, Basic) {
{
EXPECT_EQ(MOJO_HANDLE_INVALID, kInvalidHandleValue);
- Handle h_0;
- EXPECT_EQ(kInvalidHandleValue, h_0.value());
- EXPECT_EQ(kInvalidHandleValue, *h_0.mutable_value());
- EXPECT_FALSE(h_0.is_valid());
-
- Handle h_1(static_cast<MojoHandle>(123));
- EXPECT_EQ(static_cast<MojoHandle>(123), h_1.value());
- EXPECT_EQ(static_cast<MojoHandle>(123), *h_1.mutable_value());
- EXPECT_TRUE(h_1.is_valid());
- *h_1.mutable_value() = static_cast<MojoHandle>(456);
- EXPECT_EQ(static_cast<MojoHandle>(456), h_1.value());
- EXPECT_TRUE(h_1.is_valid());
-
- h_1.swap(h_0);
- EXPECT_EQ(static_cast<MojoHandle>(456), h_0.value());
- EXPECT_TRUE(h_0.is_valid());
- EXPECT_FALSE(h_1.is_valid());
-
- h_1.set_value(static_cast<MojoHandle>(789));
- h_0.swap(h_1);
- EXPECT_EQ(static_cast<MojoHandle>(789), h_0.value());
- EXPECT_TRUE(h_0.is_valid());
- EXPECT_EQ(static_cast<MojoHandle>(456), h_1.value());
- EXPECT_TRUE(h_1.is_valid());
+ Handle h0;
+ EXPECT_EQ(kInvalidHandleValue, h0.value());
+ EXPECT_EQ(kInvalidHandleValue, *h0.mutable_value());
+ EXPECT_FALSE(h0.is_valid());
+
+ Handle h1(static_cast<MojoHandle>(123));
+ EXPECT_EQ(static_cast<MojoHandle>(123), h1.value());
+ EXPECT_EQ(static_cast<MojoHandle>(123), *h1.mutable_value());
+ EXPECT_TRUE(h1.is_valid());
+ *h1.mutable_value() = static_cast<MojoHandle>(456);
+ EXPECT_EQ(static_cast<MojoHandle>(456), h1.value());
+ EXPECT_TRUE(h1.is_valid());
+
+ h1.swap(h0);
+ EXPECT_EQ(static_cast<MojoHandle>(456), h0.value());
+ EXPECT_TRUE(h0.is_valid());
+ EXPECT_FALSE(h1.is_valid());
+
+ h1.set_value(static_cast<MojoHandle>(789));
+ h0.swap(h1);
+ EXPECT_EQ(static_cast<MojoHandle>(789), h0.value());
+ EXPECT_TRUE(h0.is_valid());
+ EXPECT_EQ(static_cast<MojoHandle>(456), h1.value());
+ EXPECT_TRUE(h1.is_valid());
// Make sure copy constructor works.
- Handle h_2(h_0);
- EXPECT_EQ(static_cast<MojoHandle>(789), h_2.value());
+ Handle h2(h0);
+ EXPECT_EQ(static_cast<MojoHandle>(789), h2.value());
// And assignment.
- h_2 = h_1;
- EXPECT_EQ(static_cast<MojoHandle>(456), h_2.value());
+ h2 = h1;
+ EXPECT_EQ(static_cast<MojoHandle>(456), h2.value());
// Make sure that we can put |Handle|s into |std::map|s.
- h_0 = Handle(static_cast<MojoHandle>(987));
- h_1 = Handle(static_cast<MojoHandle>(654));
- h_2 = Handle(static_cast<MojoHandle>(321));
- Handle h_3;
+ h0 = Handle(static_cast<MojoHandle>(987));
+ h1 = Handle(static_cast<MojoHandle>(654));
+ h2 = Handle(static_cast<MojoHandle>(321));
+ Handle h3;
std::map<Handle, int> handle_to_int;
- handle_to_int[h_0] = 0;
- handle_to_int[h_1] = 1;
- handle_to_int[h_2] = 2;
- handle_to_int[h_3] = 3;
+ handle_to_int[h0] = 0;
+ handle_to_int[h1] = 1;
+ handle_to_int[h2] = 2;
+ handle_to_int[h3] = 3;
EXPECT_EQ(4u, handle_to_int.size());
- EXPECT_FALSE(handle_to_int.find(h_0) == handle_to_int.end());
- EXPECT_EQ(0, handle_to_int[h_0]);
- EXPECT_FALSE(handle_to_int.find(h_1) == handle_to_int.end());
- EXPECT_EQ(1, handle_to_int[h_1]);
- EXPECT_FALSE(handle_to_int.find(h_2) == handle_to_int.end());
- EXPECT_EQ(2, handle_to_int[h_2]);
- EXPECT_FALSE(handle_to_int.find(h_3) == handle_to_int.end());
- EXPECT_EQ(3, handle_to_int[h_3]);
+ EXPECT_FALSE(handle_to_int.find(h0) == handle_to_int.end());
+ EXPECT_EQ(0, handle_to_int[h0]);
+ EXPECT_FALSE(handle_to_int.find(h1) == handle_to_int.end());
+ EXPECT_EQ(1, handle_to_int[h1]);
+ EXPECT_FALSE(handle_to_int.find(h2) == handle_to_int.end());
+ EXPECT_EQ(2, handle_to_int[h2]);
+ EXPECT_FALSE(handle_to_int.find(h3) == handle_to_int.end());
+ EXPECT_EQ(3, handle_to_int[h3]);
EXPECT_TRUE(handle_to_int.find(Handle(static_cast<MojoHandle>(13579))) ==
handle_to_int.end());
@@ -133,70 +133,69 @@ TEST(CoreCppTest, Basic) {
MOJO_READ_MESSAGE_FLAG_NONE));
// Basic tests of waiting and closing.
- MojoHandle hv_0 = kInvalidHandleValue;
+ MojoHandle hv0 = kInvalidHandleValue;
{
- ScopedMessagePipeHandle h_0;
- ScopedMessagePipeHandle h_1;
- EXPECT_FALSE(h_0.get().is_valid());
- EXPECT_FALSE(h_1.get().is_valid());
-
- CreateMessagePipe(&h_0, &h_1);
- EXPECT_TRUE(h_0.get().is_valid());
- EXPECT_TRUE(h_1.get().is_valid());
- EXPECT_NE(h_0.get().value(), h_1.get().value());
+ ScopedMessagePipeHandle h0;
+ ScopedMessagePipeHandle h1;
+ EXPECT_FALSE(h0.get().is_valid());
+ EXPECT_FALSE(h1.get().is_valid());
+
+ CreateMessagePipe(&h0, &h1);
+ EXPECT_TRUE(h0.get().is_valid());
+ EXPECT_TRUE(h1.get().is_valid());
+ EXPECT_NE(h0.get().value(), h1.get().value());
// Save the handle values, so we can check that things got closed
// correctly.
- hv_0 = h_0.get().value();
- MojoHandle hv_1 = h_1.get().value();
+ hv0 = h0.get().value();
+ MojoHandle hv1 = h1.get().value();
EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED,
- Wait(h_0.get(), MOJO_WAIT_FLAG_READABLE, 0));
+ Wait(h0.get(), MOJO_WAIT_FLAG_READABLE, 0));
std::vector<Handle> wh;
- wh.push_back(h_0.get());
- wh.push_back(h_1.get());
+ wh.push_back(h0.get());
+ wh.push_back(h1.get());
std::vector<MojoWaitFlags> wf;
wf.push_back(MOJO_WAIT_FLAG_READABLE);
wf.push_back(MOJO_WAIT_FLAG_WRITABLE);
EXPECT_EQ(1, WaitMany(wh, wf, 1000));
- // Test closing |h_1| explicitly.
- Close(h_1.Pass());
- EXPECT_FALSE(h_1.get().is_valid());
+ // Test closing |h1| explicitly.
+ Close(h1.Pass());
+ EXPECT_FALSE(h1.get().is_valid());
- // Make sure |h_1| is closed.
+ // Make sure |h1| is closed.
EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
- MojoWait(hv_1,
- MOJO_WAIT_FLAG_EVERYTHING,
+ MojoWait(hv1, MOJO_WAIT_FLAG_EVERYTHING,
MOJO_DEADLINE_INDEFINITE));
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
- Wait(h_0.get(), MOJO_WAIT_FLAG_READABLE,
+ Wait(h0.get(), MOJO_WAIT_FLAG_READABLE,
MOJO_DEADLINE_INDEFINITE));
}
- // |hv_0| should have been closed when |h_0| went out of scope, so this
- // close should fail.
- EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(hv_0));
+ // |hv0| should have been closed when |h0| went out of scope, so this close
+ // should fail.
+ EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(hv0));
// Actually test writing/reading messages.
{
- ScopedMessagePipeHandle h_0;
- ScopedMessagePipeHandle h_1;
- CreateMessagePipe(&h_0, &h_1);
+ ScopedMessagePipeHandle h0;
+ ScopedMessagePipeHandle h1;
+ CreateMessagePipe(&h0, &h1);
const char kHello[] = "hello";
const uint32_t kHelloSize = static_cast<uint32_t>(sizeof(kHello));
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_0.get(),
+ WriteMessageRaw(h0.get(),
kHello, kHelloSize,
NULL, 0,
MOJO_WRITE_MESSAGE_FLAG_NONE));
EXPECT_EQ(MOJO_RESULT_OK,
- Wait(h_1.get(), MOJO_WAIT_FLAG_READABLE,
+ Wait(h1.get(), MOJO_WAIT_FLAG_READABLE,
MOJO_DEADLINE_INDEFINITE));
char buffer[10] = { 0 };
uint32_t buffer_size = static_cast<uint32_t>(sizeof(buffer));
EXPECT_EQ(MOJO_RESULT_OK,
- ReadMessageRaw(h_1.get(),
+ ReadMessageRaw(h1.get(),
buffer, &buffer_size,
NULL, NULL,
MOJO_READ_MESSAGE_FLAG_NONE));
@@ -204,27 +203,27 @@ TEST(CoreCppTest, Basic) {
EXPECT_STREQ(kHello, buffer);
// Send a handle over the previously-establish |MessagePipe|.
- ScopedMessagePipeHandle h_2;
- ScopedMessagePipeHandle h_3;
- CreateMessagePipe(&h_2, &h_3);
+ ScopedMessagePipeHandle h2;
+ ScopedMessagePipeHandle h3;
+ CreateMessagePipe(&h2, &h3);
- // Write a message to |h_2|, before we send |h_3|.
+ // Write a message to |h2|, before we send |h3|.
const char kWorld[] = "world!";
const uint32_t kWorldSize = static_cast<uint32_t>(sizeof(kWorld));
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_2.get(),
+ WriteMessageRaw(h2.get(),
kWorld, kWorldSize,
NULL, 0,
MOJO_WRITE_MESSAGE_FLAG_NONE));
- // Send |h_3| over |h_1| to |h_0|.
+ // Send |h3| over |h1| to |h0|.
MojoHandle handles[5];
- handles[0] = h_3.release().value();
+ handles[0] = h3.release().value();
EXPECT_NE(kInvalidHandleValue, handles[0]);
- EXPECT_FALSE(h_3.get().is_valid());
+ EXPECT_FALSE(h3.get().is_valid());
uint32_t handles_count = 1;
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_1.get(),
+ WriteMessageRaw(h1.get(),
kHello, kHelloSize,
handles, handles_count,
MOJO_WRITE_MESSAGE_FLAG_NONE));
@@ -233,7 +232,7 @@ TEST(CoreCppTest, Basic) {
// Read "hello" and the sent handle.
EXPECT_EQ(MOJO_RESULT_OK,
- Wait(h_0.get(), MOJO_WAIT_FLAG_READABLE,
+ Wait(h0.get(), MOJO_WAIT_FLAG_READABLE,
MOJO_DEADLINE_INDEFINITE));
memset(buffer, 0, sizeof(buffer));
buffer_size = static_cast<uint32_t>(sizeof(buffer));
@@ -241,7 +240,7 @@ TEST(CoreCppTest, Basic) {
handles[i] = kInvalidHandleValue;
handles_count = static_cast<uint32_t>(MOJO_ARRAYSIZE(handles));
EXPECT_EQ(MOJO_RESULT_OK,
- ReadMessageRaw(h_0.get(),
+ ReadMessageRaw(h0.get(),
buffer, &buffer_size,
handles, &handles_count,
MOJO_READ_MESSAGE_FLAG_NONE));
@@ -251,11 +250,11 @@ TEST(CoreCppTest, Basic) {
EXPECT_NE(kInvalidHandleValue, handles[0]);
// Read from the sent/received handle.
- h_3.reset(MessagePipeHandle(handles[0]));
+ h3.reset(MessagePipeHandle(handles[0]));
// Save |handles[0]| to check that it gets properly closed.
- hv_0 = handles[0];
+ hv0 = handles[0];
EXPECT_EQ(MOJO_RESULT_OK,
- Wait(h_3.get(), MOJO_WAIT_FLAG_READABLE,
+ Wait(h3.get(), MOJO_WAIT_FLAG_READABLE,
MOJO_DEADLINE_INDEFINITE));
memset(buffer, 0, sizeof(buffer));
buffer_size = static_cast<uint32_t>(sizeof(buffer));
@@ -263,7 +262,7 @@ TEST(CoreCppTest, Basic) {
handles[i] = kInvalidHandleValue;
handles_count = static_cast<uint32_t>(MOJO_ARRAYSIZE(handles));
EXPECT_EQ(MOJO_RESULT_OK,
- ReadMessageRaw(h_3.get(),
+ ReadMessageRaw(h3.get(),
buffer, &buffer_size,
handles, &handles_count,
MOJO_READ_MESSAGE_FLAG_NONE));
@@ -271,7 +270,7 @@ TEST(CoreCppTest, Basic) {
EXPECT_STREQ(kWorld, buffer);
EXPECT_EQ(0u, handles_count);
}
- EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(hv_0));
+ EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(hv0));
}
// TODO(vtl): Test |CloseRaw()|.
@@ -282,95 +281,95 @@ TEST(CoreCppTest, TearDownWithMessagesEnqueued) {
// Tear down a |MessagePipe| which still has a message enqueued, with the
// message also having a valid |MessagePipe| handle.
{
- ScopedMessagePipeHandle h_0;
- ScopedMessagePipeHandle h_1;
- CreateMessagePipe(&h_0, &h_1);
+ ScopedMessagePipeHandle h0;
+ ScopedMessagePipeHandle h1;
+ CreateMessagePipe(&h0, &h1);
// Send a handle over the previously-establish |MessagePipe|.
- ScopedMessagePipeHandle h_2;
- ScopedMessagePipeHandle h_3;
- CreateMessagePipe(&h_2, &h_3);
+ ScopedMessagePipeHandle h2;
+ ScopedMessagePipeHandle h3;
+ CreateMessagePipe(&h2, &h3);
- // Write a message to |h_2|, before we send |h_3|.
+ // Write a message to |h2|, before we send |h3|.
const char kWorld[] = "world!";
const uint32_t kWorldSize = static_cast<uint32_t>(sizeof(kWorld));
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_2.get(),
+ WriteMessageRaw(h2.get(),
kWorld, kWorldSize,
NULL, 0,
MOJO_WRITE_MESSAGE_FLAG_NONE));
- // And also a message to |h_3|.
+ // And also a message to |h3|.
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_3.get(),
+ WriteMessageRaw(h3.get(),
kWorld, kWorldSize,
NULL, 0,
MOJO_WRITE_MESSAGE_FLAG_NONE));
- // Send |h_3| over |h_1| to |h_0|.
+ // Send |h3| over |h1| to |h0|.
const char kHello[] = "hello";
const uint32_t kHelloSize = static_cast<uint32_t>(sizeof(kHello));
- MojoHandle h_3_value;
- h_3_value = h_3.release().value();
- EXPECT_NE(kInvalidHandleValue, h_3_value);
- EXPECT_FALSE(h_3.get().is_valid());
+ MojoHandle h3_value;
+ h3_value = h3.release().value();
+ EXPECT_NE(kInvalidHandleValue, h3_value);
+ EXPECT_FALSE(h3.get().is_valid());
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_1.get(),
+ WriteMessageRaw(h1.get(),
kHello, kHelloSize,
- &h_3_value, 1,
+ &h3_value, 1,
MOJO_WRITE_MESSAGE_FLAG_NONE));
- // |h_3_value| should actually be invalid now.
- EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(h_3_value));
+ // |h3_value| should actually be invalid now.
+ EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(h3_value));
- EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h_0.release().value()));
- EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h_1.release().value()));
- EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h_2.release().value()));
+ EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h0.release().value()));
+ EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h1.release().value()));
+ EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h2.release().value()));
}
// Do this in a different order: make the enqueued |MessagePipe| handle only
// half-alive.
{
- ScopedMessagePipeHandle h_0;
- ScopedMessagePipeHandle h_1;
- CreateMessagePipe(&h_0, &h_1);
+ ScopedMessagePipeHandle h0;
+ ScopedMessagePipeHandle h1;
+ CreateMessagePipe(&h0, &h1);
// Send a handle over the previously-establish |MessagePipe|.
- ScopedMessagePipeHandle h_2;
- ScopedMessagePipeHandle h_3;
- CreateMessagePipe(&h_2, &h_3);
+ ScopedMessagePipeHandle h2;
+ ScopedMessagePipeHandle h3;
+ CreateMessagePipe(&h2, &h3);
- // Write a message to |h_2|, before we send |h_3|.
+ // Write a message to |h2|, before we send |h3|.
const char kWorld[] = "world!";
const uint32_t kWorldSize = static_cast<uint32_t>(sizeof(kWorld));
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_2.get(),
+ WriteMessageRaw(h2.get(),
kWorld, kWorldSize,
NULL, 0,
MOJO_WRITE_MESSAGE_FLAG_NONE));
- // And also a message to |h_3|.
+ // And also a message to |h3|.
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_3.get(),
+ WriteMessageRaw(h3.get(),
kWorld, kWorldSize,
NULL, 0,
MOJO_WRITE_MESSAGE_FLAG_NONE));
- // Send |h_3| over |h_1| to |h_0|.
+ // Send |h3| over |h1| to |h0|.
const char kHello[] = "hello";
const uint32_t kHelloSize = static_cast<uint32_t>(sizeof(kHello));
- MojoHandle h_3_value;
- h_3_value = h_3.release().value();
- EXPECT_NE(kInvalidHandleValue, h_3_value);
- EXPECT_FALSE(h_3.get().is_valid());
+ MojoHandle h3_value;
+ h3_value = h3.release().value();
+ EXPECT_NE(kInvalidHandleValue, h3_value);
+ EXPECT_FALSE(h3.get().is_valid());
EXPECT_EQ(MOJO_RESULT_OK,
- WriteMessageRaw(h_1.get(),
+ WriteMessageRaw(h1.get(),
kHello, kHelloSize,
- &h_3_value, 1,
+ &h3_value, 1,
MOJO_WRITE_MESSAGE_FLAG_NONE));
- // |h_3_value| should actually be invalid now.
- EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(h_3_value));
+ // |h3_value| should actually be invalid now.
+ EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(h3_value));
- EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h_2.release().value()));
- EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h_0.release().value()));
- EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h_1.release().value()));
+ EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h2.release().value()));
+ EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h0.release().value()));
+ EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h1.release().value()));
}
}
« no previous file with comments | « mojo/public/system/core_cpp.h ('k') | mojo/public/tests/system/core_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698