diff options
author | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-19 20:51:56 +0200 |
---|---|---|
committer | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-25 16:50:56 +0200 |
commit | ce0c872262dd03afded8a0429d5825307708ea44 (patch) | |
tree | 64b687f1e989e1556ea855909d94c123aca5acef | |
parent | d9b374ebd524075c1a2f27e656e63591e86b6135 (diff) | |
download | sdl_core-ce0c872262dd03afded8a0429d5825307708ea44.tar.gz |
Correct coding style in mock/test files
Related tasks APPLINK-30588 APPLINK-30974
12 files changed, 141 insertions, 157 deletions
diff --git a/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h b/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h index 6a8979b4c0..48d4dc3a9f 100644 --- a/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h +++ b/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h @@ -43,7 +43,7 @@ namespace components { namespace application_manager_test { namespace { - using namespace ::usage_statistics; +using namespace ::usage_statistics; } class MockStatisticsManager : public StatisticsManager { diff --git a/src/components/application_manager/test/mobile_message_handler_test.cc b/src/components/application_manager/test/mobile_message_handler_test.cc index f92050d8c7..07b523c56e 100644 --- a/src/components/application_manager/test/mobile_message_handler_test.cc +++ b/src/components/application_manager/test/mobile_message_handler_test.cc @@ -163,12 +163,13 @@ class MobileMessageHandlerTest : public testing::Test { EXPECT_EQ(application_manager::MessageType::kNotification, message->type()); } - MobileMessage CreateMessageForSending(uint32_t protocol_version, - uint32_t function_id, - uint32_t correlation_id, - uint32_t connection_key, - const std::string& json_msg, - application_manager::BinaryData* data = NULL) { + MobileMessage CreateMessageForSending( + uint32_t protocol_version, + uint32_t function_id, + uint32_t correlation_id, + uint32_t connection_key, + const std::string& json_msg, + application_manager::BinaryData* data = NULL) { MobileMessage message = utils::MakeShared<Message>( MessagePriority::FromServiceType(ServiceType::kRpc)); message->set_function_id(function_id); @@ -217,7 +218,8 @@ class MobileMessageHandlerTest : public testing::Test { void TestHandlingOutgoingMessageProtocolWithBinaryData( const uint32_t protocol_version) { // Arrange - application_manager::BinaryData* bin_dat = new application_manager::BinaryData; + application_manager::BinaryData* bin_dat = + new application_manager::BinaryData; bin_dat->push_back('\a'); const uint32_t function_id = 247u; @@ -254,7 +256,8 @@ TEST(mobile_message_test, basic_test) { MobileMessage message = utils::MakeShared<Message>(protocol_handler::MessagePriority::kDefault); EXPECT_FALSE(message->has_binary_data()); - application_manager::BinaryData* binary_data = new application_manager::BinaryData; + application_manager::BinaryData* binary_data = + new application_manager::BinaryData; binary_data->push_back('X'); message->set_binary_data(binary_data); EXPECT_TRUE(message->has_binary_data()); diff --git a/src/components/application_manager/test/mobile_message_handler_v1_test.cc b/src/components/application_manager/test/mobile_message_handler_v1_test.cc index f69c7c90fc..f5a6e7833d 100644 --- a/src/components/application_manager/test/mobile_message_handler_v1_test.cc +++ b/src/components/application_manager/test/mobile_message_handler_v1_test.cc @@ -108,7 +108,8 @@ TEST(MobileMessageHandlerTestV1Test, uint32_t connection_key = 1; application_manager::MobileMessage message = - utils::MakeShared<application_manager::Message>(protocol_handler::MessagePriority::kDefault); + utils::MakeShared<application_manager::Message>( + protocol_handler::MessagePriority::kDefault); message->set_protocol_version(application_manager::ProtocolVersion::kV1); message->set_json_message(data_json); diff --git a/src/components/include/test/hmi_message_handler/mock_hmi_message_adapter.h b/src/components/include/test/hmi_message_handler/mock_hmi_message_adapter.h index 1906a55fa8..4f6559314d 100644 --- a/src/components/include/test/hmi_message_handler/mock_hmi_message_adapter.h +++ b/src/components/include/test/hmi_message_handler/mock_hmi_message_adapter.h @@ -44,8 +44,7 @@ using hmi_message_handler::HMIMessageAdapter; class MockHMIMessageAdapter : public HMIMessageAdapter { public: - MOCK_METHOD0(SubscribeTo, - void()); + MOCK_METHOD0(SubscribeTo, void()); }; } // namespace hmi_message_handler_test diff --git a/src/components/include/test/hmi_message_handler/mock_hmi_message_sender.h b/src/components/include/test/hmi_message_handler/mock_hmi_message_sender.h index d544b8bd62..82b0fec738 100644 --- a/src/components/include/test/hmi_message_handler/mock_hmi_message_sender.h +++ b/src/components/include/test/hmi_message_handler/mock_hmi_message_sender.h @@ -42,8 +42,7 @@ namespace hmi_message_handler_test { class MockHMIMessageSender : public hmi_message_handler::HMIMessageSender { public: - MOCK_METHOD1(SendMessageToHMI, - void(MessageSharedPointer message)); + MOCK_METHOD1(SendMessageToHMI, void(MessageSharedPointer message)); }; } // namespace hmi_message_handler_test diff --git a/src/components/include/test/media_manager/mock_media_manager.h b/src/components/include/test/media_manager/mock_media_manager.h index 7708f3b667..9cd2a05fc0 100644 --- a/src/components/include/test/media_manager/mock_media_manager.h +++ b/src/components/include/test/media_manager/mock_media_manager.h @@ -41,22 +41,22 @@ namespace media_manager_test { class MockMediaManager : public media_manager::MediaManager { public: - MOCK_METHOD1(PlayA2DPSource, - void(int32_t application_key)); - MOCK_METHOD1(StopA2DPSource, - void(int32_t application_key)); + MOCK_METHOD1(PlayA2DPSource, void(int32_t application_key)); + MOCK_METHOD1(StopA2DPSource, void(int32_t application_key)); MOCK_METHOD3(StartMicrophoneRecording, - void(int32_t application_key, const std::string& outputFileName, int32_t duration)); - MOCK_METHOD1(StopMicrophoneRecording, - void(int32_t application_key)); + void(int32_t application_key, + const std::string& outputFileName, + int32_t duration)); + MOCK_METHOD1(StopMicrophoneRecording, void(int32_t application_key)); MOCK_METHOD2(StartStreaming, - void(int32_t application_key, protocol_handler::ServiceType service_type)); + void(int32_t application_key, + protocol_handler::ServiceType service_type)); MOCK_METHOD2(StopStreaming, - void(int32_t application_key, protocol_handler::ServiceType service_type)); + void(int32_t application_key, + protocol_handler::ServiceType service_type)); MOCK_METHOD2(FramesProcessed, - void(int32_t application_key, int32_t frame_number)); - MOCK_CONST_METHOD0(settings, - const MediaManagerSettings&()); + void(int32_t application_key, int32_t frame_number)); + MOCK_CONST_METHOD0(settings, const MediaManagerSettings&()); }; } // namespace media_manager_test diff --git a/src/components/include/test/policy/mock_policy_manager.h b/src/components/include/test/policy/mock_policy_manager.h index 0d9967af95..19dc5e4967 100644 --- a/src/components/include/test/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/mock_policy_manager.h @@ -41,146 +41,130 @@ namespace components { namespace policy_manager_test { namespace { - using namespace policy; +using namespace policy; } class MockPolicyManager : public PolicyManager { public: - MOCK_METHOD1(set_listener, - void(PolicyListener* listener)); + MOCK_METHOD1(set_listener, void(PolicyListener* listener)); MOCK_METHOD2(InitPT, - bool(const std::string& file_name, const PolicySettings* settings)); + bool(const std::string& file_name, + const PolicySettings* settings)); MOCK_METHOD2(LoadPT, - bool(const std::string& file, const BinaryMessage& pt_content)); - MOCK_METHOD1(ResetPT, - bool(const std::string& file_name)); - MOCK_CONST_METHOD0(GetLockScreenIconUrl, - std::string()); + bool(const std::string& file, const BinaryMessage& pt_content)); + MOCK_METHOD1(ResetPT, bool(const std::string& file_name)); + MOCK_CONST_METHOD0(GetLockScreenIconUrl, std::string()); MOCK_METHOD2(GetServiceUrls, - void(const std::string& service_type, EndpointUrls& end_points)); - MOCK_METHOD0(RequestPTUpdate, - bool()); + void(const std::string& service_type, EndpointUrls& end_points)); + MOCK_METHOD0(RequestPTUpdate, bool()); MOCK_METHOD5(CheckPermissions, - void(const PTString& app_id, const PTString& hmi_level, const PTString& rpc, const RPCParams& rpc_params, CheckPermissionResult& result)); - MOCK_METHOD0(ResetUserConsent, - bool()); - MOCK_CONST_METHOD0(GetPolicyTableStatus, - std::string()); - MOCK_METHOD1(KmsChanged, - void(int kilometers)); - MOCK_METHOD0(IncrementIgnitionCycles, - void()); - MOCK_METHOD0(ForcePTExchange, - std::string()); - MOCK_METHOD0(ResetRetrySequence, - void()); - MOCK_METHOD0(NextRetryTimeout, - uint32_t()); - MOCK_METHOD0(TimeoutExchange, - int()); - MOCK_METHOD0(RetrySequenceDelaysSeconds, - const std::vector<int>()); - MOCK_METHOD0(OnExceededTimeout, - void()); - MOCK_METHOD0(OnUpdateStarted, - void()); + void(const PTString& app_id, + const PTString& hmi_level, + const PTString& rpc, + const RPCParams& rpc_params, + CheckPermissionResult& result)); + MOCK_METHOD0(ResetUserConsent, bool()); + MOCK_CONST_METHOD0(GetPolicyTableStatus, std::string()); + MOCK_METHOD1(KmsChanged, void(int kilometers)); + MOCK_METHOD0(IncrementIgnitionCycles, void()); + MOCK_METHOD0(ForcePTExchange, std::string()); + MOCK_METHOD0(ResetRetrySequence, void()); + MOCK_METHOD0(NextRetryTimeout, uint32_t()); + MOCK_METHOD0(TimeoutExchange, int()); + MOCK_METHOD0(RetrySequenceDelaysSeconds, const std::vector<int>()); + MOCK_METHOD0(OnExceededTimeout, void()); + MOCK_METHOD0(OnUpdateStarted, void()); MOCK_CONST_METHOD1(GetUserConsentForDevice, - DeviceConsent(const std::string& device_id)); + DeviceConsent(const std::string& device_id)); MOCK_METHOD3(GetUserConsentForApp, - void(const std::string& device_id, const std::string& policy_app_id, std::vector<FunctionalGroupPermission>& permissions)); + void(const std::string& device_id, + const std::string& policy_app_id, + std::vector<FunctionalGroupPermission>& permissions)); MOCK_METHOD2(SetUserConsentForDevice, - void(const std::string& device_id, bool is_allowed)); + void(const std::string& device_id, bool is_allowed)); MOCK_METHOD2(ReactOnUserDevConsentForApp, - bool(const std::string app_id, bool is_device_allowed)); - MOCK_METHOD2(PTUpdatedAt, - void(Counters counter, int value)); + bool(const std::string app_id, bool is_device_allowed)); + MOCK_METHOD2(PTUpdatedAt, void(Counters counter, int value)); MOCK_METHOD3(GetInitialAppData, - bool(const std::string& str, StringArray* arr1, StringArray* arr2)); + bool(const std::string& str, + StringArray* arr1, + StringArray* arr2)); MOCK_METHOD2(AddDevice, - void(const std::string& device_id, const std::string& connection_type)); + void(const std::string& device_id, + const std::string& connection_type)); MOCK_METHOD2(SetDeviceInfo, - void(const std::string& device_id, const DeviceInfo& device_info)); + void(const std::string& device_id, + const DeviceInfo& device_info)); MOCK_METHOD1(SetUserConsentForApp, - void(const PermissionConsent& permissions)); + void(const PermissionConsent& permissions)); MOCK_CONST_METHOD2(GetDefaultHmi, - bool(const std::string& policy_app_id, std::string* default_hmi)); + bool(const std::string& policy_app_id, + std::string* default_hmi)); MOCK_CONST_METHOD2(GetPriority, - bool(const std::string& policy_app_id, std::string* priority)); + bool(const std::string& policy_app_id, + std::string* priority)); MOCK_METHOD2(GetUserFriendlyMessages, - std::vector<UserFriendlyMessage>(const std::vector<std::string>& message_code, const std::string& language)); - MOCK_CONST_METHOD1(IsApplicationRevoked, - bool(const std::string& app_id)); + std::vector<UserFriendlyMessage>( + const std::vector<std::string>& message_code, + const std::string& language)); + MOCK_CONST_METHOD1(IsApplicationRevoked, bool(const std::string& app_id)); MOCK_METHOD3(GetPermissionsForApp, - void(const std::string& device_id, const std::string& policy_app_id, std::vector<FunctionalGroupPermission>& permissions)); + void(const std::string& device_id, + const std::string& policy_app_id, + std::vector<FunctionalGroupPermission>& permissions)); MOCK_METHOD1(GetAppPermissionsChanges, - AppPermissions(const std::string& policy_app_id)); - MOCK_METHOD1(RemovePendingPermissionChanges, - void(const std::string& app_id)); + AppPermissions(const std::string& policy_app_id)); + MOCK_METHOD1(RemovePendingPermissionChanges, void(const std::string& app_id)); MOCK_CONST_METHOD1(GetCurrentDeviceId, - std::string&(const std::string& policy_app_id)); - MOCK_METHOD1(SetSystemLanguage, - void(const std::string& language)); + std::string&(const std::string& policy_app_id)); + MOCK_METHOD1(SetSystemLanguage, void(const std::string& language)); MOCK_METHOD3(SetSystemInfo, - void(const std::string& ccpu_version, const std::string& wers_country_code, const std::string& language)); + void(const std::string& ccpu_version, + const std::string& wers_country_code, + const std::string& language)); MOCK_METHOD1(SendNotificationOnPermissionsUpdated, - void(const std::string& application_id)); - MOCK_METHOD1(MarkUnpairedDevice, - void(const std::string& device_id)); - MOCK_METHOD1(AddApplication, - void(const std::string& application_id)); - MOCK_METHOD0(CleanupUnpairedDevices, - bool()); - MOCK_CONST_METHOD1(CanAppKeepContext, - bool(const std::string& app_id)); - MOCK_CONST_METHOD1(CanAppStealFocus, - bool(const std::string& app_id)); - MOCK_METHOD0(OnSystemReady, - void()); + void(const std::string& application_id)); + MOCK_METHOD1(MarkUnpairedDevice, void(const std::string& device_id)); + MOCK_METHOD1(AddApplication, void(const std::string& application_id)); + MOCK_METHOD0(CleanupUnpairedDevices, bool()); + MOCK_CONST_METHOD1(CanAppKeepContext, bool(const std::string& app_id)); + MOCK_CONST_METHOD1(CanAppStealFocus, bool(const std::string& app_id)); + MOCK_METHOD0(OnSystemReady, void()); MOCK_CONST_METHOD1(GetNotificationsNumber, - uint32_t(const std::string& priority)); - MOCK_METHOD1(SetVINValue, - void(const std::string& value)); - MOCK_METHOD1(IsPredataPolicy, - bool(const std::string& policy_app_id)); - MOCK_CONST_METHOD1(HeartBeatTimeout, - uint32_t(const std::string& app_id)); - MOCK_METHOD1(SaveUpdateStatusRequired, - void(bool is_update_needed)); - MOCK_METHOD0(OnAppsSearchStarted, - void()); - MOCK_METHOD0(OnAppsSearchCompleted, - void()); - MOCK_CONST_METHOD1(GetAppRequestTypes, + uint32_t(const std::string& priority)); + MOCK_METHOD1(SetVINValue, void(const std::string& value)); + MOCK_METHOD1(IsPredataPolicy, bool(const std::string& policy_app_id)); + MOCK_CONST_METHOD1(HeartBeatTimeout, uint32_t(const std::string& app_id)); + MOCK_METHOD1(SaveUpdateStatusRequired, void(bool is_update_needed)); + MOCK_METHOD0(OnAppsSearchStarted, void()); + MOCK_METHOD0(OnAppsSearchCompleted, void()); + MOCK_CONST_METHOD1( + GetAppRequestTypes, const std::vector<std::string>(const std::string policy_app_id)); - MOCK_CONST_METHOD0(GetVehicleInfo, - const VehicleInfo()); + MOCK_CONST_METHOD0(GetVehicleInfo, const VehicleInfo()); MOCK_METHOD1(OnAppRegisteredOnMobile, - void(const std::string& application_id)); - MOCK_CONST_METHOD0(RetrieveCertificate, - std::string()); - MOCK_CONST_METHOD0(get_settings, - const PolicySettings&()); - MOCK_METHOD0(ExceededIgnitionCycles, - bool()); - MOCK_METHOD0(ExceededDays, - bool()); - MOCK_METHOD0(StartPTExchange, - void()); + void(const std::string& application_id)); + MOCK_CONST_METHOD0(RetrieveCertificate, std::string()); + MOCK_CONST_METHOD0(get_settings, const PolicySettings&()); + MOCK_METHOD0(ExceededIgnitionCycles, bool()); + MOCK_METHOD0(ExceededDays, bool()); + MOCK_METHOD0(StartPTExchange, void()); // --- Statistics Manager section MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type)); - MOCK_METHOD2(Increment, void(const std::string& app_id, - usage_statistics::AppCounterId type)); - MOCK_METHOD3(Set, void(const std::string& app_id, - usage_statistics::AppInfoId type, - const std::string& value)); - MOCK_METHOD3(Add, void(const std::string& app_id, - usage_statistics::AppStopwatchId type, - int32_t timespan_seconds)); + MOCK_METHOD2(Increment, + void(const std::string& app_id, + usage_statistics::AppCounterId type)); + MOCK_METHOD3(Set, + void(const std::string& app_id, + usage_statistics::AppInfoId type, + const std::string& value)); + MOCK_METHOD3(Add, + void(const std::string& app_id, + usage_statistics::AppStopwatchId type, + int32_t timespan_seconds)); }; - - } // namespace policy_manager_test } // namespace components } // namespace test diff --git a/src/components/include/test/protocol_handler/mock_telemetry_observer.h b/src/components/include/test/protocol_handler/mock_telemetry_observer.h index 5901460cd2..1c87de4d5a 100644 --- a/src/components/include/test/protocol_handler/mock_telemetry_observer.h +++ b/src/components/include/test/protocol_handler/mock_telemetry_observer.h @@ -44,9 +44,8 @@ namespace protocol_handler_test { class MockPHTelemetryObserver : public PHTelemetryObserver { public: MOCK_METHOD2(StartMessageProcess, - void(uint32_t message_id, const TimevalStruct& start_time)); - MOCK_METHOD1(EndMessageProcess, - void(utils::SharedPtr<MessageMetric> m)); + void(uint32_t message_id, const TimevalStruct& start_time)); + MOCK_METHOD1(EndMessageProcess, void(utils::SharedPtr<MessageMetric> m)); }; } // namespace protocol_handler_test diff --git a/src/components/policy/test/include/policy/mock_cache_manager.h b/src/components/policy/test/include/policy/mock_cache_manager.h index 907e3f7711..1710e7fd36 100644 --- a/src/components/policy/test/include/policy/mock_cache_manager.h +++ b/src/components/policy/test/include/policy/mock_cache_manager.h @@ -45,8 +45,8 @@ namespace components { namespace policy_test { namespace { - using namespace policy; - namespace policy_table = rpc::policy_table_interface_base; +using namespace policy; +namespace policy_table = rpc::policy_table_interface_base; } class MockCacheManagerInterface : public CacheManagerInterface { diff --git a/src/components/policy/test/include/policy/mock_policy_listener.h b/src/components/policy/test/include/policy/mock_policy_listener.h index b160c43fac..87aa4c855a 100644 --- a/src/components/policy/test/include/policy/mock_policy_listener.h +++ b/src/components/policy/test/include/policy/mock_policy_listener.h @@ -48,7 +48,7 @@ namespace components { namespace policy_test { namespace { - using namespace policy; +using namespace policy; } namespace custom_str = utils::custom_string; diff --git a/src/components/policy/test/include/policy/mock_pt_ext_representation.h b/src/components/policy/test/include/policy/mock_pt_ext_representation.h index fd7a3585f1..163a4aff9a 100644 --- a/src/components/policy/test/include/policy/mock_pt_ext_representation.h +++ b/src/components/policy/test/include/policy/mock_pt_ext_representation.h @@ -119,22 +119,22 @@ class MockPTExtRepresentation : public MockPTRepresentation, void(const std::string& app_id, const std::string& type, int seconds)); - MOCK_CONST_METHOD3(CountUnconsentedGroups, - bool(const std::string& app_id, - const std::string& device_id, - int* count)); - MOCK_METHOD1(GetFunctionalGroupNames, bool(FunctionalGroupNames& names)); - MOCK_CONST_METHOD1(CleanupUnpairedDevices, bool(const DeviceIds& device_ids)); - MOCK_METHOD2(ReactOnUserDevConsentForApp, - bool(const std::string& app_id, bool is_device_allowed)); - MOCK_METHOD1(SetPredataPolicy, bool(const std::string& app_id)); - MOCK_METHOD2(SetIsPredata, bool(const std::string& app_id, bool is_predata)); - MOCK_CONST_METHOD2(SetUnpairedDevice, - bool(const std::string& device_id, bool unpaired)); - MOCK_CONST_METHOD1(UnpairedDevicesList, bool(DeviceIds* device_ids)); - MOCK_CONST_METHOD2(RemoveAppConsentForGroup, - bool(const std::string& policy_app_id, - const std::string& functional_group)); +MOCK_CONST_METHOD3(CountUnconsentedGroups, + bool(const std::string& app_id, + const std::string& device_id, + int* count)); +MOCK_METHOD1(GetFunctionalGroupNames, bool(FunctionalGroupNames& names)); +MOCK_CONST_METHOD1(CleanupUnpairedDevices, bool(const DeviceIds& device_ids)); +MOCK_METHOD2(ReactOnUserDevConsentForApp, + bool(const std::string& app_id, bool is_device_allowed)); +MOCK_METHOD1(SetPredataPolicy, bool(const std::string& app_id)); +MOCK_METHOD2(SetIsPredata, bool(const std::string& app_id, bool is_predata)); +MOCK_CONST_METHOD2(SetUnpairedDevice, + bool(const std::string& device_id, bool unpaired)); +MOCK_CONST_METHOD1(UnpairedDevicesList, bool(DeviceIds* device_ids)); +MOCK_CONST_METHOD2(RemoveAppConsentForGroup, + bool(const std::string& policy_app_id, + const std::string& functional_group)); }; } // namespace policy_test diff --git a/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h index 4cca338f3d..6fb57d09f2 100644 --- a/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h +++ b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h @@ -406,5 +406,4 @@ bool UpdateSection(dbms::SQLDatabase* db, } // namespace components } // namespace test - #endif // SRC_COMPONENTS_UTILS_TEST_INCLUDE_UTILS_GENERATED_CODE_WITH_SQLITE_TEST_H_ |