From 27ab94b85fcf2519eabb90e9f7f4266177402cb9 Mon Sep 17 00:00:00 2001 From: AKalinich-Luxoft Date: Thu, 31 Aug 2017 17:57:54 +0300 Subject: Rename Subject struct to ApplicationOnDevice And more Subject structs were renamed to more descriptive name. Also removed unused mocks. --- .../test/include/policy/mock_access_remote.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/components/policy/policy_external/test') diff --git a/src/components/policy/policy_external/test/include/policy/mock_access_remote.h b/src/components/policy/policy_external/test/include/policy/mock_access_remote.h index 3eed880c0b..486c27590d 100644 --- a/src/components/policy/policy_external/test/include/policy/mock_access_remote.h +++ b/src/components/policy/policy_external/test/include/policy/mock_access_remote.h @@ -39,22 +39,19 @@ namespace test { namespace components { namespace access_remote_test { -class MockSubject : public policy::Subject { - public: -}; - class MockAccessRemote : public policy::AccessRemote { public: MOCK_CONST_METHOD3( FindGroup, - policy::PTString(const policy::Subject& who, + policy::PTString(const policy::ApplicationOnDevice& who, const policy::PTString& rpc, const policy::RemoteControlParams& params)); MOCK_METHOD2(SetDefaultHmiTypes, - void(const policy::Subject& who, + void(const policy::ApplicationOnDevice& who, const std::vector& hmi_types)); - MOCK_METHOD1(GetGroups, - const policy_table::Strings&(const policy::Subject& who)); + MOCK_METHOD1( + GetGroups, + const policy_table::Strings&(const policy::ApplicationOnDevice& who)); MOCK_METHOD3(GetPermissionsForApp, bool(const std::string& device_id, const std::string& app_id, @@ -62,7 +59,8 @@ class MockAccessRemote : public policy::AccessRemote { MOCK_CONST_METHOD2(CheckModuleType, bool(const policy::PTString& app_id, policy_table::ModuleType module)); - MOCK_METHOD1(IsAppRemoteControl, bool(const policy::Subject& who)); + MOCK_METHOD1(IsAppRemoteControl, + bool(const policy::ApplicationOnDevice& who)); MOCK_METHOD2(GetModuleTypes, bool(const std::string& application_id, std::vector* modules)); -- cgit v1.2.1