1 files changed, 10 insertions, 7 deletions

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 f80842e250..f3e49001fa 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -54,6 +54,7 @@ namespace components {
 namespace resumption_test {
 
 using ::testing::_;
+using ::testing::A;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::DoAll;
@@ -452,9 +453,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToIVI) {
   smart_objects::SmartObject test_subscriptions;
   smart_objects::SmartObject app_vi;
 
-  int vtype = application_manager::VehicleDataType::GPS;
+  int vtype = mobile_apis::VehicleDataType::VEHICLEDATA_GPS;
   uint i = 0;
-  for (; vtype < application_manager::VehicleDataType::STEERINGWHEEL;
+  for (; vtype < mobile_apis::VehicleDataType::VEHICLEDATA_STEERINGWHEEL;
        ++i, ++vtype) {
     app_vi[i] = vtype;
   }
@@ -481,7 +482,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToIVI) {
   for (size_t i = 0; i < app_vi.length(); ++i) {
     EXPECT_CALL(
         *app_mock_,
-        SubscribeToIVI(static_cast<application_manager::VehicleDataType>(i)));
+        SubscribeToIVI(static_cast<mobile_apis::VehicleDataType::eType>(i)));
   }
 
   smart_objects::SmartObjectList requests;
@@ -505,7 +506,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToWayPoints) {
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
   EXPECT_CALL(*app_mock_, set_grammar_id(kTestGrammarId_));
-  EXPECT_CALL(app_mngr_, SubscribeAppForWayPoints(_));
+  EXPECT_CALL(
+      app_mngr_,
+      SubscribeAppForWayPoints(A<application_manager::ApplicationSharedPtr>()));
   const mobile_apis::HMILevel::eType hmi_test_level =
       mobile_apis::HMILevel::HMI_FULL;
   ON_CALL(app_mngr_, GetDefaultHmiLevel(const_app_))
@@ -880,7 +883,7 @@ TEST_F(ResumeCtrlTest, CheckPersistenceFilesForResumption_WithChoiceSet) {
 
 // TODO (VVeremjova) APPLINK-16718
 TEST_F(ResumeCtrlTest, DISABLED_OnSuspend) {
-  EXPECT_CALL(*mock_storage_, OnSuspend());
+  EXPECT_CALL(*mock_storage_, IncrementIgnOffCount());
   res_ctrl_->OnSuspend();
 }
 
@@ -896,7 +899,7 @@ TEST_F(ResumeCtrlTest, OnSuspend_EmptyApplicationlist) {
   ON_CALL(app_mngr_, applications()).WillByDefault(Return(accessor));
   EXPECT_CALL(*mock_storage_, SaveApplication(mock_app)).Times(0);
 
-  EXPECT_CALL(*mock_storage_, OnSuspend());
+  EXPECT_CALL(*mock_storage_, IncrementIgnOffCount()).Times(0);
   EXPECT_CALL(*mock_storage_, Persist());
   res_ctrl_->OnSuspend();
 }
@@ -906,7 +909,7 @@ TEST_F(ResumeCtrlTest, OnAwake) {
   EXPECT_CALL(mock_application_manager_settings_,
               app_resumption_save_persistent_data_timeout())
       .WillOnce(ReturnRef(timeout));
-  EXPECT_CALL(*mock_storage_, OnAwake());
+  EXPECT_CALL(*mock_storage_, DecrementIgnOffCount()).Times(0);
   res_ctrl_->OnAwake();
 }