diff options
Diffstat (limited to 'src/components/application_manager/test/resumption/resumption_data_json_test.cc')
-rw-r--r-- | src/components/application_manager/test/resumption/resumption_data_json_test.cc | 31 |
1 files changed, 27 insertions, 4 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..40e61a3c53 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; @@ -60,7 +61,7 @@ using namespace file_system; using namespace resumption; using namespace mobile_apis; -namespace Formatters = NsSmartDeviceLink::NsJSONHandler::Formatters; +namespace formatters = ns_smart_device_link::ns_json_handler::formatters; class ResumptionDataJsonTest : public ResumptionDataTest { protected: @@ -68,7 +69,8 @@ class ResumptionDataJsonTest : public ResumptionDataTest { : last_state_("app_storage_folder", "app_info_storage") , res_json(last_state_, mock_application_manager_) {} virtual void SetUp() { - app_mock = new NiceMock<application_manager_test::MockApplication>(); + app_mock = std::make_shared< + NiceMock<application_manager_test::MockApplication> >(); policy_app_id_ = "test_policy_app_id"; app_id_ = 10; @@ -90,7 +92,7 @@ class ResumptionDataJsonTest : public ResumptionDataTest { dictionary[am::strings::resumption][am::strings::resume_app_list]; sm::SmartObject res_app_list; for (uint32_t i = 0; i < resume_app_list.size(); i++) { - Formatters::CFormatterJsonBase::jsonValueToObj(resume_app_list[i], + formatters::CFormatterJsonBase::jsonValueToObj(resume_app_list[i], res_app_list); CheckSavedApp(res_app_list); } @@ -109,12 +111,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 +127,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 +138,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 +156,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 +165,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 +176,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 +193,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 +211,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 +222,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 +234,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 +242,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 +252,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 +261,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 +269,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 +281,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 +299,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 +315,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 +327,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 +342,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 +355,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 +377,7 @@ TEST_F(ResumptionDataJsonTest, GetIgnOffTime_AfterSuspendAndAwake) { TEST_F(ResumptionDataJsonTest, DropAppDataResumption) { PrepareData(); SetZeroIgnOff(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_json.SaveApplication(app_mock); CheckSavedJson(); |