mojo/system/local_data_pipe_unittest.cc - Issue 336313007: Mojo: Rename MOJO_WAIT_FLAG_... -> MOJO_HANDLE_SIGNAL_....

Unified Diff: mojo/system/local_data_pipe_unittest.cc

Issue 336313007: Mojo: Rename MOJO_WAIT_FLAG_... -> MOJO_HANDLE_SIGNAL_.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 years, 6 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

Index: mojo/system/local_data_pipe_unittest.cc

diff --git a/mojo/system/local_data_pipe_unittest.cc b/mojo/system/local_data_pipe_unittest.cc

index 391f001976173abc6c0a1c77779010a3c1824390..6d747bdf707c5186008c2e1c219b321f7d79bbcb 100644

--- a/mojo/system/local_data_pipe_unittest.cc

+++ b/mojo/system/local_data_pipe_unittest.cc

@@ -206,12 +206,12 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) {

// Never readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 12));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 12));

// Already writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 34));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 34));

// Write two elements.

int32_t elements[2] = { 123, 456 };

@@ -222,7 +222,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) {

// Adding a waiter should now succeed.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 56));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 56));

// And it shouldn't be writable yet.

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL));

dp->ProducerRemoveWaiter(&waiter);

@@ -230,7 +230,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) {

// Do it again.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 78));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 78));

// Read one element.

elements[0] = -1;

@@ -262,7 +262,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) {

// Add a waiter.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 90));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 90));

// Read one element, using a two-phase read.

const void* read_buffer = NULL;

@@ -293,7 +293,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) {

// Add a waiter.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 12));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 12));

// Close the consumer.

dp->ConsumerClose();

@@ -325,12 +325,12 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Never writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 12));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 12));

// Not yet readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 34));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 34));

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL));

dp->ConsumerRemoveWaiter(&waiter);

@@ -343,7 +343,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Should already be readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 56));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 56));

// Discard one element.

num_bytes = static_cast<uint32_t>(1u * sizeof(elements[0]));

@@ -353,7 +353,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Should still be readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 78));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 78));

// Read one element.

elements[0] = -1;

@@ -367,7 +367,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Adding a waiter should now succeed.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 90));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 90));

// Write one element.

elements[0] = 789;

@@ -387,7 +387,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Should still be readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 12));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 12));

// Read one element.

elements[0] = -1;

@@ -401,7 +401,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Should be never-readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 34));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 34));

dp->ConsumerClose();

}

@@ -432,7 +432,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Should already be readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 12));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 12));

// Read one element.

// Request two in all-or-none mode, but only read one.

@@ -451,7 +451,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Should still be readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 34));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 34));

// Read one element.

// Request three, but not in all-or-none mode.

@@ -470,7 +470,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) {

// Adding a waiter should now succeed.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 56));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 56));

// Close the producer.

dp->ProducerClose();

@@ -502,7 +502,7 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) {

// It should be writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 0));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 0));

uint32_t num_bytes = static_cast<uint32_t>(1u * sizeof(int32_t));

void* write_ptr = NULL;

@@ -514,14 +514,14 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) {

// At this point, it shouldn't be writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 1));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 1));

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL));

dp->ProducerRemoveWaiter(&waiter);

// It shouldn't be readable yet either.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 2));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 2));

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL));

dp->ConsumerRemoveWaiter(&waiter);

@@ -533,12 +533,12 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) {

// It should be writable again.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 3));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 3));

// And readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 4));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 4));

// Start another two-phase write and check that it's readable even in the

// middle of it.

@@ -552,7 +552,7 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) {

// It should be readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 5));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 5));

// End the two-phase write without writing anything.

EXPECT_EQ(MOJO_RESULT_OK, dp->ProducerEndWriteData(0u));

@@ -568,12 +568,12 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) {

// At this point, it should still be writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 6));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 6));

// But not readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 7));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 7));

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL));

dp->ConsumerRemoveWaiter(&waiter);

@@ -583,7 +583,7 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) {

// It should be readable again.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 8));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 8));

dp->ProducerClose();

dp->ConsumerClose();

@@ -607,12 +607,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) {

// Writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 0));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 0));

// Not readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 1));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 1));

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL));

dp->ConsumerRemoveWaiter(&waiter);

@@ -625,12 +625,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) {

// Still writable (even though it's full).

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 2));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 2));

// Now readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 3));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 3));

// Overwrite that element.

num_bytes = static_cast<uint32_t>(sizeof(int32_t));

@@ -642,12 +642,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) {

// Still writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 4));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 4));

// And still readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 5));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 5));

// Read that element.

num_bytes = static_cast<uint32_t>(sizeof(int32_t));

@@ -660,12 +660,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) {

// Still writable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

- dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 6));

+ dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 6));

// No longer readable.

waiter.Init();

EXPECT_EQ(MOJO_RESULT_OK,

- dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 7));

+ dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 7));

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL));

dp->ConsumerRemoveWaiter(&waiter);

« no previous file with comments | « mojo/system/local_data_pipe.cc ('k') | mojo/system/local_message_pipe_endpoint.cc » ('j') | no next file with comments »