diff options
author | Alexander Kutsan <AKutsan@luxoft.com> | 2016-08-26 18:48:22 +0300 |
---|---|---|
committer | Alexander Kutsan <AKutsan@luxoft.com> | 2016-08-26 18:48:57 +0300 |
commit | d73e6dc8724c5799fae14efd4dcb214af74e4904 (patch) | |
tree | 9ebed8b422490c4d669e90e70783e4f5b55b65c9 /src/components/hmi_message_handler/test/include/hmi_message_handler/mock_dbus_message_controller.h | |
parent | c201c11a35d360c0b96f36b103a2590bfaeb6026 (diff) | |
parent | 61ef8c42badb879216f53d240e1101b9f83a9bb7 (diff) | |
download | sdl_core-d73e6dc8724c5799fae14efd4dcb214af74e4904.tar.gz |
Merge branch 'release/4.1.0'
Diffstat (limited to 'src/components/hmi_message_handler/test/include/hmi_message_handler/mock_dbus_message_controller.h')
-rw-r--r-- | src/components/hmi_message_handler/test/include/hmi_message_handler/mock_dbus_message_controller.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_dbus_message_controller.h b/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_dbus_message_controller.h index 7512f2ab19..eb449f7121 100644 --- a/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_dbus_message_controller.h +++ b/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_dbus_message_controller.h @@ -36,15 +36,14 @@ #include <pthread.h> #include "hmi_message_handler/dbus_message_controller.h" -class MockDBusMessageController : - public ::hmi_message_handler::DBusMessageController { +class MockDBusMessageController + : public ::hmi_message_handler::DBusMessageController { public: MOCK_METHOD1(Recv, void(std::string&)); MockDBusMessageController(const std::string& serviceName, const std::string& path) - : DBusMessageController(serviceName, path), - thread_() {} + : DBusMessageController(serviceName, path), thread_() {} virtual void processResponse(std::string method, Json::Value& root) {} virtual void processRequest(Json::Value& root) {} @@ -52,17 +51,18 @@ class MockDBusMessageController : bool Init() { return ::hmi_message_handler::DBusMessageController::Init() && - pthread_create(&thread_, 0, &Run, this) == 0; + pthread_create(&thread_, 0, &Run, this) == 0; } + private: pthread_t thread_; static void* Run(void* data) { if (NULL != data) { - static_cast<MockDBusMessageController*>(data)->MethodForReceiverThread(nullptr); + static_cast<MockDBusMessageController*>(data) + ->MethodForReceiverThread(nullptr); } return 0; } }; - #endif // TEST_COMPONENTS_HMI_MESSAGE_HANDLER_INCLUDE_HMI_MESSAGE_HANDLER_MOCK_DBUS_MESSAGE_CONTROLLER_H_ |