EDK: Check that handle rights are preserved in various tests. R=azani@chromium.org Review URL: https://codereview.chromium.org/1956703005 .
diff --git a/mojo/edk/system/data_pipe_impl_unittest.cc b/mojo/edk/system/data_pipe_impl_unittest.cc index c50e649..53b0ad5 100644 --- a/mojo/edk/system/data_pipe_impl_unittest.cc +++ b/mojo/edk/system/data_pipe_impl_unittest.cc
@@ -316,7 +316,7 @@ ASSERT_EQ(1u, read_num_handles); ASSERT_TRUE(read_handles[0]); EXPECT_TRUE(read_handles[0].dispatcher->HasOneRef()); - // TODO(vtl): Also check the rights here once they're actually preserved? + EXPECT_EQ(handle_to_send.rights, read_handles[0].rights); *handle_to_receive = std::move(read_handles[0]); }
diff --git a/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/mojo/edk/system/multiprocess_message_pipe_unittest.cc index 3efa58f..6d5c57c 100644 --- a/mojo/edk/system/multiprocess_message_pipe_unittest.cc +++ b/mojo/edk/system/multiprocess_message_pipe_unittest.cc
@@ -249,7 +249,7 @@ CHECK_EQ(num_handles, 1u); CHECK_EQ(handles[0].dispatcher->GetType(), Dispatcher::Type::SHARED_BUFFER); - // TODO(vtl): Also check the rights here once they're actually preserved? + CHECK_EQ(handles[0].rights, SharedBufferDispatcher::kDefaultHandleRights); RefPtr<SharedBufferDispatcher> dispatcher( static_cast<SharedBufferDispatcher*>(handles[0].dispatcher.get())); @@ -437,7 +437,8 @@ for (size_t i = 0; i < num_read_handles; ++i) { CHECK_EQ(read_handles[i].dispatcher->GetType(), Dispatcher::Type::PLATFORM_HANDLE); - // TODO(vtl): Also check the rights here once they're actually preserved? + CHECK_EQ(read_handles[i].rights, + PlatformHandleDispatcher::kDefaultHandleRights); RefPtr<PlatformHandleDispatcher> dispatcher( static_cast<PlatformHandleDispatcher*>(
diff --git a/mojo/edk/system/remote_data_pipe_impl_unittest.cc b/mojo/edk/system/remote_data_pipe_impl_unittest.cc index 24df824..86c54ce 100644 --- a/mojo/edk/system/remote_data_pipe_impl_unittest.cc +++ b/mojo/edk/system/remote_data_pipe_impl_unittest.cc
@@ -234,7 +234,8 @@ EXPECT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved? + EXPECT_EQ(DataPipeConsumerDispatcher::kDefaultHandleRights, + read_handles[0].rights); consumer = RefPtr<DataPipeConsumerDispatcher>( static_cast<DataPipeConsumerDispatcher*>( read_handles[0].dispatcher.get())); @@ -356,7 +357,8 @@ EXPECT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved? + EXPECT_EQ(DataPipeConsumerDispatcher::kDefaultHandleRights, + read_handles[0].rights); consumer = RefPtr<DataPipeConsumerDispatcher>( static_cast<DataPipeConsumerDispatcher*>( read_handles[0].dispatcher.get())); @@ -482,7 +484,8 @@ EXPECT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved? + EXPECT_EQ(DataPipeConsumerDispatcher::kDefaultHandleRights, + read_handles[0].rights); consumer = RefPtr<DataPipeConsumerDispatcher>( static_cast<DataPipeConsumerDispatcher*>( read_handles[0].dispatcher.get()));
diff --git a/mojo/edk/system/remote_message_pipe_unittest.cc b/mojo/edk/system/remote_message_pipe_unittest.cc index f273445..8d88b40 100644 --- a/mojo/edk/system/remote_message_pipe_unittest.cc +++ b/mojo/edk/system/remote_message_pipe_unittest.cc
@@ -690,7 +690,8 @@ EXPECT_EQ(Dispatcher::Type::MESSAGE_PIPE, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved. + EXPECT_EQ(MessagePipeDispatcher::kDefaultHandleRights, + read_handles[0].rights); dispatcher = RefPtr<MessagePipeDispatcher>( static_cast<MessagePipeDispatcher*>(read_handles[0].dispatcher.get())); @@ -879,7 +880,8 @@ EXPECT_EQ(Dispatcher::Type::MESSAGE_PIPE, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved. + EXPECT_EQ(MessagePipeDispatcher::kDefaultHandleRights, + read_handles[0].rights); dispatcher = RefPtr<MessagePipeDispatcher>( static_cast<MessagePipeDispatcher*>(read_handles[0].dispatcher.get())); @@ -1012,7 +1014,8 @@ EXPECT_EQ(Dispatcher::Type::SHARED_BUFFER, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved. + EXPECT_EQ(SharedBufferDispatcher::kDefaultHandleRights, + read_handles[0].rights); dispatcher = RefPtr<SharedBufferDispatcher>( static_cast<SharedBufferDispatcher*>(read_handles[0].dispatcher.get())); @@ -1126,7 +1129,8 @@ EXPECT_EQ(Dispatcher::Type::PLATFORM_HANDLE, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved. + EXPECT_EQ(PlatformHandleDispatcher::kDefaultHandleRights, + read_handles[0].rights); dispatcher = RefPtr<PlatformHandleDispatcher>( static_cast<PlatformHandleDispatcher*>(read_handles[0].dispatcher.get())); @@ -1265,7 +1269,8 @@ EXPECT_EQ(Dispatcher::Type::MESSAGE_PIPE, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved. + EXPECT_EQ(MessagePipeDispatcher::kDefaultHandleRights, + read_handles[0].rights); handle = std::move(read_handles[0]); read_handles.clear(); @@ -1324,7 +1329,8 @@ EXPECT_EQ(Dispatcher::Type::MESSAGE_PIPE, read_handles[0].dispatcher->GetType()); - // TODO(vtl): Also check the rights here once they're actually preserved. + EXPECT_EQ(MessagePipeDispatcher::kDefaultHandleRights, + read_handles[0].rights); dispatcher = RefPtr<MessagePipeDispatcher>( static_cast<MessagePipeDispatcher*>(read_handles[0].dispatcher.get())); read_handles.clear();