Add ActivateApp test cases for cloud apps

3 files changed, 58 insertions, 3 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
index 4a1fddc508..92a7020208 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
@@ -249,8 +249,10 @@ void SDLActivateAppRequest::onTimeOut() {
   using namespace hmi_apis::Common_Result;
   using namespace application_manager;
   unsubscribe_from_event(BasicCommunication_OnAppRegistered);
-  SendErrorResponse(
-      correlation_id(), SDL_ActivateApp, APPLICATION_NOT_REGISTERED, "");
+  SendErrorResponse(correlation_id(),
+                    SDL_ActivateApp,
+                    APPLICATION_NOT_REGISTERED,
+                    "App registration timed out");
 }
 
 void SDLActivateAppRequest::on_event(const event_engine::Event& event) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc
index 38cbc7b069..ea345e3b83 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc
@@ -61,8 +61,10 @@ using testing::Mock;
 using testing::Return;
 using testing::ReturnRef;
 using testing::Mock;
+using testing::Gt;
 using ::testing::NiceMock;
 using policy_test::MockPolicyHandlerInterface;
+using connection_handler_test::MockConnectionHandler;
 using am::event_engine::Event;
 
 namespace {
@@ -148,7 +150,7 @@ TEST_F(SDLActivateAppRequestTest, Run_ActivateApp_SUCCESS) {
   command->Run();
 }
 
-TEST_F(SDLActivateAppRequestTest, DISABLED_Run_DactivateApp_REJECTED) {
+TEST_F(SDLActivateAppRequestTest, DISABLED_Run_DeactivateApp_REJECTED) {
   MessageSharedPtr msg = CreateMessage();
   SetCorrelationAndAppID(msg);
   (*msg)[strings::msg_params][strings::function_id] =
@@ -189,6 +191,7 @@ TEST_F(SDLActivateAppRequestTest, FindAppToRegister_SUCCESS) {
       .WillOnce(Return(false));
 
   EXPECT_CALL(*mock_app, IsRegistered()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_app, is_cloud_app()).WillOnce(Return(false));
   ON_CALL(*mock_app, device()).WillByDefault(Return(kHandle));
 
   MockAppPtr mock_app_first(CreateMockApp());
@@ -250,6 +253,7 @@ TEST_F(SDLActivateAppRequestTest, DevicesAppsEmpty_SUCCESS) {
       .WillOnce(Return(false));
 
   EXPECT_CALL(*mock_app, IsRegistered()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_app, is_cloud_app()).WillOnce(Return(false));
   ON_CALL(*mock_app, device()).WillByDefault(Return(kHandle));
 
   DataAccessor<ApplicationSet> accessor(app_list_, lock_);
@@ -336,6 +340,7 @@ TEST_F(SDLActivateAppRequestTest, FirstAppIsForeground_SUCCESS) {
 
   EXPECT_CALL(*mock_app, device()).WillOnce(Return(kHandle));
   EXPECT_CALL(*mock_app, IsRegistered()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_app, is_cloud_app()).WillOnce(Return(false));
   EXPECT_CALL(app_mngr_, state_controller())
       .WillOnce(ReturnRef(mock_state_controller_));
   EXPECT_CALL(mock_state_controller_,
@@ -427,6 +432,53 @@ TEST_F(SDLActivateAppRequestTest, FirstAppNotRegistered_SUCCESS) {
 }
 #endif
 
+TEST_F(SDLActivateAppRequestTest, WaitingCloudApplication_ConnectDevice) {
+  MessageSharedPtr msg = CreateMessage();
+  SetCorrelationAndAppID(msg);
+
+  std::shared_ptr<SDLActivateAppRequest> command(
+      CreateCommand<SDLActivateAppRequest>(msg));
+
+  MockAppPtr mock_app(CreateMockApp());
+
+  EXPECT_CALL(*mock_app, device()).WillOnce(Return(kHandle));
+  EXPECT_CALL(*mock_app, IsRegistered()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_app, is_cloud_app()).WillOnce(Return(true));
+
+  EXPECT_CALL(app_mngr_, application(kAppID))
+      .WillOnce(Return(ApplicationSharedPtr()));
+  EXPECT_CALL(app_mngr_, WaitingApplicationByID(kAppID))
+      .WillOnce(Return(mock_app));
+
+  EXPECT_CALL(app_mngr_, state_controller())
+      .WillOnce(ReturnRef(mock_state_controller_));
+  EXPECT_CALL(mock_state_controller_,
+              IsStateActive(am::HmiState::StateID::STATE_ID_DEACTIVATE_HMI))
+      .WillOnce(Return(false));
+
+  const uint16_t kRetries = 3;
+  const uint32_t kRetryTimeout = 2000;
+  const uint32_t kMinimumTimeout = kRetries * kRetryTimeout;
+  
+  MockApplicationManagerSettings settings;
+  EXPECT_CALL(settings, cloud_app_max_retry_attempts())
+      .WillOnce(Return(kRetries));
+  EXPECT_CALL(settings, cloud_app_retry_timeout())
+      .WillOnce(Return(kRetryTimeout));
+  EXPECT_CALL(app_mngr_, get_settings()).WillOnce(ReturnRef(settings));
+
+  EXPECT_CALL(
+      app_mngr_,
+      updateRequestTimeout(0, kCorrelationID, Gt(kMinimumTimeout)));
+
+  MockConnectionHandler connection_handler;
+  EXPECT_CALL(connection_handler, ConnectToDevice(kHandle));
+
+  EXPECT_CALL(app_mngr_, connection_handler()).WillOnce(ReturnRef(connection_handler));
+
+  command->Run();
+}
+
 TEST_F(SDLActivateAppRequestTest, OnTimeout_SUCCESS) {
   MessageSharedPtr msg = CreateMessage();
   SetCorrelationAndAppID(msg);
diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
index 1c2339096c..2413421c7f 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -153,6 +153,7 @@ class ResumeCtrlTest : public ::testing::Test {
     ON_CALL(*mock_app_, mac_address()).WillByDefault(ReturnRef(kMacAddress_));
     ON_CALL(*mock_app_, device()).WillByDefault(Return(kTestDevId_));
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kTestAppId_));
+    ON_CALL(*mock_app_, is_cloud_app()).WillByDefault(Return(false));
   }
 
   NiceMock<event_engine_test::MockEventDispatcher> mock_event_dispatcher_;