Move mock directory

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

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

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

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

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

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

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

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

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

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index ed8a807..93823e7 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(notification-ex_unittests CXX)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(notification-ex_unittests REQUIRED
+PKG_CHECK_MODULES(notification-ex_unittests REQUIRED
     dlog
     gmock
     capi-appfw-app-control
@@ -21,18 +21,20 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++11")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../notification-ex)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../notification-ex/api)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unittest/mock)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../notification-ex
+    ${CMAKE_CURRENT_SOURCE_DIR}/../notification-ex/api
+    ${CMAKE_CURRENT_SOURCE_DIR}/../mock
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+)
 
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock UNIT_TEST_SOURCES)
-AUX_SOURCE_DIRECTORY(src SOURCES)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCES)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock MOCK_SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../notification-ex NOTIFICATION_EX_SOURCES)
 ADD_EXECUTABLE(${PROJECT_NAME}
     ${SOURCES}
     ${NOTIFICATION_EX_SOURCES}
-    ${UNIT_TEST_SOURCES}
+    ${MOCK_SOURCES}
 )
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${notification-ex_unittests_LDFLAGS}

diff --git a/unittest/src/test_group_item.cc b/unittest/src/test_group_item.cc
old mode 100644 (file)
new mode 100755 (executable)
index 2c0b761..8cf8c79
--- a/unittest/src/test_group_item.cc
+++ b/unittest/src/test_group_item.cc
@@ -20,7 +20,7 @@
 #include "notification-ex/button_item.h"
 #include "notification-ex/text_item.h"
 #include "notification-ex/item_inflator.h"
-#include "unittest/mock/app_common.h"
+#include "mock/app_common.h"
 
 using namespace tizen_base;
 using namespace notification;

diff --git a/unittest/src/test_shared_file.cc b/unittest/src/test_shared_file.cc
old mode 100644 (file)
new mode 100755 (executable)
index 973986e..1a09b7d
--- a/unittest/src/test_shared_file.cc
+++ b/unittest/src/test_shared_file.cc
@@ -22,10 +22,10 @@
 #include "notification-ex/image_item.h"
 #include "notification-ex/common.h"
 
-#include "unittest/mock/gio_mock.h"
-#include "unittest/mock/smack_mock.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/security_manager_mock.h"
+#include "mock/gio_mock.h"
+#include "mock/smack_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/security_manager_mock.h"
 
 
 using namespace notification;