Remove module circular dependency

Change-Id: I5430811f01c16141b685689b7bab593d26ca955b
Signed-off-by: SukHyung, Kang <shine.kang@samsung.com>

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

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

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

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

diff --git a/unittest/mock/fcntl_mock.h b/mock/fcntl_mock.h
similarity index 100%
rename from unittest/mock/fcntl_mock.h
rename to mock/fcntl_mock.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/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/pkgmgr_info_mock.h b/mock/pkgmgr_info_mock.h
similarity index 100%
rename from unittest/mock/pkgmgr_info_mock.h
rename to mock/pkgmgr_info_mock.h

diff --git a/unittest/mock/system_info_mock.h b/mock/system_info_mock.h
similarity index 100%
rename from unittest/mock/system_info_mock.h
rename to mock/system_info_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 4c254b5..11a5709 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -20,10 +20,10 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unittest/mock)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../mock)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock MOCK_SOURCES)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock MOCK_SOURCES)
 AUX_SOURCE_DIRECTORY(src SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../src WIDGET_SERVICE_SOURCES)
 ADD_EXECUTABLE(${PROJECT_NAME}

diff --git a/unittest/src/test_main.cc b/unittest/src/test_main.cc
index 6030805..bc22e69 100644 (file)
--- a/unittest/src/test_main.cc
+++ b/unittest/src/test_main.cc
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include "unittest/mock/db_mock.h"
+#include "mock/db_mock.h"
 
 int main(int argc, char** argv){
   int ret = -1;

diff --git a/unittest/src/test_widget_service.cc b/unittest/src/test_widget_service.cc
index dfa5b46..d86edec 100644 (file)
--- a/unittest/src/test_widget_service.cc
+++ b/unittest/src/test_widget_service.cc
@@ -22,13 +22,13 @@
 #include "include/widget_service.h"
 #include "include/widget_errno.h"
 #include "include/widget_service_internal.h"
-#include "unittest/mock/system_info_mock.h"
-#include "unittest/mock/aul_mock.h"
-#include "unittest/mock/cynara_mock.h"
-#include "unittest/mock/fcntl_mock.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/db_mock.h"
-#include "unittest/mock/pkgmgr_info_mock.h"
+#include "mock/system_info_mock.h"
+#include "mock/aul_mock.h"
+#include "mock/cynara_mock.h"
+#include "mock/fcntl_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/db_mock.h"
+#include "mock/pkgmgr_info_mock.h"
 
 namespace {
 int __fake_system_info_get_platform_bool(const char* key, bool* value) {

diff --git a/unittest/src/test_widget_service_instance.cc b/unittest/src/test_widget_service_instance.cc
index 2350175..0aa3bdf 100644 (file)
--- a/unittest/src/test_widget_service_instance.cc
+++ b/unittest/src/test_widget_service_instance.cc
@@ -21,9 +21,9 @@
 #include "include/widget_errno.h"
 #include "include/widget_instance.h"
 #include "include/widget_service_internal.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/db_mock.h"
-#include "unittest/mock/aul_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/db_mock.h"
+#include "mock/aul_mock.h"
 
 namespace {