From 7c0e630ed2e2b5f926adfdc9ddb46585bb2985b0 Mon Sep 17 00:00:00 2001 From: BSolonenko Date: Mon, 18 Jun 2018 16:57:59 +0300 Subject: Fix unit tests Fixed the following unit tests: - ApplicationHelperTest - ResumptionDataDBTest --- .../test/application_helper_test.cc | 13 ++++++++++++ .../test/resumption/resumption_data_db_test.cc | 24 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/components/application_manager/test/application_helper_test.cc b/src/components/application_manager/test/application_helper_test.cc index 70772140c4..eb1e30c928 100644 --- a/src/components/application_manager/test/application_helper_test.cc +++ b/src/components/application_manager/test/application_helper_test.cc @@ -52,6 +52,8 @@ #include "utils/macro.h" #include "utils/shared_ptr.h" #include "utils/make_shared.h" +#include "test/resumption/mock_last_state.h" +#include "media_manager/mock_media_manager.h" namespace { const uint8_t expected_tread_pool_size = 2u; @@ -69,6 +71,8 @@ using ::testing::Mock; using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; +using resumption_test::MockLastState; +using test::components::media_manager_test::MockMediaManager; using namespace application_manager; using namespace policy_handler_test; @@ -112,6 +116,12 @@ class ApplicationHelperTest : public testing::Test { const connection_handler::DeviceHandle device_id = 1; const custom_str::CustomString app_name(""); + + const std::string path_to_plagin = ""; + EXPECT_CALL(mock_application_manager_settings_, plugins_folder()) + .WillOnce(ReturnRef(path_to_plagin)); + app_manager_impl_.Init(mock_last_state_, &mock_media_manager_); + app_impl_ = new ApplicationImpl( application_id, policy_app_id, @@ -127,6 +137,8 @@ class ApplicationHelperTest : public testing::Test { NiceMock mock_policy_settings_; ApplicationManagerImpl app_manager_impl_; + MockMediaManager mock_media_manager_; + MockLastState mock_last_state_; ApplicationSharedPtr app_impl_; }; @@ -170,6 +182,7 @@ TEST_F(ApplicationHelperTest, RecallApplicationData_ExpectAppDataReset) { EXPECT_TRUE(NULL != app_impl_->FindCommand(cmd_id)); EXPECT_TRUE(NULL != app_impl_->FindSubMenu(menu_id)); EXPECT_TRUE(NULL != app_impl_->FindChoiceSet(choice_set_id)); + EXPECT_TRUE(app_impl_->IsSubscribedToButton(button)); auto help_prompt = app_impl_->help_prompt(); EXPECT_TRUE(help_prompt->asString() == some_string); auto timeout_prompt = app_impl_->timeout_prompt(); 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 3b2c0d7b13..a75ba23bfb 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 @@ -52,6 +52,7 @@ namespace resumption_test { using ::testing::NiceMock; using ::testing::ReturnRef; +using ::testing::_; using application_manager_test::MockApplication; namespace am = application_manager; @@ -563,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(); } @@ -570,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( @@ -584,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; @@ -595,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); @@ -604,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; @@ -615,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); @@ -623,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_)); @@ -633,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(); @@ -654,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; @@ -672,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( @@ -683,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; @@ -694,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_)); @@ -702,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; @@ -711,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_, @@ -720,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")); @@ -729,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(); @@ -741,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(); @@ -766,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(); @@ -783,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(); @@ -796,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(); @@ -812,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; @@ -825,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(); @@ -848,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_)); -- cgit v1.2.1