summaryrefslogtreecommitdiff
path: root/src/components/application_manager/test/mock/include
diff options
context:
space:
mode:
authorAleksandr Galiuzov <AGaliuzov@luxoft.com>2015-04-17 12:38:07 +0300
committerAleksandr Galiuzov <AGaliuzov@luxoft.com>2015-04-17 12:38:07 +0300
commit01a2bf14580befdf6a232740c55c916c2c164d0a (patch)
treea5b4c9748a458aeebbfe7431ee5e12864a9d04fd /src/components/application_manager/test/mock/include
parent8ae953fbf6cf475f98e26a56133f163bdf863cd7 (diff)
parentf0be58b56c2de15548dbd27a02762397d8da1060 (diff)
downloadsdl_core-01a2bf14580befdf6a232740c55c916c2c164d0a.tar.gz
Merge remote-tracking branch 'origin/APPLINK-12321' into release/4.0.0
Diffstat (limited to 'src/components/application_manager/test/mock/include')
-rw-r--r--src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
index 6a0b67ae50..3d9e9103a5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
@@ -209,6 +209,7 @@ class ApplicationManagerImpl : public ApplicationManager,
MOCK_METHOD1(HeadUnitReset, void(mobile_api::AppInterfaceUnregisteredReason::eType));
MOCK_METHOD1(LoadAppDataToHMI, bool(ApplicationSharedPtr));
MOCK_METHOD1(ActivateApplication, bool (ApplicationSharedPtr));
+ MOCK_METHOD1(DeactivateApplication, bool (ApplicationSharedPtr));
MOCK_METHOD1(IsHmiLevelFullAllowed, mobile_api::HMILevel::eType (ApplicationSharedPtr));
MOCK_METHOD2(UnregisterRevokedApplication, void(uint32_t, mobile_apis::Result::eType));
MOCK_METHOD1(SetUnregisterAllApplicationsReason, void(mobile_api::AppInterfaceUnregisteredReason::eType));
@@ -298,7 +299,7 @@ class ApplicationManagerImpl : public ApplicationManager,
MOCK_CONST_METHOD0(get_limited_media_application, ApplicationSharedPtr());
MOCK_CONST_METHOD0(get_limited_navi_application, ApplicationSharedPtr());
MOCK_CONST_METHOD0(get_limited_voice_application, ApplicationSharedPtr());
- MOCK_CONST_METHOD1(DoesAudioAppWithSameHMITypeExistInFullOrLimited, bool(ApplicationSharedPtr));
+ MOCK_CONST_METHOD1(IsAppTypeExistsInFullOrLimited, bool(ApplicationSharedPtr));
MOCK_CONST_METHOD0(active_application, ApplicationSharedPtr ());
MOCK_METHOD0(OnApplicationListUpdateTimer, void());
MOCK_METHOD0(OnLowVoltage, void());