diff options
author | JackLivio <jack@livio.io> | 2018-10-19 15:05:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-19 15:05:09 -0400 |
commit | d36316738785c96dab2ee892762ed08c059fffde (patch) | |
tree | 168a7c0705b5bc8f0dee7ce4b511ccf71759d9b4 /src/components/application_manager/test/resumption/resumption_data_db_test.cc | |
parent | 7f7fcbb998fb17f2954fd103349af67ea9b71a3f (diff) | |
parent | 83c5e805346d55ec7fb9f4ba8b6f6855d992273e (diff) | |
download | sdl_core-d36316738785c96dab2ee892762ed08c059fffde.tar.gz |
Merge pull request #2572 from smartdevicelink/release/5.0.05.0.0hotfix/templates_updatesfeature/show_app_menufeature/progress_bar_seekfeature/open-menu-rpcfeature/open-menu-rfeature/button
Release 5.0.0
Diffstat (limited to 'src/components/application_manager/test/resumption/resumption_data_db_test.cc')
-rw-r--r-- | src/components/application_manager/test/resumption/resumption_data_db_test.cc | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/src/components/application_manager/test/resumption/resumption_data_db_test.cc b/src/components/application_manager/test/resumption/resumption_data_db_test.cc index cf0ebb7fd2..8423520b9f 100644 --- a/src/components/application_manager/test/resumption/resumption_data_db_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_db_test.cc @@ -38,7 +38,7 @@ #include "interfaces/MOBILE_API.h" #include "utils/sqlite_wrapper/sql_database.h" #include "utils/sqlite_wrapper/sql_query.h" -#include "utils/make_shared.h" + #include "utils/file_system.h" #include "application_manager/resumption_data_test.h" #include "application_manager/test_resumption_data_db.h" @@ -52,6 +52,7 @@ namespace resumption_test { using ::testing::NiceMock; using ::testing::ReturnRef; +using ::testing::_; using application_manager_test::MockApplication; namespace am = application_manager; @@ -67,7 +68,7 @@ const std::string kPath = class ResumptionDataDBTest : public ResumptionDataTest { protected: void SetUp() OVERRIDE { - app_mock = utils::MakeShared<NiceMock<MockApplication> >(); + app_mock = std::make_shared<NiceMock<MockApplication> >(); policy_app_id_ = "test_policy_app_id"; app_id_ = 10; is_audio_ = true; @@ -122,7 +123,7 @@ class ResumptionDataDBTest : public ResumptionDataTest { void SetZeroIgnOffTime() { utils::dbms::SQLQuery query(test_db()); - EXPECT_TRUE(query.Prepare(KUpdateLastIgnOffTime)); + EXPECT_TRUE(query.Prepare(kUpdateLastIgnOffTime)); query.Bind(0, 0); EXPECT_TRUE(query.Exec()); } @@ -165,7 +166,7 @@ class ResumptionDataDBTest : public ResumptionDataTest { "DELETE FROM `applicationCommandsArray`; " "DELETE FROM `applicationFilesArray`; " "DELETE FROM `applicationSubMenuArray`; " - "DELETE FROM `applicationSubscribtionsArray`; " + "DELETE FROM `applicationSubscriptionsArray`; " "DELETE FROM `_internal_data`; "; private: @@ -271,6 +272,10 @@ void ResumptionDataDBTest::CheckGlobalProportiesData() { select_image.GetInteger(0)); EXPECT_EQ((*menu_icon_)[am::strings::value].asString(), select_image.GetString(1)); + if ((*menu_icon_).keyExists(am::strings::is_template)) { + EXPECT_EQ((*menu_icon_)[am::strings::is_template].asBool(), + select_image.GetBoolean(2)); + } } if (!select_globalproperties.IsNull(8)) { utils::dbms::SQLQuery select_tts_chunk(test_db()); @@ -559,6 +564,7 @@ TEST_F(ResumptionDataDBTest, Init) { TEST_F(ResumptionDataDBTest, SaveApplication) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); } @@ -566,6 +572,7 @@ TEST_F(ResumptionDataDBTest, SaveApplication) { TEST_F(ResumptionDataDBTest, RemoveApplicationFromSaved) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); EXPECT_TRUE( @@ -580,6 +587,7 @@ TEST_F(ResumptionDataDBTest, RemoveApplicationFromSaved) { TEST_F(ResumptionDataDBTest, RemoveApplicationFromSaved_AppNotSaved) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); sm::SmartObject saved_app; @@ -591,6 +599,7 @@ TEST_F(ResumptionDataDBTest, RemoveApplicationFromSaved_AppNotSaved) { TEST_F(ResumptionDataDBTest, SavedApplicationTwice) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)).Times(2); res_db()->SaveApplication(app_mock); CheckSavedDB(); res_db()->SaveApplication(app_mock); @@ -600,6 +609,7 @@ TEST_F(ResumptionDataDBTest, SavedApplicationTwice) { TEST_F(ResumptionDataDBTest, SavedApplicationTwice_UpdateApp) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)).Times(2); res_db()->SaveApplication(app_mock); CheckSavedDB(); (*vr_help_)[0][am::strings::position] = 2; @@ -611,6 +621,7 @@ TEST_F(ResumptionDataDBTest, SavedApplicationTwice_UpdateApp) { TEST_F(ResumptionDataDBTest, IsApplicationSaved_ApplicationSaved) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); ssize_t result = res_db()->IsApplicationSaved(policy_app_id_, kMacAddress_); EXPECT_EQ(0, result); @@ -619,6 +630,7 @@ TEST_F(ResumptionDataDBTest, IsApplicationSaved_ApplicationSaved) { TEST_F(ResumptionDataDBTest, IsApplicationSaved_ApplicationRemoved) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); EXPECT_TRUE( res_db()->RemoveApplicationFromSaved(policy_app_id_, kMacAddress_)); @@ -629,6 +641,7 @@ TEST_F(ResumptionDataDBTest, IsApplicationSaved_ApplicationRemoved) { TEST_F(ResumptionDataDBTest, GetSavedApplication) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); @@ -650,6 +663,7 @@ TEST_F(ResumptionDataDBTest, GetSavedApplication_AppNotSaved) { TEST_F(ResumptionDataDBTest, GetDataForLoadResumeData) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); sm::SmartObject saved_app; @@ -668,6 +682,7 @@ TEST_F(ResumptionDataDBTest, GetDataForLoadResumeData_AppRemove) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); EXPECT_TRUE( @@ -679,6 +694,7 @@ TEST_F(ResumptionDataDBTest, GetDataForLoadResumeData_AppRemove) { TEST_F(ResumptionDataDBTest, UpdateHmiLevel) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); HMILevel::eType new_hmi_level = HMILevel::HMI_LIMITED; @@ -690,6 +706,7 @@ TEST_F(ResumptionDataDBTest, UpdateHmiLevel) { TEST_F(ResumptionDataDBTest, IsHMIApplicationIdExist_AppIsSaved) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); EXPECT_TRUE(res_db()->IsHMIApplicationIdExist(hmi_app_id_)); @@ -698,6 +715,7 @@ TEST_F(ResumptionDataDBTest, IsHMIApplicationIdExist_AppIsSaved) { TEST_F(ResumptionDataDBTest, IsHMIApplicationIdExist_AppNotSaved) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); uint32_t new_hmi_app_id_ = hmi_app_id_ + 10; @@ -707,6 +725,7 @@ TEST_F(ResumptionDataDBTest, IsHMIApplicationIdExist_AppNotSaved) { TEST_F(ResumptionDataDBTest, GetHMIApplicationID) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); EXPECT_EQ(hmi_app_id_, @@ -716,6 +735,7 @@ TEST_F(ResumptionDataDBTest, GetHMIApplicationID) { TEST_F(ResumptionDataDBTest, GetHMIApplicationID_AppNotSaved) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); EXPECT_EQ(0u, res_db()->GetHMIApplicationID(policy_app_id_, "other_dev_id")); @@ -725,6 +745,7 @@ TEST_F(ResumptionDataDBTest, OnSuspend) { PrepareData(); EXPECT_TRUE(res_db()->Init()); SetZeroIgnOffTime(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); @@ -737,6 +758,7 @@ TEST_F(ResumptionDataDBTest, OnSuspendFourTimes) { PrepareData(); EXPECT_TRUE(res_db()->Init()); SetZeroIgnOffTime(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); @@ -762,6 +784,7 @@ TEST_F(ResumptionDataDBTest, OnSuspendOnAwake) { EXPECT_TRUE(res_db()->Init()); SetZeroIgnOffTime(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); @@ -779,6 +802,7 @@ TEST_F(ResumptionDataDBTest, Awake_AppNotSuspended) { EXPECT_TRUE(res_db()->Init()); SetZeroIgnOffTime(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); @@ -792,6 +816,7 @@ TEST_F(ResumptionDataDBTest, TwiceAwake_AppNotSuspended) { EXPECT_TRUE(res_db()->Init()); SetZeroIgnOffTime(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); CheckSavedDB(); @@ -808,6 +833,7 @@ TEST_F(ResumptionDataDBTest, GetHashId) { PrepareData(); EXPECT_TRUE(res_db()->Init()); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); std::string test_hash; @@ -821,6 +847,7 @@ TEST_F(ResumptionDataDBTest, GetIgnOffTime_AfterSuspendAndAwake) { SetZeroIgnOffTime(); uint32_t last_ign_off_time; + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); last_ign_off_time = res_db()->GetIgnOffTime(); @@ -844,6 +871,7 @@ TEST_F(ResumptionDataDBTest, DropAppResumptionData) { EXPECT_TRUE(res_db()->Init()); SetZeroIgnOffTime(); + EXPECT_CALL(*mock_app_extension_, SaveResumptionData(_)); res_db()->SaveApplication(app_mock); EXPECT_TRUE(res_db()->DropAppDataResumption(kMacAddress_, policy_app_id_)); @@ -863,8 +891,8 @@ TEST_F(ResumptionDataDBTest, DropAppResumptionData) { EXPECT_TRUE(app.keyExists(am::strings::application_global_properties) && app[am::strings::application_global_properties].empty()); - EXPECT_TRUE(app.keyExists(am::strings::application_subscribtions) && - app[am::strings::application_subscribtions].empty()); + EXPECT_TRUE(app.keyExists(am::strings::application_subscriptions) && + app[am::strings::application_subscriptions].empty()); EXPECT_TRUE(app.keyExists(am::strings::application_files) && app[am::strings::application_files].empty()); |