diff options
Diffstat (limited to 'src/components/transport_manager/test')
7 files changed, 124 insertions, 93 deletions
diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt index 5b3bc1c3f3..61c2b6e923 100644 --- a/src/components/transport_manager/test/CMakeLists.txt +++ b/src/components/transport_manager/test/CMakeLists.txt @@ -28,15 +28,18 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -if(BUILD_TESTS) +find_package(LibUSBx REQUIRED) + set(TM_TEST_DIR ${COMPONENTS_DIR}/transport_manager/test) include_directories( - ${TM_TEST_DIR}/include + ${COMPONENTS_DIR} + include ${LOG4CXX_INCLUDE_DIRECTORY} ${GMOCK_INCLUDE_DIRECTORY} ${COMPONENTS_DIR}/smart_objects/include ${COMPONENTS_DIR}/transport_manager/include + ${COMPONENTS_DIR}/transport_manager/test/include/ ${COMPONENTS_DIR}/utils/include ${COMPONENTS_DIR}/connection_handler/include ${JSONCPP_INCLUDE_DIRECTORY} @@ -45,7 +48,7 @@ include_directories( set(LIBRARIES gmock ConfigProfile - transport_manager + TransportManager Utils ConfigProfile ProtocolLibrary @@ -54,11 +57,13 @@ set(LIBRARIES ) if (BUILD_USB_SUPPORT) - list(APPEND LIBRARIES Libusb-1.0.16) + list(APPEND LIBRARIES ${LIBUSBX_LIBRARIES}) endif() if (BUILD_BT_SUPPORT) + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBRARIES bluetooth) + endif() endif() set(SOURCES @@ -72,5 +77,10 @@ set(SOURCES ) create_test("transport_manager_test" "${SOURCES}" "${LIBRARIES}") -file(COPY ${TM_TEST_DIR}/smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + target_link_libraries("transport_manager_test" ws2_32) + target_link_libraries(transport_manager_test Bthprops.lib) endif() diff --git a/src/components/transport_manager/test/include/transport_manager/mock_device.h b/src/components/transport_manager/test/include/transport_manager/mock_device.h index 26d35a0ae7..8d5e127bed 100644 --- a/src/components/transport_manager/test/include/transport_manager/mock_device.h +++ b/src/components/transport_manager/test/include/transport_manager/mock_device.h @@ -44,7 +44,8 @@ namespace transport_manager_test { class MockDevice : public ::transport_manager::transport_adapter::Device { public: - MockDevice(const std::string& name, const std::string& unique_device_id) + MockDevice(const std::string& name, + const transport_manager::DeviceUID& unique_device_id) : Device(name, unique_device_id) {} MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device)); MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>()); @@ -53,7 +54,7 @@ class MockDevice : public ::transport_manager::transport_adapter::Device { class MockTCPDevice : public ::transport_manager::transport_adapter::TcpDevice { public: - MockTCPDevice(const uint32_t& in_addr_t, const std::string& name) + MockTCPDevice(const utils::HostAddress& in_addr_t, const std::string& name) : TcpDevice(in_addr_t, name) {} MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device)); MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>()); diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc index b179f63ece..f336fb5a74 100644 --- a/src/components/transport_manager/test/tcp_client_listener_test.cc +++ b/src/components/transport_manager/test/tcp_client_listener_test.cc @@ -115,7 +115,6 @@ class TcpClientListenerTest : public ::testing::Test { TEST_F(TcpClientListenerTest, Ctor_test) { EXPECT_EQ(0, tcp_client_listener_.port()); EXPECT_TRUE(NULL != tcp_client_listener_.thread()); - EXPECT_EQ(-1, tcp_client_listener_.get_socket()); } TEST_F(TcpClientListenerTest, IsInitialised) { diff --git a/src/components/transport_manager/test/tcp_device_test.cc b/src/components/transport_manager/test/tcp_device_test.cc index 55fa5ac5d3..f78f739a96 100644 --- a/src/components/transport_manager/test/tcp_device_test.cc +++ b/src/components/transport_manager/test/tcp_device_test.cc @@ -56,47 +56,41 @@ class TestDevice : public Device { }; TEST(TcpDeviceTest, CompareWithOtherTCPDevice) { - uint32_t in_addr = 10; + utils::HostAddress host_address; std::string name = "tcp_device"; - TcpDevice test_tcp_device(in_addr, name); - TcpDevice other(in_addr, "other"); + TcpDevice test_tcp_device(host_address, name); + TcpDevice other(host_address, "other"); EXPECT_TRUE(test_tcp_device.IsSameAs(&other)); } TEST(TcpDeviceTest, CompareWithOtherNotTCPDevice) { + utils::HostAddress host_address; uint32_t in_addr = 10; std::string name = "tcp_device"; - TcpDevice test_tcp_device(in_addr, name); + TcpDevice test_tcp_device(host_address, name); TestDevice other(in_addr, "other"); EXPECT_FALSE(test_tcp_device.IsSameAs(&other)); } TEST(TcpDeviceTest, AddApplications) { - uint32_t in_addr = 1; + utils::HostAddress host_address; std::string name = "tcp_device"; - TcpDevice test_tcp_device(in_addr, name); + TcpDevice test_tcp_device(host_address, name); // App will be with socket = 0, incoming = false; int port = 12345; - EXPECT_EQ(1, test_tcp_device.AddDiscoveredApplication(port)); - - // App.incoming = true; app.port = 0; - int socket = 10; - EXPECT_EQ(2, test_tcp_device.AddIncomingApplication(socket)); + test_tcp_device.AddApplication(12345, false); + test_tcp_device.AddApplication(23456, true); ApplicationList applist = test_tcp_device.GetApplicationList(); ASSERT_EQ(2u, applist.size()); EXPECT_EQ(1, applist[0]); EXPECT_EQ(2, applist[1]); - // Because incoming = false - EXPECT_EQ(-1, test_tcp_device.GetApplicationSocket(applist[0])); - EXPECT_EQ(10, test_tcp_device.GetApplicationSocket(applist[1])); - EXPECT_EQ(port, test_tcp_device.GetApplicationPort(applist[0])); // Because incoming = true EXPECT_EQ(-1, test_tcp_device.GetApplicationPort(applist[1])); diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc index 4b315e9d61..183d6c7ad7 100644 --- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc +++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc @@ -43,12 +43,17 @@ #include "utils/make_shared.h" +#if defined(_MSC_VER) +#define snprintf _snprintf_s +#endif + namespace test { namespace components { namespace transport_manager_test { using ::testing::Return; using ::testing::_; +using utils::MakeShared; using namespace ::protocol_handler; using namespace ::transport_manager; @@ -56,11 +61,14 @@ using namespace transport_manager::transport_adapter; class TcpAdapterTest : public ::testing::Test { protected: - TcpAdapterTest() : last_state_("app_storage_folder", "app_info_storage") {} + TcpAdapterTest() + : last_state_("app_storage_folder", "app_info_storage") + , string_port("12345") {} MockTransportManagerSettings transport_manager_settings; resumption::LastState last_state_; - const uint32_t port = 12345; - const std::string string_port = "12345"; + static const uint32_t port = 12345; + const std::string string_port; + const utils::HostAddress host_address; }; TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) { @@ -68,7 +76,8 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) { MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); std::string uniq_id = "unique_device_name"; - utils::SharedPtr<MockTCPDevice> mockdev = new MockTCPDevice(port, uniq_id); + utils::SharedPtr<MockTCPDevice> mockdev = + MakeShared<MockTCPDevice>(host_address, uniq_id); transport_adapter.AddDevice(mockdev); std::vector<std::string> devList = transport_adapter.GetDeviceList(); @@ -76,7 +85,7 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) { EXPECT_EQ(uniq_id, devList[0]); const int app_handle = 1; - std::vector<int> intList = {app_handle}; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); ConnectionSPtr mock_connection = new MockConnection(); @@ -89,17 +98,19 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) { transport_adapter.CallStore(); // Check that value is saved - Json::Value& tcp_dict = - last_state_.dictionary["TransportManager"]["TcpAdapter"]; - - ASSERT_TRUE(tcp_dict.isObject()); - ASSERT_FALSE(tcp_dict["devices"].isNull()); - ASSERT_FALSE(tcp_dict["devices"][0]["applications"].isNull()); - ASSERT_FALSE(tcp_dict["devices"][0]["address"].isNull()); - EXPECT_EQ(1u, tcp_dict["devices"][0]["applications"].size()); - EXPECT_EQ(string_port, - tcp_dict["devices"][0]["applications"][0]["port"].asString()); - EXPECT_EQ(uniq_id, tcp_dict["devices"][0]["name"].asString()); + utils::json::JsonValue dict = last_state_.dictionary(); + utils::json::JsonValue tcp_dict = dict["TransportManager"]["TcpAdapter"]; + + const unsigned int index = 0; + ASSERT_TRUE(tcp_dict.IsObject()); + ASSERT_FALSE(tcp_dict["devices"].IsNull()); + ASSERT_FALSE(tcp_dict["devices"][index]["applications"].IsNull()); + ASSERT_FALSE(tcp_dict["devices"][index]["address"].IsNull()); + EXPECT_EQ(1u, tcp_dict["devices"][index]["applications"].Size()); + EXPECT_EQ( + string_port, + tcp_dict["devices"][index]["applications"][index]["port"].AsString()); + EXPECT_EQ(uniq_id, tcp_dict["devices"][index]["name"].AsString()); } TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) { @@ -111,9 +122,9 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) { std::string uniq_id[count_dev]; for (uint32_t i = 0; i < count_dev; i++) { char numb[12]; - std::snprintf(numb, 12, "%d", i); + snprintf(numb, 12, "%d", i); uniq_id[i] = "unique_device_name" + std::string(numb); - mockdev[i] = new MockTCPDevice(port, uniq_id[i]); + mockdev[i] = MakeShared<MockTCPDevice>(host_address, uniq_id[i]); EXPECT_CALL(*(mockdev[i]), IsSameAs(_)).WillRepeatedly(Return(false)); transport_adapter.AddDevice(mockdev[i]); } @@ -123,7 +134,7 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) { EXPECT_EQ(uniq_id[0], devList[0]); const int app_handle = 1; - std::vector<int> intList = {app_handle}; + std::vector<int> intList(1, app_handle); ConnectionSPtr mock_connection = new MockConnection(); for (uint32_t i = 0; i < count_dev; i++) { @@ -140,18 +151,19 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) { } transport_adapter.CallStore(); + const unsigned int index = 0; // Check that values are saved - Json::Value& tcp_dict = - last_state_.dictionary["TransportManager"]["TcpAdapter"]; - ASSERT_TRUE(tcp_dict.isObject()); - ASSERT_FALSE(tcp_dict["devices"].isNull()); + utils::json::JsonValue dict = last_state_.dictionary(); + utils::json::JsonValue tcp_dict = dict["TransportManager"]["TcpAdapter"]; + ASSERT_TRUE(tcp_dict.IsObject()); + ASSERT_FALSE(tcp_dict["devices"].IsNull()); for (uint32_t i = 0; i < count_dev; i++) { - ASSERT_FALSE(tcp_dict["devices"][i]["applications"].isNull()); - ASSERT_FALSE(tcp_dict["devices"][i]["address"].isNull()); - EXPECT_EQ(1u, tcp_dict["devices"][i]["applications"].size()); + ASSERT_FALSE(tcp_dict["devices"][i]["applications"].IsNull()); + ASSERT_FALSE(tcp_dict["devices"][i]["address"].IsNull()); + EXPECT_EQ(1u, tcp_dict["devices"][i]["applications"].Size()); EXPECT_EQ(string_port, - tcp_dict["devices"][i]["applications"][0]["port"].asString()); - EXPECT_EQ(uniq_id[i], tcp_dict["devices"][i]["name"].asString()); + tcp_dict["devices"][i]["applications"][index]["port"].AsString()); + EXPECT_EQ(uniq_id[i], tcp_dict["devices"][i]["name"].AsString()); } } @@ -165,9 +177,9 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) { std::string uniq_id[count_dev]; for (uint32_t i = 0; i < count_dev; i++) { char numb[12]; - std::snprintf(numb, 12, "%d", i); + snprintf(numb, 12, "%d", i); uniq_id[i] = "unique_device_name" + std::string(numb); - mockdev[i] = new MockTCPDevice(port, uniq_id[i]); + mockdev[i] = MakeShared<MockTCPDevice>(host_address, uniq_id[i]); EXPECT_CALL(*(mockdev[i]), IsSameAs(_)).WillRepeatedly(Return(false)); transport_adapter.AddDevice(mockdev[i]); } @@ -178,7 +190,10 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) { const uint32_t connection_count = 3; const int app_handle[connection_count] = {1, 2, 3}; - std::vector<int> intList = {app_handle[0], app_handle[1], app_handle[2]}; + std::vector<int> intList; + intList.push_back(app_handle[0]); + intList.push_back(app_handle[1]); + intList.push_back(app_handle[2]); const std::string ports[connection_count] = {"11111", "67890", "98765"}; const int int_port[connection_count] = {11111, 67890, 98765}; ConnectionSPtr mock_connection = new MockConnection(); @@ -198,18 +213,18 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) { transport_adapter.CallStore(); // Check that value is saved - Json::Value& tcp_dict = - last_state_.dictionary["TransportManager"]["TcpAdapter"]; + utils::json::JsonValue dict = last_state_.dictionary(); + utils::json::JsonValue tcp_dict = dict["TransportManager"]["TcpAdapter"]; - ASSERT_TRUE(tcp_dict.isObject()); - ASSERT_FALSE(tcp_dict["devices"].isNull()); + ASSERT_TRUE(tcp_dict.IsObject()); + ASSERT_FALSE(tcp_dict["devices"].IsNull()); for (uint32_t i = 0; i < count_dev; i++) { - ASSERT_FALSE(tcp_dict["devices"][i]["applications"].isNull()); - ASSERT_FALSE(tcp_dict["devices"][i]["address"].isNull()); + ASSERT_FALSE(tcp_dict["devices"][i]["applications"].IsNull()); + ASSERT_FALSE(tcp_dict["devices"][i]["address"].IsNull()); for (uint32_t j = 0; j < intList.size(); j++) { EXPECT_EQ(ports[j], - tcp_dict["devices"][i]["applications"][j]["port"].asString()); - EXPECT_EQ(uniq_id[i], tcp_dict["devices"][i]["name"].asString()); + tcp_dict["devices"][i]["applications"][j]["port"].AsString()); + EXPECT_EQ(uniq_id[i], tcp_dict["devices"][i]["name"].AsString()); } } } @@ -219,13 +234,14 @@ TEST_F(TcpAdapterTest, StoreData_ConnectionNotExist_DataNotStored) { MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); std::string uniq_id = "unique_device_name"; - utils::SharedPtr<MockTCPDevice> mockdev = new MockTCPDevice(port, uniq_id); + utils::SharedPtr<MockTCPDevice> mockdev = + MakeShared<MockTCPDevice>(host_address, uniq_id); transport_adapter.AddDevice(mockdev); std::vector<std::string> devList = transport_adapter.GetDeviceList(); ASSERT_EQ(1u, devList.size()); EXPECT_EQ(uniq_id, devList[0]); - std::vector<int> intList = {}; + std::vector<int> intList; EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); EXPECT_CALL(transport_adapter, FindDevice(uniq_id)).WillOnce(Return(mockdev)); @@ -235,15 +251,17 @@ TEST_F(TcpAdapterTest, StoreData_ConnectionNotExist_DataNotStored) { transport_adapter.CallStore(); // Check that value is not saved - Json::Value& tcp_dict = - last_state_.dictionary["TransportManager"]["TcpAdapter"]["devices"]; - ASSERT_TRUE(tcp_dict.isNull()); + utils::json::JsonValue dict = last_state_.dictionary(); + utils::json::JsonValue tcp_dict = + dict["TransportManager"]["TcpAdapter"]["devices"]; + ASSERT_TRUE(tcp_dict.IsNull()); } TEST_F(TcpAdapterTest, RestoreData_DataNotStored) { - Json::Value& tcp_adapter_dictionary = - last_state_.dictionary["TransportManager"]["TcpAdapter"]; - tcp_adapter_dictionary = Json::Value(); + utils::json::JsonValue dict = last_state_.dictionary(); + utils::json::JsonValue tcp_adapter_dictionary = + dict["TransportManager"]["TcpAdapter"]; + tcp_adapter_dictionary = utils::json::JsonValue(); MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); EXPECT_CALL(transport_adapter, Connect(_, _)).Times(0); @@ -254,7 +272,8 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) { MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); std::string uniq_id = "unique_device_name"; - utils::SharedPtr<MockTCPDevice> mockdev = new MockTCPDevice(port, uniq_id); + utils::SharedPtr<MockTCPDevice> mockdev = + MakeShared<MockTCPDevice>(host_address, uniq_id); transport_adapter.AddDevice(mockdev); std::vector<std::string> devList = transport_adapter.GetDeviceList(); @@ -262,7 +281,7 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) { EXPECT_EQ(uniq_id, devList[0]); const int app_handle = 1; - std::vector<int> intList = {app_handle}; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); ConnectionSPtr mock_connection = new MockConnection(); @@ -293,9 +312,9 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevices_RestoreData) { std::string uniq_id[count_dev]; for (uint32_t i = 0; i < count_dev; i++) { char numb[12]; - std::snprintf(numb, 12, "%d", i); + snprintf(numb, 12, "%d", i); uniq_id[i] = "unique_device_name" + std::string(numb); - mockdev[i] = new MockTCPDevice(port, uniq_id[i]); + mockdev[i] = MakeShared<MockTCPDevice>(host_address, uniq_id[i]); EXPECT_CALL(*(mockdev[i]), IsSameAs(_)).WillRepeatedly(Return(false)); transport_adapter.AddDevice(mockdev[i]); } @@ -305,7 +324,7 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevices_RestoreData) { EXPECT_EQ(uniq_id[0], devList[0]); const int app_handle = 1; - std::vector<int> intList = {app_handle}; + std::vector<int> intList(1, app_handle); ConnectionSPtr mock_connection = new MockConnection(); for (uint32_t i = 0; i < count_dev; i++) { diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc index aeab36c4a6..eabc9a516a 100644 --- a/src/components/transport_manager/test/transport_adapter_test.cc +++ b/src/components/transport_manager/test/transport_adapter_test.cc @@ -282,8 +282,8 @@ TEST_F(TransportAdapterTest, ConnectDevice_ServerNotAdded_DeviceAdded) { ASSERT_EQ(1u, devList.size()); EXPECT_EQ(uniq_id, devList[0]); - int app_handle = 1; - std::vector<int> intList = {app_handle}; + const int app_handle = 1; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); TransportAdapter::Error res = transport_adapter.ConnectDevice(uniq_id); @@ -324,8 +324,8 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceAdded) { ASSERT_EQ(1u, devList.size()); EXPECT_EQ(uniq_id, devList[0]); - int app_handle = 1; - std::vector<int> intList = {app_handle}; + const int app_handle = 1; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); EXPECT_CALL(*serverMock, IsInitialised()).WillOnce(Return(true)); @@ -353,8 +353,8 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceAddedTwice) { ASSERT_EQ(1u, devList.size()); EXPECT_EQ(uniq_id, devList[0]); - int app_handle = 1; - std::vector<int> intList = {app_handle}; + const int app_handle = 1; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); EXPECT_CALL(*serverMock, IsInitialised()).WillOnce(Return(true)); @@ -421,7 +421,7 @@ TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) { ASSERT_EQ(1u, devList.size()); EXPECT_EQ(uniq_id, devList[0]); - std::vector<int> intList = {app_handle}; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); EXPECT_CALL(*serverMock, IsInitialised()).WillOnce(Return(true)); @@ -462,7 +462,7 @@ TEST_F(TransportAdapterTest, DeviceDisconnected) { ASSERT_EQ(1u, devList.size()); EXPECT_EQ(uniq_id, devList[0]); - std::vector<int> intList = {app_handle}; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); EXPECT_CALL(*serverMock, IsInitialised()).WillOnce(Return(true)); @@ -703,8 +703,8 @@ TEST_F(TransportAdapterTest, GetDeviceAndApplicationLists) { ASSERT_EQ(1u, devList.size()); EXPECT_EQ(uniq_id, devList[0]); - int app_handle = 1; - std::vector<int> intList = {app_handle}; + const int app_handle = 1; + std::vector<int> intList(1, app_handle); EXPECT_CALL(*mockdev, GetApplicationList()).WillOnce(Return(intList)); std::vector<int> res = transport_adapter.GetApplicationList(uniq_id); ASSERT_EQ(1u, res.size()); 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 0ad03c90e0..270688bf79 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -45,7 +45,6 @@ #include "transport_manager/mock_transport_manager_settings.h" #include "utils/make_shared.h" #include "utils/shared_ptr.h" - #include "resumption/last_state.h" #include "utils/make_shared.h" @@ -87,6 +86,8 @@ class TransportManagerImplTest : public ::testing::Test { EXPECT_CALL(*mock_adapter_, AddListener(_)); EXPECT_CALL(*mock_adapter_, IsInitialised()).WillOnce(Return(true)); EXPECT_EQ(E_SUCCESS, tm_.AddTransportAdapter(mock_adapter_)); + EXPECT_CALL(*mock_adapter_, GetDeviceType()) + .WillRepeatedly(Return(transport_adapter::DeviceType::BLUETOOTH)); connection_key_ = 1; error_ = MakeShared<BaseError>(); @@ -311,6 +312,7 @@ class TransportManagerImplTest : public ::testing::Test { EXPECT_CALL(*mock_adapter_, Terminate()); ASSERT_EQ(E_SUCCESS, tm_.Stop()); } + MockTransportManagerSettings settings; MockTransportManagerImpl tm_; #ifdef TELEMETRY_MONITOR @@ -320,7 +322,7 @@ class TransportManagerImplTest : public ::testing::Test { utils::SharedPtr<MockTransportManagerListener> tm_listener_; - const ApplicationHandle application_id_ = 1; + static const ApplicationHandle application_id_; ConnectionUID connection_key_; RawMessagePtr test_message_; @@ -332,6 +334,9 @@ class TransportManagerImplTest : public ::testing::Test { BaseErrorPtr error_; }; +const ApplicationHandle TransportManagerImplTest::application_id_ = 1; + +// TODO(OHerasym) : last_state qt assert fails TEST_F(TransportManagerImplTest, SearchDevices_AdaptersNotAdded) { EXPECT_CALL(*mock_adapter_, SearchDevices()) .WillOnce( @@ -339,10 +344,12 @@ TEST_F(TransportManagerImplTest, SearchDevices_AdaptersNotAdded) { EXPECT_EQ(E_SUCCESS, tm_.SearchDevices()); } +// TODO(OHerasym) : last_state qt assert fails TEST_F(TransportManagerImplTest, AddTransportAdapterSecondTime) { EXPECT_EQ(E_ADAPTER_EXISTS, tm_.AddTransportAdapter(mock_adapter_)); } +// TODO(OHerasym) : last_state qt assert fails TEST_F(TransportManagerImplTest, ConnectDevice) { HandleDeviceListUpdated(); EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_)) @@ -495,23 +502,20 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice) { EXPECT_CALL(*mock_adapter_, SendData(mac_address_, application_id_, test_message_)) .WillOnce(Return(TransportAdapter::OK)); - #ifdef TELEMETRY_MONITOR EXPECT_CALL(mock_metric_observer_, StartRawMsg(test_message_.get())); #endif // TELEMETRY_MONITOR - EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_)); testing::Mock::AsyncVerifyAndClearExpectations(kAsyncExpectationsTimeout); } +#ifdef TIME_TESTER TEST_F(TransportManagerImplTest, SendMessageToDevice_SendingFailed) { // Arrange HandleConnection(); - MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver(); tm_.SetTelemetryObserver(mock_metric_observer); EXPECT_CALL(*mock_metric_observer, StartRawMsg(_)); - EXPECT_CALL(*mock_adapter_, SendData(mac_address_, application_id_, test_message_)) .WillOnce(Return(TransportAdapter::FAIL)); @@ -550,7 +554,6 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_SendDone) { .WillOnce(Return(TransportAdapter::OK)); EXPECT_CALL(mock_metric_observer_, StartRawMsg(test_message_.get())); EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_)); - HandleSendDone(); testing::Mock::AsyncVerifyAndClearExpectations(kAsyncExpectationsTimeout); @@ -559,10 +562,10 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_SendDone) { TEST_F(TransportManagerImplTest, SendMessageFailed_GetHandleSendFailed) { // Arrange HandleConnection(); - EXPECT_CALL(*mock_adapter_, SendData(mac_address_, application_id_, test_message_)) .WillOnce(Return(TransportAdapter::FAIL)); + EXPECT_CALL(mock_metric_observer_, StartRawMsg(test_message_.get())); EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, test_message_)); EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_)); @@ -570,6 +573,7 @@ TEST_F(TransportManagerImplTest, SendMessageFailed_GetHandleSendFailed) { HandleSendFailed(); testing::Mock::AsyncVerifyAndClearExpectations(kAsyncExpectationsTimeout); } +#endif // TIME_TESTER TEST_F(TransportManagerImplTest, RemoveDevice_DeviceWasAdded) { // Arrange @@ -655,6 +659,7 @@ TEST_F(TransportManagerImplTest, UpdateDeviceList_RemoveDevice) { /* * Tests which check correct handling and receiving events */ +// TODO(OHerasym) : gmock assert fails on Windows platform TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceDone) { const int type = static_cast<int>( TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_DONE); @@ -672,6 +677,7 @@ TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceDone) { testing::Mock::AsyncVerifyAndClearExpectations(kAsyncExpectationsTimeout); } +// TODO(OHerasym) : gmock assert fails on Windows platform TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceFail) { const int type = static_cast<int>( TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_FAIL); @@ -689,6 +695,7 @@ TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceFail) { testing::Mock::AsyncVerifyAndClearExpectations(kAsyncExpectationsTimeout); } +// TODO(OHerasym) : gmock assert fails on Windows platform TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_DeviceListUpdated) { const int type = static_cast<int>( TransportAdapterListenerImpl::EventTypeEnum::ON_DEVICE_LIST_UPDATED); @@ -874,6 +881,7 @@ TEST_F(TransportManagerImplTest, Visibility_TMIsNotInitialized) { EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.Visibility(visible)); } +// TODO(OHerasym) : gmock assert fails on Windows platform TEST_F(TransportManagerImplTest, HandleMessage_ConnectionNotExist) { EXPECT_CALL(*mock_adapter_, SendData(mac_address_, application_id_, test_message_)).Times(0); |