Move unit_tests directoy to test directory

Change-Id: I74a0110b76d1231ed1be7ed468da289fc5b66b64
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9988b97..e57eb7d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@ PKG_CHECK_MODULES(SQLITE_DEPS REQUIRED sqlite3)
 PKG_CHECK_MODULES(GOBJECT_DEPS REQUIRED gobject-2.0)
 
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(test)
 
 CONFIGURE_FILE(org.tizen.theme_manager.service.in org.tizen.theme_manager.service @ONLY)
 CONFIGURE_FILE(theme-manager.service.in theme-manager.service @ONLY)

diff --git a/packaging/tizen-theme-manager.spec b/packaging/tizen-theme-manager.spec
index 11bd218..6983182 100644 (file)
--- a/packaging/tizen-theme-manager.spec
+++ b/packaging/tizen-theme-manager.spec
@@ -52,7 +52,7 @@ find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
 %endif
 
 %check
-export LD_LIBRARY_PATH=../theme:../theme_provider:../theme_plugin
+export LD_LIBRARY_PATH=../../src/theme:../../src/theme_provider:../../src/theme_plugin
 ctest -V
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -q -d . -o tizen-theme-manager.info

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb220a5..300ac11 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,4 +2,3 @@ ADD_SUBDIRECTORY(main)
 ADD_SUBDIRECTORY(theme)
 ADD_SUBDIRECTORY(theme_plugin)
 ADD_SUBDIRECTORY(theme_provider)
-ADD_SUBDIRECTORY(unit_tests)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c90fac8
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(unit_tests)

diff --git a/src/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt
similarity index 83%
rename from src/unit_tests/CMakeLists.txt
rename to test/unit_tests/CMakeLists.txt
index 7ff5ad0..185d2e2 100644 (file)
--- a/src/unit_tests/CMakeLists.txt
+++ b/test/unit_tests/CMakeLists.txt
@@ -1,10 +1,13 @@
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} UNIT_TESTS_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/ UNIT_TESTS_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock/ UNIT_TESTS_SRCS)
 ADD_EXECUTABLE(${TARGET_TIZEN_THEME_UNIT_TEST}
   ${UNIT_TESTS_SRCS}
 )
 
-TARGET_INCLUDE_DIRECTORIES(${TARGET_TIZEN_THEME_UNIT_TEST} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../")
+TARGET_INCLUDE_DIRECTORIES(${TARGET_TIZEN_THEME_UNIT_TEST} PUBLIC
+  "${CMAKE_CURRENT_SOURCE_DIR}/../"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../../src"
+)
 
 APPLY_PKG_CONFIG(${TARGET_TIZEN_THEME_UNIT_TEST} PUBLIC
   GLIB_DEPS

diff --git a/src/unit_tests/main.cc b/test/unit_tests/main.cc
similarity index 100%
rename from src/unit_tests/main.cc
rename to test/unit_tests/main.cc

diff --git a/src/unit_tests/mock/fff.h b/test/unit_tests/mock/fff.h
similarity index 100%
rename from src/unit_tests/mock/fff.h
rename to test/unit_tests/mock/fff.h

diff --git a/src/unit_tests/mock/gio_mock.h b/test/unit_tests/mock/gio_mock.h
similarity index 100%
rename from src/unit_tests/mock/gio_mock.h
rename to test/unit_tests/mock/gio_mock.h

diff --git a/src/unit_tests/mock/glib_mock.h b/test/unit_tests/mock/glib_mock.h
similarity index 100%
rename from src/unit_tests/mock/glib_mock.h
rename to test/unit_tests/mock/glib_mock.h

diff --git a/src/unit_tests/mock/mock.cc b/test/unit_tests/mock/mock.cc
similarity index 100%
rename from src/unit_tests/mock/mock.cc
rename to test/unit_tests/mock/mock.cc

diff --git a/src/unit_tests/mock/mock.h b/test/unit_tests/mock/mock.h
similarity index 100%
rename from src/unit_tests/mock/mock.h
rename to test/unit_tests/mock/mock.h

diff --git a/src/unit_tests/test_request_handlers.cc b/test/unit_tests/test_request_handlers.cc
similarity index 100%
rename from src/unit_tests/test_request_handlers.cc
rename to test/unit_tests/test_request_handlers.cc

diff --git a/src/unit_tests/test_samples/test_theme.json b/test/unit_tests/test_samples/test_theme.json
similarity index 100%
rename from src/unit_tests/test_samples/test_theme.json
rename to test/unit_tests/test_samples/test_theme.json

diff --git a/src/unit_tests/test_theme.cc b/test/unit_tests/test_theme.cc
similarity index 100%
rename from src/unit_tests/test_theme.cc
rename to test/unit_tests/test_theme.cc

diff --git a/src/unit_tests/test_theme_info.cc b/test/unit_tests/test_theme_info.cc
similarity index 100%
rename from src/unit_tests/test_theme_info.cc
rename to test/unit_tests/test_theme_info.cc

diff --git a/src/unit_tests/test_theme_info_loader.cc b/test/unit_tests/test_theme_info_loader.cc
similarity index 100%
rename from src/unit_tests/test_theme_info_loader.cc
rename to test/unit_tests/test_theme_info_loader.cc

diff --git a/src/unit_tests/test_theme_info_proxy.cc b/test/unit_tests/test_theme_info_proxy.cc
similarity index 100%
rename from src/unit_tests/test_theme_info_proxy.cc
rename to test/unit_tests/test_theme_info_proxy.cc

diff --git a/src/unit_tests/test_theme_parser.cc b/test/unit_tests/test_theme_parser.cc
similarity index 100%
rename from src/unit_tests/test_theme_parser.cc
rename to test/unit_tests/test_theme_parser.cc