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,
class HidConnectionTest : public testing::Test {
protected:
- virtual void SetUp() OVERRIDE {
+ void SetUp() override {
if (!UsbTestGadget::IsTestEnabled()) return;
message_loop_.reset(new base::MessageLoopForIO());
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) {
- scoped_refptr<IOBufferWithSize> buffer(new IOBufferWithSize(9));
+ const char kBufferSize = 9;
+ for (char i = 0; i < 8; ++i) {
+ scoped_refptr<IOBufferWithSize> buffer(new IOBufferWithSize(kBufferSize));
buffer->data()[0] = 0;
- for (int j = 1; j < buffer->size(); ++j) {
+ for (unsigned char j = 1; j < kBufferSize; ++j) {
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());
ASSERT_EQ(0, read_callback.buffer()->data()[0]);
- for (int j = 1; j < buffer->size(); ++j) {
+ for (unsigned char j = 1; j < kBufferSize; ++j) {
ASSERT_EQ(i + j - 1, read_callback.buffer()->data()[j]);
}
}