From bb25983203645e18de9caf931a3c6974abcccaeb Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Thu, 30 Nov 2017 17:51:24 +0100
Subject: [PATCH] update worker unit tests
---
CMakeLists.txt | 1 +
worker/api/cpp/.gitignore | 10 --------
worker/api/cpp/CMakeLists.txt | 21 ++++++----------
worker/api/cpp/unittests/test-suite.cpp | 26 --------------------
worker/api/cpp/unittests/test_worker_api.cpp | 9 +++++++
5 files changed, 17 insertions(+), 50 deletions(-)
delete mode 100644 worker/api/cpp/.gitignore
delete mode 100644 worker/api/cpp/unittests/test-suite.cpp
create mode 100644 worker/api/cpp/unittests/test_worker_api.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 639dee25c..8a2988e75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ include(testing_cpp)
add_subdirectory(producer/api)
add_subdirectory(common/cpp)
add_subdirectory(producer/inotify-event-detector-cpp)
+add_subdirectory(worker/api/cpp)
if(BUILD_DOCS)
diff --git a/worker/api/cpp/.gitignore b/worker/api/cpp/.gitignore
deleted file mode 100644
index cd62d2c27..000000000
--- a/worker/api/cpp/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Testing
-.cproject
-.project
-CMakeFiles
-CMakeCache.txt
-cmake_install.cmake
-.settings
-CTestTestfile.cmake
-test-HIDRA2
-Makefile
diff --git a/worker/api/cpp/CMakeLists.txt b/worker/api/cpp/CMakeLists.txt
index 0721e7583..36d09c02e 100644
--- a/worker/api/cpp/CMakeLists.txt
+++ b/worker/api/cpp/CMakeLists.txt
@@ -1,20 +1,13 @@
-cmake_minimum_required(VERSION 3.5)
-set(CMAKE_CXX_STANDARD 11)
+set(TARGET_NAME worker-api)
-project(HIDRA2)
-project(${PROJECT_NAME} C CXX)
-enable_testing()
-set(TEST_SOURCE_FILES unittests/test-suite.cpp)
-include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
-add_executable(test-${PROJECT_NAME} ${TEST_SOURCE_FILES})
+################################
+# Testing
+################################
+set(TEST_SOURCE_FILES unittests/test_worker_api.cpp)
+set(TEST_LIBRARIES producer-api)
-target_link_libraries(test-${PROJECT_NAME} gtest gtest_main pthread)
-#target_link_libraries(test-${PROJECT_NAME} cpp-producer)
-
-add_test(NAME unittests COMMAND test-${PROJECT_NAME})
-
-#astyle(test-${PROJECT_NAME} ${TEST_SOURCE_FILES})
\ No newline at end of file
+gtest(${TARGET_NAME} ${TEST_SOURCE_FILES} ${TEST_LIBRARIES})
\ No newline at end of file
diff --git a/worker/api/cpp/unittests/test-suite.cpp b/worker/api/cpp/unittests/test-suite.cpp
deleted file mode 100644
index b9e99d8fe..000000000
--- a/worker/api/cpp/unittests/test-suite.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * File: TestSuite
- * Author: yakubov
- *
- * Created on Nov 22, 2017, 4:44:43 PM
- */
-
-#include <gtest/gtest.h>
-
-class TestWorkerAPI : public testing::Test {
-protected:
-
- void SetUp() {
- // Setup ...
- }
-
- void TearDown() {
- // Teardown ...
- }
-
-};
-
-TEST_F(TestWorkerAPI, testConnect) {
- FAIL();
-}
-
diff --git a/worker/api/cpp/unittests/test_worker_api.cpp b/worker/api/cpp/unittests/test_worker_api.cpp
new file mode 100644
index 000000000..0020ee141
--- /dev/null
+++ b/worker/api/cpp/unittests/test_worker_api.cpp
@@ -0,0 +1,9 @@
+#include <gtest/gtest.h>
+
+namespace {
+
+TEST(WorkerAPI, TestName) {
+ SUCCEED();
+}
+
+}
--
GitLab