diff options
Diffstat (limited to 'src/components/hmi_message_handler/test')
3 files changed, 7 insertions, 9 deletions
diff --git a/src/components/hmi_message_handler/test/CMakeLists.txt b/src/components/hmi_message_handler/test/CMakeLists.txt index 9e855c563e..6d30d6ee51 100644 --- a/src/components/hmi_message_handler/test/CMakeLists.txt +++ b/src/components/hmi_message_handler/test/CMakeLists.txt @@ -56,7 +56,7 @@ collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}") if (HMIADAPTER STREQUAL "messagebroker") GET_PROPERTY(BOOST_LIBS_DIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) - list(APPEND LIBRARIES ${BOOST_LIBS_DIRECTORY}/libboost_system.so) + list(APPEND LIBRARIES boost_system -L${BOOST_LIBS_DIRECTORY}) endif() create_test(hmi_message_handler_test "${SOURCES}" "${LIBRARIES}") diff --git a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc index eead7106c6..73fe76640d 100644 --- a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc +++ b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc @@ -31,8 +31,6 @@ */ #include "gtest/gtest.h" -#include "utils/shared_ptr.h" -#include "utils/make_shared.h" #include "hmi_message_handler/hmi_message_handler_impl.h" #include "hmi_message_handler/mock_hmi_message_adapter_impl.h" @@ -45,7 +43,7 @@ namespace hmi_message_handler_test { using ::testing::Return; using hmi_message_handler::HMIMessageHandlerImpl; -typedef utils::SharedPtr<MockHMIMessageAdapterImpl> +typedef std::shared_ptr<MockHMIMessageAdapterImpl> MockHMIMessageAdapterImplSPtr; TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) { @@ -60,7 +58,7 @@ TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) { ; MockHMIMessageAdapterImplSPtr message_adapter_impl = - utils::MakeShared<MockHMIMessageAdapterImpl>(message_handler); + std::make_shared<MockHMIMessageAdapterImpl>(message_handler); EXPECT_EQ(message_handler, message_adapter_impl->get_handler()); @@ -71,7 +69,7 @@ TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) { TEST(HMIMessageAdapterImplTest, Handler_NULLPointer_CorrectReturnedPointer) { HMIMessageHandler* message_handler = NULL; MockHMIMessageAdapterImplSPtr message_adapter_impl = - utils::MakeShared<MockHMIMessageAdapterImpl>(message_handler); + std::make_shared<MockHMIMessageAdapterImpl>(message_handler); EXPECT_EQ(NULL, message_adapter_impl->get_handler()); } diff --git a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc index fd459ea094..e66f900299 100644 --- a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc +++ b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc @@ -86,7 +86,7 @@ class HMIMessageHandlerImplTest : public ::testing::Test { hmi_message_handler::MessageSharedPointer CreateMessage() { // The ServiceType doesn't really matter - return new application_manager::Message( + return std::make_shared<application_manager::Message>( protocol_handler::MessagePriority::FromServiceType( protocol_handler::ServiceType::kInvalidServiceType)); } @@ -104,7 +104,7 @@ TEST_F(HMIMessageHandlerImplTest, TEST_F(HMIMessageHandlerImplTest, OnErrorSending_NotEmptyMessage_ExpectOnErrorSendingProceeded) { // Arrange - utils::SharedPtr<application_manager::Message> message = CreateMessage(); + std::shared_ptr<application_manager::Message> message = CreateMessage(); EXPECT_CALL(*mock_hmi_message_observer_, OnErrorSending(message)); // Act @@ -113,7 +113,7 @@ TEST_F(HMIMessageHandlerImplTest, TEST_F(HMIMessageHandlerImplTest, OnErrorSending_InvalidObserver_Cancelled) { // Arrange - utils::SharedPtr<application_manager::Message> message = CreateMessage(); + std::shared_ptr<application_manager::Message> message = CreateMessage(); hmi_handler_->set_message_observer(NULL); EXPECT_CALL(*mock_hmi_message_observer_, OnErrorSending(_)).Times(0); |