mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc - Issue 2280483002: Add FlushForTesting to InterfacePtr and Binding.

Unified Diff: mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc

Issue 2280483002: Add FlushForTesting to InterfacePtr and Binding. (Closed)

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

« mojo/public/cpp/bindings/lib/router.cc ('K') | « mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc ('k') | mojo/public/cpp/bindings/tests/router_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc

diff --git a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc

index 6bbb17adfbc0b1a246cdeef55edfdd5f43dfc675..7e4c0ab907739ca4c88f106cf159345a6fc694f6 100644

--- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc

+++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc

@@ -65,11 +65,11 @@ class MultiplexRouterTest : public testing::Test {

TEST_F(MultiplexRouterTest, BasicRequestResponse) {

InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,

base::MakeUnique<PassThroughFilter>(), false,

- base::ThreadTaskRunnerHandle::Get());

+ base::ThreadTaskRunnerHandle::Get(), 0u);

ResponseGenerator generator;

InterfaceEndpointClient client1(std::move(endpoint1_), &generator,

base::MakeUnique<PassThroughFilter>(), false,

- base::ThreadTaskRunnerHandle::Get());

+ base::ThreadTaskRunnerHandle::Get(), 0u);

Message request;

AllocRequestMessage(1, "hello", &request);

@@ -112,11 +112,11 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse) {

TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {

InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,

base::MakeUnique<PassThroughFilter>(), false,

- base::ThreadTaskRunnerHandle::Get());

+ base::ThreadTaskRunnerHandle::Get(), 0u);

ResponseGenerator generator;

InterfaceEndpointClient client1(std::move(endpoint1_), &generator,

base::MakeUnique<PassThroughFilter>(), false,

- base::ThreadTaskRunnerHandle::Get());

+ base::ThreadTaskRunnerHandle::Get(), 0u);

Message request;

AllocRequestMessage(1, "hello", &request);

@@ -156,10 +156,10 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {

TEST_F(MultiplexRouterTest, RequestWithNoReceiver) {

InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,

base::MakeUnique<PassThroughFilter>(), false,

- base::ThreadTaskRunnerHandle::Get());

+ base::ThreadTaskRunnerHandle::Get(), 0u);

InterfaceEndpointClient client1(std::move(endpoint1_), nullptr,

base::MakeUnique<PassThroughFilter>(), false,

- base::ThreadTaskRunnerHandle::Get());

+ base::ThreadTaskRunnerHandle::Get(), 0u);

// Without an incoming receiver set on client1, we expect client0 to observe

// an error as a result of sending a message.

@@ -185,14 +185,15 @@ TEST_F(MultiplexRouterTest, RequestWithNoReceiver) {

// Tests MultiplexRouter using the LazyResponseGenerator. The responses will not

// be sent until after the requests have been accepted.

TEST_F(MultiplexRouterTest, LazyResponses) {

- InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,

- base::WrapUnique(new PassThroughFilter()),

- false, base::ThreadTaskRunnerHandle::Get());

+ InterfaceEndpointClient client0(

+ std::move(endpoint0_), nullptr, base::WrapUnique(new PassThroughFilter()),

+ false, base::ThreadTaskRunnerHandle::Get(), 0u);

base::RunLoop run_loop;

LazyResponseGenerator generator(run_loop.QuitClosure());

InterfaceEndpointClient client1(std::move(endpoint1_), &generator,

base::WrapUnique(new PassThroughFilter()),

- false, base::ThreadTaskRunnerHandle::Get());

+ false, base::ThreadTaskRunnerHandle::Get(),

+ 0u);

Message request;

AllocRequestMessage(1, "hello", &request);

@@ -256,9 +257,9 @@ void ForwardErrorHandler(bool* called, const base::Closure& callback) {

// both sides still appear to have a valid message pipe handle bound.

TEST_F(MultiplexRouterTest, MissingResponses) {

base::RunLoop run_loop0, run_loop1;

- InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,

- base::WrapUnique(new PassThroughFilter()),

- false, base::ThreadTaskRunnerHandle::Get());

+ InterfaceEndpointClient client0(

+ std::move(endpoint0_), nullptr, base::WrapUnique(new PassThroughFilter()),

+ false, base::ThreadTaskRunnerHandle::Get(), 0u);

bool error_handler_called0 = false;

client0.set_connection_error_handler(

base::Bind(&ForwardErrorHandler, &error_handler_called0,

@@ -268,7 +269,8 @@ TEST_F(MultiplexRouterTest, MissingResponses) {

LazyResponseGenerator generator(run_loop3.QuitClosure());

InterfaceEndpointClient client1(std::move(endpoint1_), &generator,

base::WrapUnique(new PassThroughFilter()),

- false, base::ThreadTaskRunnerHandle::Get());

+ false, base::ThreadTaskRunnerHandle::Get(),

+ 0u);

bool error_handler_called1 = false;

client1.set_connection_error_handler(

base::Bind(&ForwardErrorHandler, &error_handler_called1,

@@ -313,12 +315,13 @@ TEST_F(MultiplexRouterTest, LateResponse) {

base::RunLoop run_loop;

LazyResponseGenerator generator(run_loop.QuitClosure());

{

- InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,

- base::MakeUnique<PassThroughFilter>(),

- false, base::ThreadTaskRunnerHandle::Get());

+ InterfaceEndpointClient client0(

+ std::move(endpoint0_), nullptr, base::MakeUnique<PassThroughFilter>(),

+ false, base::ThreadTaskRunnerHandle::Get(), 0u);

InterfaceEndpointClient client1(std::move(endpoint1_), &generator,

base::MakeUnique<PassThroughFilter>(),

- false, base::ThreadTaskRunnerHandle::Get());

+ false, base::ThreadTaskRunnerHandle::Get(),

+ 0u);

Message request;

AllocRequestMessage(1, "hello", &request);