1 files changed, 50 insertions, 16 deletions

diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc
index 3a8aaa70b4..08f2198fa0 100644
--- a/src/components/connection_handler/test/connection_handler_impl_test.cc
+++ b/src/components/connection_handler/test/connection_handler_impl_test.cc
@@ -65,8 +65,14 @@ enum UnnamedService { kServedService1 = 0x06, kServedService2 = 0x08 };
 class ConnectionHandlerTest : public ::testing::Test {
  protected:
   void SetUp() OVERRIDE {
+    device_handle_ = 0;
+
+    connection_type_ = "BTMAC";
+    device_name_ = "test_name";
+    mac_address_ = "test_address";
+
     connection_handler_ = new ConnectionHandlerImpl(
-        mock_connection_handler_settings, mock_transport_manager);
+        mock_connection_handler_settings, mock_transport_manager_);
     uid_ = 1u;
     connection_key_ = connection_handler_->KeyFromPair(0, 0u);
     protected_services_.clear();
@@ -87,12 +93,6 @@ class ConnectionHandlerTest : public ::testing::Test {
   }
   // Additional SetUp
   void AddTestDeviceConnection() {
-    device_handle_ = 0;
-
-    connection_type_ = "BTMAC";
-    device_name_ = "test_name";
-    mac_address_ = "test_address";
-
     const transport_manager::DeviceInfo device_info(
         device_handle_, mac_address_, device_name_, connection_type_);
     // Add Device and connection
@@ -239,7 +239,7 @@ class ConnectionHandlerTest : public ::testing::Test {
 
   ConnectionHandlerImpl* connection_handler_;
   testing::NiceMock<transport_manager_test::MockTransportManager>
-      mock_transport_manager;
+      mock_transport_manager_;
   testing::NiceMock<MockConnectionHandlerSettings>
       mock_connection_handler_settings;
   protocol_handler_test::MockProtocolHandler mock_protocol_handler_;
@@ -563,7 +563,7 @@ TEST_F(ConnectionHandlerTest, StartDevicesDiscovery) {
   connection_handler_->set_connection_handler_observer(
       &mock_connection_handler_observer);
 
-  EXPECT_CALL(mock_transport_manager, SearchDevices());
+  EXPECT_CALL(mock_transport_manager_, SearchDevices());
   EXPECT_CALL(mock_connection_handler_observer, OnDeviceListUpdated(_));
   connection_handler_->StartDevicesDiscovery();
 }
@@ -662,7 +662,7 @@ TEST_F(ConnectionHandlerTest, StartTransportManager) {
   AddTestDeviceConnection();
   AddTestSession();
 
-  EXPECT_CALL(mock_transport_manager, Visibility(true));
+  EXPECT_CALL(mock_transport_manager_, Visibility(true));
   connection_handler_->StartTransportManager();
 }
 
@@ -759,9 +759,9 @@ TEST_F(ConnectionHandlerTest, ConnectToDevice) {
   connection_handler_->OnDeviceAdded(device1);
   connection_handler_->OnDeviceAdded(device2);
 
-  EXPECT_CALL(mock_transport_manager, ConnectDevice(dev_handle1))
+  EXPECT_CALL(mock_transport_manager_, ConnectDevice(dev_handle1))
       .WillOnce(Return(transport_manager::E_SUCCESS));
-  EXPECT_CALL(mock_transport_manager, ConnectDevice(dev_handle2)).Times(0);
+  EXPECT_CALL(mock_transport_manager_, ConnectDevice(dev_handle2)).Times(0);
   connection_handler_->ConnectToDevice(dev_handle1);
 }
 
@@ -777,9 +777,9 @@ TEST_F(ConnectionHandlerTest, ConnectToAllDevices) {
   connection_handler_->OnDeviceAdded(device1);
   connection_handler_->OnDeviceAdded(device2);
 
-  EXPECT_CALL(mock_transport_manager, ConnectDevice(dev_handle1))
+  EXPECT_CALL(mock_transport_manager_, ConnectDevice(dev_handle1))
       .WillOnce(Return(transport_manager::E_SUCCESS));
-  EXPECT_CALL(mock_transport_manager, ConnectDevice(dev_handle2))
+  EXPECT_CALL(mock_transport_manager_, ConnectDevice(dev_handle2))
       .WillOnce(Return(transport_manager::E_SUCCESS));
   connection_handler_->ConnectToAllDevices();
 }
@@ -788,7 +788,7 @@ TEST_F(ConnectionHandlerTest, CloseConnection) {
   AddTestDeviceConnection();
   AddTestSession();
 
-  EXPECT_CALL(mock_transport_manager, DisconnectForce(uid_));
+  EXPECT_CALL(mock_transport_manager_, DisconnectForce(uid_));
   connection_handler_->CloseConnection(uid_);
 }
 
@@ -796,7 +796,7 @@ TEST_F(ConnectionHandlerTest, CloseRevokedConnection) {
   AddTestDeviceConnection();
   AddTestSession();
 
-  EXPECT_CALL(mock_transport_manager, DisconnectForce(uid_));
+  EXPECT_CALL(mock_transport_manager_, DisconnectForce(uid_));
   connection_handler_->CloseRevokedConnection(connection_key_);
 }
 
@@ -1428,6 +1428,40 @@ TEST_F(ConnectionHandlerTest, SendHeartBeat) {
   connection_handler_->SendHeartBeat(uid_, start_session_id_);
 }
 
+TEST_F(ConnectionHandlerTest, RunAppOnDevice_NoAppOnDevice_UNSUCCESS) {
+  const std::string bundle_id = "test_bundle_id";
+  const std::string mac_address0 = "test_mac_address0";
+  // All MAC addresses were stored in device list of ConnectionHandler in form
+  // of hashed string.
+  const std::string hash_of_mac_address0 = encryption::MakeHash(mac_address0);
+  const std::string hash_of_mac_address1 =
+      encryption::MakeHash("test_mac_address1");
+
+  // By default device list of ConnectionHandler was empty.
+  EXPECT_CALL(mock_transport_manager_, RunAppOnDevice(_, _)).Times(0);
+  connection_handler_->RunAppOnDevice(hash_of_mac_address0, bundle_id);
+
+  transport_manager::DeviceInfo device_info(
+      device_handle_, mac_address0, device_name_, connection_type_);
+  connection_handler_->OnDeviceAdded(device_info);
+
+  connection_handler_->RunAppOnDevice(hash_of_mac_address1, bundle_id);
+}
+
+TEST_F(ConnectionHandlerTest, RunAppOnDevice_AppOnDevice_SUCCESS) {
+  const std::string bundle_id = "test_bundle_id";
+
+  transport_manager::DeviceInfo device_info(
+      device_handle_, mac_address_, device_name_, connection_type_);
+  connection_handler_->OnDeviceAdded(device_info);
+
+  const std::string hash_of_mac_address = encryption::MakeHash(mac_address_);
+
+  EXPECT_CALL(mock_transport_manager_,
+              RunAppOnDevice(device_handle_, bundle_id));
+  connection_handler_->RunAppOnDevice(hash_of_mac_address, bundle_id);
+}
+
 }  // namespace connection_handler_test
 }  // namespace components
 }  // namespace test