Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / device / serial / serial_connection_unittest.cc

diff --git a/src/device/serial/serial_connection_unittest.cc b/src/device/serial/serial_connection_unittest.cc
index 518dbcb..9edec43 100644 (file)
--- a/src/device/serial/serial_connection_unittest.cc
+++ b/src/device/serial/serial_connection_unittest.cc
@@ -24,7 +24,7 @@ namespace device {
 namespace {
 
 class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator {
-  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE {
+  mojo::Array<serial::DeviceInfoPtr> GetDevices() override {
     mojo::Array<serial::DeviceInfoPtr> devices(1);
     devices[0] = serial::DeviceInfo::New();
     devices[0]->path = "device";
@@ -62,7 +62,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
         receive_error_(serial::RECEIVE_ERROR_NONE),
         expected_event_(EVENT_NONE) {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     message_loop_.reset(new base::MessageLoop);
     mojo::InterfacePtr<serial::SerialService> service;
     mojo::BindToProxy(
@@ -78,9 +78,9 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
     mojo::InterfacePtr<serial::DataSource> producer;
     service->Connect("device",
                      serial::ConnectionOptions::New(),
-                     mojo::Get(&connection_),
-                     mojo::Get(&consumer),
-                     mojo::Get(&producer));
+                     mojo::GetProxy(&connection_),
+                     mojo::GetProxy(&consumer),
+                     mojo::GetProxy(&producer));
     sender_.reset(new DataSender(
         consumer.Pass(), kBufferSize, serial::SEND_ERROR_DISCONNECTED));
     receiver_ = new DataReceiver(
@@ -168,7 +168,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
     EventReceived(EVENT_RECEIVE_ERROR);
   }
 
-  virtual void OnConnectionError() OVERRIDE {
+  void OnConnectionError() override {
     EventReceived(EVENT_ERROR);
     FAIL() << "Connection error";
   }
@@ -269,13 +269,18 @@ TEST_F(SerialConnectionTest, Flush) {
   EXPECT_EQ(1, io_handler_->flushes());
 }
 
-TEST_F(SerialConnectionTest, Disconnect) {
+TEST_F(SerialConnectionTest, DisconnectWithSend) {
   connection_.reset();
   io_handler_->set_send_callback(base::Bind(base::DoNothing));
   ASSERT_NO_FATAL_FAILURE(Send("data"));
   WaitForEvent(EVENT_SEND_ERROR);
   EXPECT_EQ(serial::SEND_ERROR_DISCONNECTED, send_error_);
   EXPECT_EQ(0, bytes_sent_);
+  EXPECT_TRUE(io_handler_->HasOneRef());
+}
+
+TEST_F(SerialConnectionTest, DisconnectWithReceive) {
+  connection_.reset();
   ASSERT_NO_FATAL_FAILURE(Receive());
   WaitForEvent(EVENT_RECEIVE_ERROR);
   EXPECT_EQ(serial::RECEIVE_ERROR_DISCONNECTED, receive_error_);