1 files changed, 23 insertions, 1 deletions
diff --git a/src/components/application_manager/test/resumption/resumption_data_json_test.cc b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
index a38afd8bdf..ea257b902c 100644
--- a/src/components/application_manager/test/resumption/resumption_data_json_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
@@ -52,6 +52,7 @@ namespace resumption_test {
 
 using ::testing::_;
 using ::testing::Return;
+using ::testing::ReturnRef;
 using ::testing::NiceMock;
 
 namespace am = application_manager;
@@ -109,12 +110,14 @@ class ResumptionDataJsonTest : public ResumptionDataTest {
 
 TEST_F(ResumptionDataJsonTest, SaveApplication) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
 }
 
 TEST_F(ResumptionDataJsonTest, SavedApplicationTwice) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)).Times(2);
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   res_json.SaveApplication(app_mock);
@@ -123,6 +126,7 @@ TEST_F(ResumptionDataJsonTest, SavedApplicationTwice) {
 
 TEST_F(ResumptionDataJsonTest, SavedApplicationTwice_UpdateApp) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)).Times(2);
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   (*vr_help_)[0][am::strings::position] = 2;
@@ -133,6 +137,7 @@ TEST_F(ResumptionDataJsonTest, SavedApplicationTwice_UpdateApp) {
 
 TEST_F(ResumptionDataJsonTest, RemoveApplicationFromSaved) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   EXPECT_TRUE(
       res_json.RemoveApplicationFromSaved(policy_app_id_, kMacAddress_));
@@ -150,6 +155,7 @@ TEST_F(ResumptionDataJsonTest, RemoveApplicationFromSaved_AppNotSaved) {
 
 TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationSaved) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   ssize_t result = res_json.IsApplicationSaved(policy_app_id_, kMacAddress_);
@@ -158,6 +164,7 @@ TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationSaved) {
 
 TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationRemoved) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   EXPECT_TRUE(
@@ -168,6 +175,7 @@ TEST_F(ResumptionDataJsonTest, IsApplicationSaved_ApplicationRemoved) {
 
 TEST_F(ResumptionDataJsonTest, GetSavedApplication) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   smart_objects::SmartObject saved_app;
   EXPECT_TRUE(
@@ -184,6 +192,7 @@ TEST_F(ResumptionDataJsonTest, GetSavedApplication_AppNotSaved) {
 
 TEST_F(ResumptionDataJsonTest, GetDataForLoadResumeData) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   smart_objects::SmartObject saved_app;
@@ -201,6 +210,7 @@ TEST_F(ResumptionDataJsonTest, GetDataForLoadResumeData_AppRemove) {
   smart_objects::SmartObject saved_app;
 
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   EXPECT_TRUE(
@@ -211,6 +221,7 @@ TEST_F(ResumptionDataJsonTest, GetDataForLoadResumeData_AppRemove) {
 
 TEST_F(ResumptionDataJsonTest, UpdateHmiLevel) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   HMILevel::eType new_hmi_level = HMILevel::HMI_LIMITED;
@@ -222,6 +233,7 @@ TEST_F(ResumptionDataJsonTest, UpdateHmiLevel) {
 
 TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppIsSaved) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   EXPECT_TRUE(res_json.IsHMIApplicationIdExist(hmi_app_id_));
@@ -229,6 +241,7 @@ TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppIsSaved) {
 
 TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppNotSaved) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
 
   CheckSavedJson();
@@ -238,6 +251,7 @@ TEST_F(ResumptionDataJsonTest, IsHMIApplicationIdExist_AppNotSaved) {
 
 TEST_F(ResumptionDataJsonTest, GetHMIApplicationID) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   EXPECT_EQ(hmi_app_id_,
@@ -246,6 +260,7 @@ TEST_F(ResumptionDataJsonTest, GetHMIApplicationID) {
 
 TEST_F(ResumptionDataJsonTest, GetHMIApplicationID_AppNotSaved) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   EXPECT_EQ(0u, res_json.GetHMIApplicationID(policy_app_id_, "other_dev_id"));
 }
@@ -253,7 +268,7 @@ TEST_F(ResumptionDataJsonTest, GetHMIApplicationID_AppNotSaved) {
 TEST_F(ResumptionDataJsonTest, OnSuspend) {
   SetZeroIgnOff();
   PrepareData();
-
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
 
@@ -265,6 +280,7 @@ TEST_F(ResumptionDataJsonTest, OnSuspend) {
 TEST_F(ResumptionDataJsonTest, OnSuspendFourTimes) {
   PrepareData();
   SetZeroIgnOff();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
 
@@ -282,6 +298,7 @@ TEST_F(ResumptionDataJsonTest, OnSuspendFourTimes) {
 TEST_F(ResumptionDataJsonTest, OnSuspendOnAwake) {
   PrepareData();
   SetZeroIgnOff();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
 
@@ -297,6 +314,7 @@ TEST_F(ResumptionDataJsonTest, OnSuspendOnAwake) {
 TEST_F(ResumptionDataJsonTest, Awake_AppNotSuspended) {
   SetZeroIgnOff();
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
 
@@ -308,6 +326,7 @@ TEST_F(ResumptionDataJsonTest, Awake_AppNotSuspended) {
 TEST_F(ResumptionDataJsonTest, TwiceAwake_AppNotSuspended) {
   SetZeroIgnOff();
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
 
@@ -322,6 +341,7 @@ TEST_F(ResumptionDataJsonTest, TwiceAwake_AppNotSuspended) {
 
 TEST_F(ResumptionDataJsonTest, GetHashId) {
   PrepareData();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
 
@@ -334,6 +354,7 @@ TEST_F(ResumptionDataJsonTest, GetIgnOffTime_AfterSuspendAndAwake) {
   uint32_t last_ign_off_time;
   PrepareData();
   SetZeroIgnOff();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();
   last_ign_off_time = res_json.GetIgnOffTime();
@@ -355,6 +376,7 @@ TEST_F(ResumptionDataJsonTest, GetIgnOffTime_AfterSuspendAndAwake) {
 TEST_F(ResumptionDataJsonTest, DropAppDataResumption) {
   PrepareData();
   SetZeroIgnOff();
+  EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_));
   res_json.SaveApplication(app_mock);
   CheckSavedJson();