diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2014-07-23 13:48:15 -0400 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2014-07-23 13:48:15 -0400 |
| commit | 40d3c2b452d48fe2f8fc9b0630af2a1c83aaaa69 (patch) | |
| tree | d996000f061f5912a645c39b7e01c418f684fc67 | |
| parent | 011d467db8b5fb54593175942b5746ba02a76bb3 (diff) | |
| download | smartdevicelink-40d3c2b452d48fe2f8fc9b0630af2a1c83aaaa69.tar.gz | |
Component Tests
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
4 files changed, 7 insertions, 2 deletions
diff --git a/test/components/media_manager/CMakeLists.txt b/test/components/media_manager/CMakeLists.txt index 4ada438e7..40ce0d840 100644 --- a/test/components/media_manager/CMakeLists.txt +++ b/test/components/media_manager/CMakeLists.txt @@ -47,6 +47,7 @@ endif() create_test("test_MediaManager" "${SOURCES}" "${LIBRARIES}") if(ENABLE_LOG) - target_link_libraries("test_MediaManager" log4cxx) + add_dependencies("test_MediaManager" liblog4cxx) + target_link_libraries("test_MediaManager" log4cxx -L${LOG4CXX_LIBS_DIRECTORY}) endif() # vim: set ts=2 sw=2 et: diff --git a/test/components/mobile_message_handler/CMakeLists.txt b/test/components/mobile_message_handler/CMakeLists.txt index c4b4105c4..20fe292a5 100644 --- a/test/components/mobile_message_handler/CMakeLists.txt +++ b/test/components/mobile_message_handler/CMakeLists.txt @@ -27,7 +27,8 @@ create_test("test_mobile_message_handler" "${LIBRARIES}") if(ENABLE_LOG) - target_link_libraries("test_mobile_message_handler" log4cxx) + add_dependencies("test_mobile_message_handler" liblog4cxx) + target_link_libraries("test_mobile_message_handler" log4cxx -L${LOG4CXX_LIBS_DIRECTORY}) endif() file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h b/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h index d3ab537d7..05d726724 100644 --- a/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h +++ b/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h @@ -55,6 +55,8 @@ class MockTransportAdapterListener : public TransportAdapterListener { void(const TransportAdapter* transport_adapter)); MOCK_METHOD2(OnSearchDeviceFailed, void(const TransportAdapter* transport_adapter, const SearchDeviceError& error)); + MOCK_METHOD2(OnApplicationListUpdated, + void(const TransportAdapter* adapter, const DeviceUID& device_handle)); MOCK_METHOD1(OnDeviceListUpdated, void(const TransportAdapter* transport_adapter)); MOCK_METHOD3(OnConnectDone, diff --git a/test/components/transport_manager/include/transport_manager/mock_transport_manager_listener.h b/test/components/transport_manager/include/transport_manager/mock_transport_manager_listener.h index 086231442..64c609292 100644 --- a/test/components/transport_manager/include/transport_manager/mock_transport_manager_listener.h +++ b/test/components/transport_manager/include/transport_manager/mock_transport_manager_listener.h @@ -65,6 +65,7 @@ class MockTransportManagerListener : public ::transport_manager::TransportManagerListener { public: MOCK_METHOD1(OnDeviceListUpdated, void(const std::vector<DeviceInfo>&)); + MOCK_METHOD1(OnApplicationListUpdated, void(DeviceHandle device_handle)); MOCK_METHOD1(OnDeviceFound, void(const DeviceInfo &device_info)); MOCK_METHOD1(OnDeviceAdded, void(const DeviceInfo &device_info)); MOCK_METHOD1(OnDeviceRemoved, void(const DeviceInfo &device_info)); |