Seperate Server and Lib test

Change-Id: I403677d5cea2eb8e7462d1ca6bd2e00cd0706435

diff --git a/unit-tests/CMakeLists.txt b/unit-tests/CMakeLists.txt
index 0d80311..18965f3 100644 (file)
--- a/unit-tests/CMakeLists.txt
+++ b/unit-tests/CMakeLists.txt
@@ -1,17 +1,27 @@
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/ TEST_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/lib/ TEST_LIB_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/server/ TEST_SERVER_SRCS)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 ENABLE_TESTING()
 
-SET(TARGET_TEST "app2sd-test")
+SET(TARGET_LIB_TEST "app2sd-lib-test")
+SET(TARGET_SERVER_TEST "app2sd-server-test")
 
-ADD_EXECUTABLE(${TARGET_TEST} ${TEST_SRCS})
+ADD_EXECUTABLE(${TARGET_LIB_TEST} ${TEST_LIB_SRCS})
+ADD_EXECUTABLE(${TARGET_SERVER_TEST} ${TEST_SERVER_SRCS})
 
-APPLY_PKG_CONFIG(${TARGET_TEST} PUBLIC
+APPLY_PKG_CONFIG(${TARGET_LIB_TEST} PUBLIC
   app2ext_libpkgs
   GMOCK_DEPS
 )
 
-ADD_TEST(${TARGET_TEST} ${TARGET_TEST})
-TARGET_LINK_LIBRARIES(${TARGET_TEST} app2ext "${${TARGET_TEST}_LDFLAGS}" dl gobject-2.0)
\ No newline at end of file
+APPLY_PKG_CONFIG(${TARGET_SERVER_TEST} PUBLIC
+  app2ext_libpkgs
+  GMOCK_DEPS
+)
+
+ADD_TEST(${TARGET_LIB_TEST} ${TARGET_LIB_TEST})
+ADD_TEST(${TARGET_SERVER_TEST} ${TARGET_SERVER_TEST})
+TARGET_LINK_LIBRARIES(${TARGET_LIB_TEST} app2ext "${${TARGET_LIB_TEST}_LDFLAGS}" dl gobject-2.0)
+TARGET_LINK_LIBRARIES(${TARGET_SERVER_TEST} app2ext "${${TARGET_SERVER_TEST}_LDFLAGS}" dl gobject-2.0)
\ No newline at end of file

diff --git a/unit-tests/test_lib.cc b/unit-tests/lib/test_lib.cc
similarity index 87%
rename from unit-tests/test_lib.cc
rename to unit-tests/lib/test_lib.cc
index d9f4104..85923ed 100644 (file)
--- a/unit-tests/test_lib.cc
+++ b/unit-tests/lib/test_lib.cc
@@ -17,6 +17,7 @@
  *
  */
 
+#include <dlfcn.h>
 #include <gio/gio.h>
 #include <gmock/gmock.h>
 #include "inc/app2ext_interface.h"
@@ -57,6 +58,8 @@ extern "C" GVariant* g_dbus_proxy_call_sync(GDBusProxy* proxy,
 }
 
 namespace {
+const ::testing::Environment* env = nullptr;
+
 class App2extInterfaceTest : public ::testing::Test {
  protected:
   void SetUp() override {}
@@ -148,4 +151,33 @@ TEST_F(App2extInterfaceTest, Get) {
   EXPECT_TRUE(ret != nullptr);
 }
 
-}
\ No newline at end of file
+}
+
+namespace app2sd {
+
+extern "C" void* dlopen(const char* path, int flag) {
+  return dlmopen(LM_ID_BASE, "libapp2sd.so", flag);
+}
+
+class App2sdEnvironment : public ::testing::Environment {
+ public:
+  void SetUp() override {
+    dl_handle_ = dlopen("/usr/bin/libapp2sd.so", RTLD_LAZY|RTLD_GLOBAL);
+    if (dl_handle_ == nullptr)
+      abort();
+  }
+
+  void TearDown() override {
+    dlclose(dl_handle_);
+  }
+
+  void* dl_handle_;
+};
+
+} // namespace app2sd
+
+int main(int argc, char* argv[]) {
+  ::testing::InitGoogleTest(&argc, argv);
+  ::env = testing::AddGlobalTestEnvironment(new app2sd::App2sdEnvironment);
+  return RUN_ALL_TESTS();
+}

diff --git a/unit-tests/test_main.cc b/unit-tests/server/test_server.cc
similarity index 74%
rename from unit-tests/test_main.cc
rename to unit-tests/server/test_server.cc
index 8be8620..429742d 100644 (file)
--- a/unit-tests/test_main.cc
+++ b/unit-tests/server/test_server.cc
@@ -16,32 +16,35 @@
  * limitations under the License.
  *
  */
-#include <dlfcn.h>
+
 #include <gmock/gmock.h>
 
 namespace {
 const ::testing::Environment* env = nullptr;
 }
 
-namespace app2sd {
+namespace {
+
+class App2sdServerTest : public ::testing::Test {
+ protected:
+  void SetUp() override {}
+
+  void TearDown() override {}
+};
 
-extern "C" void* dlopen(const char* path, int flag) {
-  return dlmopen(LM_ID_BASE, "libapp2sd.so", flag);
+TEST_F(App2sdServerTest, Init) {
+  EXPECT_TRUE(true);
 }
 
+}
+
+namespace app2sd {
+
 class App2sdEnvironment : public ::testing::Environment {
  public:
-  void SetUp() override {
-    dl_handle_ = dlopen("/usr/bin/libapp2sd.so", RTLD_LAZY|RTLD_GLOBAL);
-    if (dl_handle_ == nullptr)
-      abort();
-  }
-
-  void TearDown() override {
-    dlclose(dl_handle_);
-  }
+  void SetUp() override {}
 
-  void* dl_handle_;
+  void TearDown() override {}
 };
 
 } // namespace app2sd