Fix unit tests

- Fixes mockup code
- Runs the unit tests automatically

Change-Id: I154dc6513205e0446336a5cb1fb4e8dba913d691
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af6b846437e9c1295739663c8d12efdf356a5742..bdc8943a3cdc3314469edd016455bd3887fda31c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,4 +56,12 @@ INSTALL(TARGETS ${this_target} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/rpc-port FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION ${LIB_INSTALL_DIR} FILES_MATCHING PATTERN "*.so*")
 
+IF(NOT DEFINED MINIMUM_BUILD)
+ENABLE_TESTING()
+SET(RPC_PORT_UNITTESTS rpc-port_unittests)
+ADD_TEST(NAME ${RPC_PORT_UNITTESTS} COMMAND ${RPC_PORT_UNITTESTS}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unit_tests)
+
 ADD_SUBDIRECTORY(unit_tests)
+ADD_DEPENDENCIES(${RPC_PORT_UNITTESTS} rpc-port)
+ENDIF(NOT DEFINED MINIMUM_BUILD)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index 55877d2b576cd42a756a3c2c9734b19b4b90f545..b450277bd2960d121312f8035ec16f67840b79d2 100755 (executable)
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -18,6 +18,11 @@ BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-creds-gdbus)
 BuildRequires:  pkgconfig(uuid)
 
+%if 0%{?gcov:1}
+BuildRequires:  lcov
+BuildRequires:  zip
+%endif
+
 Requires(post): /sbin/ldconfig
 Requires(post): coreutils
 Requires(postun): /sbin/ldconfig
@@ -90,6 +95,15 @@ mkdir -p %{buildroot}%{_datadir}/gcov/obj
 install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %endif
 
+%check
+ctest --output-on-failure %{?_smp_mflags}
+%if 0%{?gcov:1}
+lcov -c --ignore-errors graph --no-external -q -d . -o rpc-port.info
+genhtml rpc-port.info -o rpc-port.out
+zip -r rpc-port.zip rpc-port.out rpc-port.info
+install -m 0644 rpc-port.zip %{buildroot}%{_datadir}/gcov/
+%endif
+
 
 %post -p /sbin/ldconfig
 
@@ -121,5 +135,5 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 #################################################
 %if 0%{?gcov:1}
 %files gcov
-%{_datadir}/gcov/obj/*
+%{_datadir}/gcov/*
 %endif

diff --git a/src/fdbroker-internal.cc b/src/fdbroker-internal.cc
index 1993d719220620c35430d64d98a57a3c31a18406..7509e9358b80c5554a7b39e5d6dc78fc3d734ddd 100644 (file)
--- a/src/fdbroker-internal.cc
+++ b/src/fdbroker-internal.cc
@@ -256,6 +256,7 @@ int FdBroker::Send(const std::string& target_appid,
 
     (*fds)[0] = main_sock_pair.Detach(SocketPair::SENDER);
     (*fds)[1] = delegate_sock_pair.Detach(SocketPair::SENDER);
+    watcher_->OnPortConnected(watch_appid_, watch_port_name_);
     return (*fds)[0];
   }
 

diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index a3b19c4c7317cace0b296ac88bfdee5e337cedfd..dac0b21a5886fe13b657ee10fe206cd5ab708425 100644 (file)
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -19,9 +19,12 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 SET(SOURCES "")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src)
 
 AUX_SOURCE_DIRECTORY(src SOURCES)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../src RPC_PORT_SOURCES)
 ADD_EXECUTABLE(${PROJECT_NAME}
+       ${RPC_PORT_SOURCES}
        ${SOURCES}
 )