diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2019-04-30 14:48:02 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2019-04-30 14:48:02 -0400 |
| commit | 92a773c828bdde9aeaede217cc442a37d7f516ac (patch) | |
| tree | 854b97f8efa225fb5576e9eca53f6393f7e68d24 /src/components/transport_manager/test/transport_manager_impl_test.cc | |
| parent | 945d9a4e06bf74f257898671c9b63598d8b0a3bf (diff) | |
| parent | 194ccbc933b1fa9893700b3db97aa184d68636dc (diff) | |
| download | sdl_core-92a773c828bdde9aeaede217cc442a37d7f516ac.tar.gz | |
Merge remote-tracking branch 'origin/release/5.1.1' into feature/update_style_scriptfeature/update_style_script
# Conflicts:
# src/components/transport_manager/src/transport_manager_impl.cc
Diffstat (limited to 'src/components/transport_manager/test/transport_manager_impl_test.cc')
| -rw-r--r-- | src/components/transport_manager/test/transport_manager_impl_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc index 3073ff689b..3c3e336d0a 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -189,6 +189,7 @@ class TransportManagerImplTest : public ::testing::Test { tm_.TestHandle(test_event); } +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) void HandlePending() { TransportAdapterEvent test_event(EventTypeEnum::ON_CONNECT_PENDING, mock_adapter_, @@ -206,6 +207,7 @@ class TransportManagerImplTest : public ::testing::Test { tm_.TestHandle(test_event); } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT void HandleConnectionFailed() { TransportAdapterEvent test_event(EventTypeEnum::ON_CONNECT_FAIL, @@ -422,6 +424,7 @@ TEST_F(TransportManagerImplTest, DisconnectDevice_DeviceNotConnected) { EXPECT_EQ(E_INVALID_HANDLE, tm_.DisconnectDevice(device_handle_)); } +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) TEST_F(TransportManagerImplTest, Pending) { // Calling HandlePending twice verifies the connection_id stays the same if // the connection exists. @@ -447,6 +450,7 @@ TEST_F(TransportManagerImplTest, Pending) { tm_.TestHandle(test_event); } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT TEST_F(TransportManagerImplTest, Disconnect) { // Arrange |