diff options
author | AGaliuzov <AGaliuzov@luxoft.com> | 2016-06-23 05:30:34 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-23 05:30:34 -0700 |
commit | 833cac1b1de464f53d5709904a4ee24634be2936 (patch) | |
tree | eceabb5046166e9b3d3a02fcd76496f88a177390 /src/components/application_manager/src/resumption/resumption_data_json.cc | |
parent | 405c303a9ef5238c659374785c4bbdc1140ca564 (diff) | |
parent | 48692790e4819261878eed1525d391bdde149ff4 (diff) | |
download | sdl_core-833cac1b1de464f53d5709904a4ee24634be2936.tar.gz |
Merge pull request #618 from Kozoriz/feature/Cover_resumption_with_unit_tests
Cover resumption with unit tests
Diffstat (limited to 'src/components/application_manager/src/resumption/resumption_data_json.cc')
-rw-r--r-- | src/components/application_manager/src/resumption/resumption_data_json.cc | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc index bb2faa412c..40262ff114 100644 --- a/src/components/application_manager/src/resumption/resumption_data_json.cc +++ b/src/components/application_manager/src/resumption/resumption_data_json.cc @@ -442,31 +442,6 @@ ssize_t ResumptionDataJson::GetObjectIndex(const std::string& policy_app_id, return -1; } -bool ResumptionDataJson::IsResumptionDataValid(uint32_t index) const { - using namespace app_mngr; - using namespace utils::json; - SDL_AUTO_TRACE(); - sync_primitives::AutoLock autolock(resumption_lock_); - const JsonValueRef json_app = GetSavedApplications()[index]; - if (!json_app.HasMember(strings::app_id) || - !json_app.HasMember(strings::ign_off_count) || - !json_app.HasMember(strings::hmi_level) || - !json_app.HasMember(strings::hmi_app_id) || - !json_app.HasMember(strings::time_stamp) || - !json_app.HasMember(strings::device_id)) { - SDL_ERROR("Wrong resumption data"); - return false; - } - - if (json_app.HasMember(strings::hmi_app_id) && - 0 >= json_app[strings::hmi_app_id].AsUInt()) { - SDL_ERROR("Wrong resumption hmi app ID"); - return false; - } - - return true; -} - void ResumptionDataJson::SetSavedApplication( utils::json::JsonValueRef apps_json) { SDL_AUTO_TRACE(); @@ -508,9 +483,7 @@ bool ResumptionDataJson::DropAppDataResumption(const std::string& device_id, application[strings::application_global_properties].Clear(); application[strings::application_subscribtions].Clear(); application[strings::application_files].Clear(); - // Seems there is no interface for json wrapper - needs to be created - // application.removeMember(strings::grammar_id); - application[strings::grammar_id].Clear(); + application.RemoveMember(strings::grammar_id); SDL_DEBUG("Resumption data for application " << app_id << " with device_id " << device_id << " has been dropped."); |