diff options
| author | Herasym Oleh <oolleehh@gmail.com> | 2016-06-02 17:40:22 +0300 |
|---|---|---|
| committer | Herasym Oleh <oolleehh@gmail.com> | 2016-06-03 13:47:14 +0300 |
| commit | 968398a720c3d92e17a11c5c2943ba7db656b6b0 (patch) | |
| tree | 37f99ae33662d6e2cf6db3928a7783d2bde7cbd7 | |
| parent | 9eae07f1d7a97f44ccdd455d84610ebae66841f0 (diff) | |
| download | sdl_core-968398a720c3d92e17a11c5c2943ba7db656b6b0.tar.gz | |
Enable hmi_message_handler tests after thread qt fix
Related: APPLINK-23755
Related-issues: APPLINK-22713, APPLINK-22716
| -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 | 11 |
2 files changed, 6 insertions, 9 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 02cfb07aa9..b0f63c6a0c 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 @@ -48,9 +48,7 @@ using hmi_message_handler::HMIMessageHandlerImpl; typedef utils::SharedPtr<MockHMIMessageAdapterImpl> MockHMIMessageAdapterImplSPtr; -// TODO(OHerasym) : thread_qt.cc, line 195 assert fails -TEST(HMIMessageAdapterImplTest, - DISABLED_Handler_CorrectPointer_CorrectReturnedPointer) { +TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) { testing::NiceMock<MockHMIMessageHandlerSettings> mock_hmi_message_handler_settings; const uint64_t stack_size = 1000u; 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 962e3db2c4..b199ca2d07 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 @@ -76,9 +76,8 @@ class HMIMessageHandlerImplTest : public ::testing::Test { } }; -// TODO(OHerasym) : thread_qt.cc, line 195 assert fails TEST_F(HMIMessageHandlerImplTest, - DISABLED_OnErrorSending_EmptyMessage_OnErrorSendingProceeded) { + OnErrorSending_EmptyMessage_OnErrorSendingProceeded) { // Arrange hmi_message_handler::MessageSharedPointer empty_message; EXPECT_CALL(mock_hmi_message_observer_, OnErrorSending(empty_message)); @@ -87,7 +86,7 @@ TEST_F(HMIMessageHandlerImplTest, } TEST_F(HMIMessageHandlerImplTest, - DISABLED_OnErrorSending_NotEmptyMessage_ExpectOnErrorSendingProceeded) { + OnErrorSending_NotEmptyMessage_ExpectOnErrorSendingProceeded) { // Arrange utils::SharedPtr<application_manager::Message> message( utils::MakeShared<application_manager::Message>( @@ -100,7 +99,7 @@ TEST_F(HMIMessageHandlerImplTest, } TEST_F(HMIMessageHandlerImplTest, - DISABLED_AddHMIMessageAdapter_AddExistedAdapter_ExpectAdded) { + AddHMIMessageAdapter_AddExistedAdapter_ExpectAdded) { // Check before action EXPECT_TRUE(hmi_handler_->message_adapters().empty()); // Act @@ -110,7 +109,7 @@ TEST_F(HMIMessageHandlerImplTest, } TEST_F(HMIMessageHandlerImplTest, - DISABLED_AddHMIMessageAdapter_AddUnexistedAdapter_ExpectNotAdded) { + AddHMIMessageAdapter_AddUnexistedAdapter_ExpectNotAdded) { // Check before action EXPECT_TRUE(hmi_handler_->message_adapters().empty()); // Act @@ -121,7 +120,7 @@ TEST_F(HMIMessageHandlerImplTest, } TEST_F(HMIMessageHandlerImplTest, - DISABLED_RemoveHMIMessageAdapter_ExpectRemoved) { + RemoveHMIMessageAdapter_ExpectRemoved) { // Arrange hmi_handler_->AddHMIMessageAdapter(mb_adapter_); // Act |