diff options
| author | Kozoriz <kozorizandriy@gmail.com> | 2016-04-11 16:29:27 +0300 |
|---|---|---|
| committer | Kozoriz <kozorizandriy@gmail.com> | 2016-04-25 12:15:46 +0300 |
| commit | 023eafc4160248e362afc9a73386096859772400 (patch) | |
| tree | ba2f480b94957bc8fc93a4ab1e24ea7cc41863f8 /src/components/application_manager/test/resumption/resumption_data_test.cc | |
| parent | daf2d2134715074cc58ae0264606c3349851bae1 (diff) | |
| download | sdl_core-023eafc4160248e362afc9a73386096859772400.tar.gz | |
ApplicationManager tests correctives after removing all singletons
Diffstat (limited to 'src/components/application_manager/test/resumption/resumption_data_test.cc')
| -rw-r--r-- | src/components/application_manager/test/resumption/resumption_data_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc index 6cfcd93c14..06ecff8d7a 100644 --- a/src/components/application_manager/test/resumption/resumption_data_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_test.cc @@ -37,12 +37,11 @@ #include "application_manager/usage_statistics.h" #include "include/resumption_data_mock.h" #include "utils/custom_string.h" -#include "application_manager/application_manager_impl.h" #include "application_manager/application.h" #include "utils/data_accessor.h" #include "application_manager/message_helper.h" -#include "include/resumption_data_test.h" +#include "resumption_data_test.h" namespace test { namespace components { @@ -53,7 +52,7 @@ using ::testing::ReturnRef; using ::testing::ReturnPointee; void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) { - EXPECT_EQ(mobile_app_id_, resume_app_list[am::strings::app_id].asString()); + EXPECT_EQ(policy_app_id_, resume_app_list[am::strings::app_id].asString()); EXPECT_EQ(grammar_id_, resume_app_list[am::strings::grammar_id].asUInt()); EXPECT_EQ(app_id_, resume_app_list[am::strings::connection_key].asUInt()); EXPECT_EQ(hmi_app_id_, resume_app_list[am::strings::hmi_app_id].asUInt()); @@ -346,7 +345,7 @@ void ResumptionDataTest::PrepareData() { ON_CALL(*app_mock, is_application_data_changed()).WillByDefault(Return(true)); - ON_CALL(*app_mock, mobile_app_id()).WillByDefault(Return(mobile_app_id_)); + ON_CALL(*app_mock, policy_app_id()).WillByDefault(Return(policy_app_id_)); ON_CALL(*app_mock, mac_address()).WillByDefault(ReturnRef(mac_address_)); ON_CALL(*app_mock, curHash()).WillByDefault(ReturnRef(hash_)); ON_CALL(*app_mock, get_grammar_id()).WillByDefault(Return(grammar_id_)); |