diff options
| author | Alexander Kutsan <akutsan@luxoft.com> | 2017-08-10 14:07:09 +0300 |
|---|---|---|
| committer | Andrey Oleynik <aoleynik@luxoft.com> | 2017-08-16 22:36:22 +0300 |
| commit | bf882f9c2b10291769fb0ba2102056bfcd1bee09 (patch) | |
| tree | 4ddc959b02c3701058c927ae73f2b5c788077121 /src/components/hmi_message_handler | |
| parent | 5abab475694f03f74437bbdca194a9e63eb49197 (diff) | |
| download | sdl_core-bf882f9c2b10291769fb0ba2102056bfcd1bee09.tar.gz | |
Not related to RC changes
Remove segfault in transport manager tests
Diffstat (limited to 'src/components/hmi_message_handler')
| -rw-r--r-- | src/components/hmi_message_handler/test/hmi_message_adapter_test.cc | 4 | ||||
| -rw-r--r-- | src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc | 6 |
2 files changed, 5 insertions, 5 deletions
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 b0f63c6a0c..eead7106c6 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 @@ -42,7 +42,7 @@ namespace test { namespace components { namespace hmi_message_handler_test { -using ::testing::ReturnRef; +using ::testing::Return; using hmi_message_handler::HMIMessageHandlerImpl; typedef utils::SharedPtr<MockHMIMessageAdapterImpl> @@ -53,7 +53,7 @@ TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) { mock_hmi_message_handler_settings; const uint64_t stack_size = 1000u; ON_CALL(mock_hmi_message_handler_settings, thread_min_stack_size()) - .WillByDefault(ReturnRef(stack_size)); + .WillByDefault(Return(stack_size)); HMIMessageHandler* message_handler = new hmi_message_handler::HMIMessageHandlerImpl( mock_hmi_message_handler_settings); 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 09f20ed75d..33be4a9228 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Ford Motor Company + * Copyright (c) 2017, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ namespace test { namespace components { namespace hmi_message_handler_test { -using ::testing::ReturnRef; +using ::testing::Return; using ::testing::_; class HMIMessageHandlerImplTest : public ::testing::Test { @@ -63,7 +63,7 @@ class HMIMessageHandlerImplTest : public ::testing::Test { virtual void SetUp() OVERRIDE { ON_CALL(mock_hmi_message_handler_settings, thread_min_stack_size()) - .WillByDefault(ReturnRef(stack_size)); + .WillByDefault(Return(stack_size)); hmi_handler_ = new hmi_message_handler::HMIMessageHandlerImpl( mock_hmi_message_handler_settings); ASSERT_TRUE(NULL != hmi_handler_); |