Move unittest to tests folder

Change-Id: I15d688766765bc3775cf538387c2c99e135fc72e
Signed-off-by: mk5004.lee <mk5004.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90ed25c..ddf7544 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-ENABLE_TESTING()
-SET(NOTIFICATION_UNIT_TESTS notification-ex_unittests)
-ADD_TEST(NAME ${NOTIFICATION_UNIT_TESTS} COMMAND ${NOTIFICATION_UNIT_TESTS})
-
 ADD_SUBDIRECTORY(notification)
 ADD_SUBDIRECTORY(notification-ex)
-ADD_SUBDIRECTORY(unittest)
+ADD_SUBDIRECTORY(tests)
 
-ADD_DEPENDENCIES(notification-ex_unittests notification-ex)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6b60f04
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,6 @@
+ENABLE_TESTING()
+SET(NOTIFICATION_UNIT_TESTS notification-ex_unittests)
+ADD_TEST(NAME ${NOTIFICATION_UNIT_TESTS} COMMAND ${NOTIFICATION_UNIT_TESTS})
+
+ADD_SUBDIRECTORY(unittest)
+ADD_DEPENDENCIES(notification-ex_unittests notification-ex)

diff --git a/mock/app_common.h b/tests/mock/app_common.h
similarity index 100%
rename from mock/app_common.h
rename to tests/mock/app_common.h

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

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

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

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

diff --git a/mock/security_manager_mock.h b/tests/mock/security_manager_mock.h
similarity index 100%
rename from mock/security_manager_mock.h
rename to tests/mock/security_manager_mock.h

diff --git a/mock/smack_mock.h b/tests/mock/smack_mock.h
similarity index 100%
rename from mock/smack_mock.h
rename to tests/mock/smack_mock.h

diff --git a/mock/tzplatform_config_mock.h b/tests/mock/tzplatform_config_mock.h
similarity index 100%
rename from mock/tzplatform_config_mock.h
rename to tests/mock/tzplatform_config_mock.h

diff --git a/unittest/CMakeLists.txt b/tests/unittest/CMakeLists.txt
similarity index 85%
rename from unittest/CMakeLists.txt
rename to tests/unittest/CMakeLists.txt
index afbc3ba..5d23946 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/tests/unittest/CMakeLists.txt
@@ -22,14 +22,15 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 INCLUDE_DIRECTORIES(
-    ${CMAKE_SOURCE_DIR}/notification-ex
-    ${CMAKE_SOURCE_DIR}/notification-ex/api
-    ${CMAKE_SOURCE_DIR}/mock
     ${CMAKE_SOURCE_DIR}/
+    ${CMAKE_SOURCE_DIR}/notification-ex/
+    ${CMAKE_SOURCE_DIR}/notification-ex/api
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_SOURCE_DIR}/../mock
 )
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCES)
-AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/mock MOCK_SOURCES)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock MOCK_SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/notification-ex NOTIFICATION_EX_SOURCES)
 ADD_EXECUTABLE(${PROJECT_NAME}
     ${SOURCES}

diff --git a/unittest/src/test_main.cc b/tests/unittest/src/test_main.cc
similarity index 100%
rename from unittest/src/test_main.cc
rename to tests/unittest/src/test_main.cc

diff --git a/unittest/src/test_noti_ex_abstract_item.cc b/tests/unittest/src/test_noti_ex_abstract_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_abstract_item.cc
rename to tests/unittest/src/test_noti_ex_abstract_item.cc

diff --git a/unittest/src/test_noti_ex_app_control_action.cc b/tests/unittest/src/test_noti_ex_app_control_action.cc
similarity index 100%
rename from unittest/src/test_noti_ex_app_control_action.cc
rename to tests/unittest/src/test_noti_ex_app_control_action.cc

diff --git a/unittest/src/test_noti_ex_button_item.cc b/tests/unittest/src/test_noti_ex_button_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_button_item.cc
rename to tests/unittest/src/test_noti_ex_button_item.cc

diff --git a/unittest/src/test_noti_ex_chat_message_item.cc b/tests/unittest/src/test_noti_ex_chat_message_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_chat_message_item.cc
rename to tests/unittest/src/test_noti_ex_chat_message_item.cc

diff --git a/unittest/src/test_noti_ex_checkbox_item.cc b/tests/unittest/src/test_noti_ex_checkbox_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_checkbox_item.cc
rename to tests/unittest/src/test_noti_ex_checkbox_item.cc

diff --git a/unittest/src/test_noti_ex_entry_item.cc b/tests/unittest/src/test_noti_ex_entry_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_entry_item.cc
rename to tests/unittest/src/test_noti_ex_entry_item.cc

diff --git a/unittest/src/test_noti_ex_event_info.cc b/tests/unittest/src/test_noti_ex_event_info.cc
similarity index 100%
rename from unittest/src/test_noti_ex_event_info.cc
rename to tests/unittest/src/test_noti_ex_event_info.cc

diff --git a/unittest/src/test_noti_ex_group_item.cc b/tests/unittest/src/test_noti_ex_group_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_group_item.cc
rename to tests/unittest/src/test_noti_ex_group_item.cc

diff --git a/unittest/src/test_noti_ex_icon_item.cc b/tests/unittest/src/test_noti_ex_icon_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_icon_item.cc
rename to tests/unittest/src/test_noti_ex_icon_item.cc

diff --git a/unittest/src/test_noti_ex_image_item.cc b/tests/unittest/src/test_noti_ex_image_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_image_item.cc
rename to tests/unittest/src/test_noti_ex_image_item.cc

diff --git a/unittest/src/test_noti_ex_input_selector_item.cc b/tests/unittest/src/test_noti_ex_input_selector_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_input_selector_item.cc
rename to tests/unittest/src/test_noti_ex_input_selector_item.cc

diff --git a/unittest/src/test_noti_ex_progress_item.cc b/tests/unittest/src/test_noti_ex_progress_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_progress_item.cc
rename to tests/unittest/src/test_noti_ex_progress_item.cc

diff --git a/unittest/src/test_noti_ex_shared_file.cc b/tests/unittest/src/test_noti_ex_shared_file.cc
similarity index 100%
rename from unittest/src/test_noti_ex_shared_file.cc
rename to tests/unittest/src/test_noti_ex_shared_file.cc

diff --git a/unittest/src/test_noti_ex_text_item.cc b/tests/unittest/src/test_noti_ex_text_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_text_item.cc
rename to tests/unittest/src/test_noti_ex_text_item.cc

diff --git a/unittest/src/test_noti_ex_time_item.cc b/tests/unittest/src/test_noti_ex_time_item.cc
similarity index 100%
rename from unittest/src/test_noti_ex_time_item.cc
rename to tests/unittest/src/test_noti_ex_time_item.cc

diff --git a/unittest/src/test_noti_ex_visibility_action.cc b/tests/unittest/src/test_noti_ex_visibility_action.cc
similarity index 100%
rename from unittest/src/test_noti_ex_visibility_action.cc
rename to tests/unittest/src/test_noti_ex_visibility_action.cc