diff options
author | reillyg <reillyg@chromium.org> | 2014-10-16 12:19:14 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 19:21:49 +0000 |
commit | 7f4f508547ac3058d7c47337313972ec1ac2fb1b (patch) | |
tree | daf6ad84ae3eb0451ba21a203fe7d3ea8bb033ab /device/hid/hid_connection_unittest.cc | |
parent | b92d87bee7689009c26be560634070a33508bcaf (diff) | |
download | chromium_src-7f4f508547ac3058d7c47337313972ec1ac2fb1b.zip chromium_src-7f4f508547ac3058d7c47337313972ec1ac2fb1b.tar.gz chromium_src-7f4f508547ac3058d7c47337313972ec1ac2fb1b.tar.bz2 |
Open HID connections asynchronously.
By making HidService::Connect return its result asynchronously platform
specific details such as whether device nodes must be opened on a
different thread (due to blocking) or requesting access from the Chrome
OS permission broker can be abstracted away.
BUG=422540
Review URL: https://codereview.chromium.org/660573007
Cr-Commit-Position: refs/heads/master@{#299950}
Diffstat (limited to 'device/hid/hid_connection_unittest.cc')
-rw-r--r-- | device/hid/hid_connection_unittest.cc | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/device/hid/hid_connection_unittest.cc b/device/hid/hid_connection_unittest.cc index 903cf5a..5654fc0 100644 --- a/device/hid/hid_connection_unittest.cc +++ b/device/hid/hid_connection_unittest.cc @@ -21,14 +21,39 @@ namespace { using net::IOBufferWithSize; -class TestCompletionCallback { +class TestConnectCallback { public: - TestCompletionCallback() - : read_callback_(base::Bind(&TestCompletionCallback::SetReadResult, - base::Unretained(this))), - write_callback_(base::Bind(&TestCompletionCallback::SetWriteResult, + TestConnectCallback() + : callback_(base::Bind(&TestConnectCallback::SetConnection, + base::Unretained(this))) {} + ~TestConnectCallback() {} + + void SetConnection(scoped_refptr<HidConnection> connection) { + connection_ = connection; + run_loop_.Quit(); + } + + scoped_refptr<HidConnection> WaitForConnection() { + run_loop_.Run(); + return connection_; + } + + const HidService::ConnectCallback& callback() { return callback_; } + + private: + HidService::ConnectCallback callback_; + base::RunLoop run_loop_; + scoped_refptr<HidConnection> connection_; +}; + +class TestIoCallback { + public: + TestIoCallback() + : read_callback_( + base::Bind(&TestIoCallback::SetReadResult, base::Unretained(this))), + write_callback_(base::Bind(&TestIoCallback::SetWriteResult, base::Unretained(this))) {} - ~TestCompletionCallback() {} + ~TestIoCallback() {} void SetReadResult(bool success, scoped_refptr<net::IOBuffer> buffer, @@ -128,7 +153,9 @@ class HidConnectionTest : public testing::Test { TEST_F(HidConnectionTest, ReadWrite) { if (!UsbTestGadget::IsTestEnabled()) return; - scoped_refptr<HidConnection> conn = service_->Connect(device_id_); + TestConnectCallback connect_callback; + service_->Connect(device_id_, connect_callback.callback()); + scoped_refptr<HidConnection> conn = connect_callback.WaitForConnection(); ASSERT_TRUE(conn.get()); for (int i = 0; i < 8; ++i) { @@ -138,11 +165,11 @@ TEST_F(HidConnectionTest, ReadWrite) { buffer->data()[j] = i + j - 1; } - TestCompletionCallback write_callback; + TestIoCallback write_callback; conn->Write(buffer, buffer->size(), write_callback.write_callback()); ASSERT_TRUE(write_callback.WaitForResult()); - TestCompletionCallback read_callback; + TestIoCallback read_callback; conn->Read(read_callback.read_callback()); ASSERT_TRUE(read_callback.WaitForResult()); ASSERT_EQ(9UL, read_callback.size()); |