Move mock folder to improve SAM score

Change-Id: I408bc25cf9707c48e3d479e3fdf7eeb8dc2a9c70
Signed-off-by: Junghoon Park <jh9216.park@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/app_control_mock.h b/mock/app_control_mock.h
similarity index 100%
rename from unittest/mock/app_control_mock.h
rename to mock/app_control_mock.h

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/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/gio.h b/mock/gio/gio.h
similarity index 100%
rename from unittest/mock/gio/gio.h
rename to mock/gio/gio.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/mock_util.cc b/mock/mock_util.cc
similarity index 100%
rename from unittest/mock/mock_util.cc
rename to mock/mock_util.cc

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

diff --git a/unittest/mock/pkgmgr_mock.h b/mock/pkgmgr_mock.h
similarity index 100%
rename from unittest/mock/pkgmgr_mock.h
rename to mock/pkgmgr_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 3630a20..69cc82d 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -39,14 +39,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication/includ
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication-provider/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-editor/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unittest/mock)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../mock)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication/res)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common COMMON_SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication COMPLICATION_SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication-provider COMPLICATION_PROVIDER_SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-editor EDITOR_SOURCES)
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock MOCK_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock MOCK_SRCS)
 AUX_SOURCE_DIRECTORY(src SOURCES)
 ADD_EXECUTABLE(${PROJECT_NAME}
     ${SOURCES}

diff --git a/unittest/src/test-complication-provider.cc b/unittest/src/test-complication-provider.cc
index f2276b3..df14a0b 100644 (file)
--- a/unittest/src/test-complication-provider.cc
+++ b/unittest/src/test-complication-provider.cc
@@ -24,13 +24,13 @@
 
 #include "watchface-complication-provider/complication-provider.h"
 #include "watchface-complication-provider/include/watchface-complication-provider.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/app_common.h"
-#include "unittest/mock/mock_util.h"
-#include "unittest/mock/pkgmgr_mock.h"
-#include "unittest/mock/gio/gio.h"
-#include "unittest/mock/aul_mock.h"
-#include "unittest/mock/cynara_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/app_common.h"
+#include "mock/mock_util.h"
+#include "mock/pkgmgr_mock.h"
+#include "mock/gio/gio.h"
+#include "mock/aul_mock.h"
+#include "mock/cynara_mock.h"
 
 using namespace std;
 using namespace watchface_complication;

diff --git a/unittest/src/test-complication.cc b/unittest/src/test-complication.cc
index 8056344..7544ca6 100644 (file)
--- a/unittest/src/test-complication.cc
+++ b/unittest/src/test-complication.cc
@@ -29,12 +29,12 @@
 #include <gmock/gmock.h>
 
 #include "watchface-complication/complication.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/app_common.h"
-#include "unittest/mock/mock_util.h"
-#include "unittest/mock/pkgmgr_mock.h"
-#include "unittest/mock/gio/gio.h"
-#include "unittest/mock/aul_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/app_common.h"
+#include "mock/mock_util.h"
+#include "mock/pkgmgr_mock.h"
+#include "mock/gio/gio.h"
+#include "mock/aul_mock.h"
 
 
 using namespace std;

diff --git a/unittest/src/test-editables-container.cc b/unittest/src/test-editables-container.cc
index d6a8101..1e38c89 100644 (file)
--- a/unittest/src/test-editables-container.cc
+++ b/unittest/src/test-editables-container.cc
@@ -35,9 +35,9 @@
 #include "watchface-complication/include/watchface-complication.h"
 #include "watchface-complication/include/watchface-editable.h"
 
-#include "unittest/mock/gio/gio.h"
-#include "unittest/mock/aul_mock.h"
-#include "unittest/mock/pkgmgr_mock.h"
+#include "mock/gio/gio.h"
+#include "mock/aul_mock.h"
+#include "mock/pkgmgr_mock.h"
 
 using namespace std;
 using namespace tizen_base;

diff --git a/unittest/src/test-editor.cc b/unittest/src/test-editor.cc
index 5484591..9f60f5f 100644 (file)
--- a/unittest/src/test-editor.cc
+++ b/unittest/src/test-editor.cc
@@ -27,7 +27,7 @@
 #include "watchface-complication/received-editable.h"
 #include "watchface-complication/include/watchface-editable.h"
 #include "watchface-editor/include/watchface-editor.h"
-#include "unittest/mock/cynara_mock.h"
+#include "mock/cynara_mock.h"
 
 using namespace std;
 using namespace tizen_base;

diff --git a/unittest/src/test-main.cc b/unittest/src/test-main.cc
index 4cdeb25..0f3c62f 100644 (file)
--- a/unittest/src/test-main.cc
+++ b/unittest/src/test-main.cc
@@ -20,7 +20,7 @@
 #include <bundle.h>
 #include <iostream>
 
-#include "unittest/mock/mock_util.h"
+#include "mock/mock_util.h"
 
 using namespace std;
 void UpdateDB() {

diff --git a/unittest/src/test-watchface-complication-provider.cc b/unittest/src/test-watchface-complication-provider.cc
index 6c63e89..719e769 100644 (file)
--- a/unittest/src/test-watchface-complication-provider.cc
+++ b/unittest/src/test-watchface-complication-provider.cc
@@ -24,14 +24,14 @@
 #include "watchface-complication/editables-container.h"
 #include "watchface-complication/received-editable.h"
 
-#include "unittest/mock/system_info_mock.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/app_common.h"
-#include "unittest/mock/mock_util.h"
-#include "unittest/mock/pkgmgr_mock.h"
-#include "unittest/mock/gio/gio.h"
-#include "unittest/mock/aul_mock.h"
-#include "unittest/mock/cynara_mock.h"
+#include "mock/system_info_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/app_common.h"
+#include "mock/mock_util.h"
+#include "mock/pkgmgr_mock.h"
+#include "mock/gio/gio.h"
+#include "mock/aul_mock.h"
+#include "mock/cynara_mock.h"
 
 
 using namespace std;

diff --git a/unittest/src/test-watchface-complication.cc b/unittest/src/test-watchface-complication.cc
index 2416714..4839ac8 100644 (file)
--- a/unittest/src/test-watchface-complication.cc
+++ b/unittest/src/test-watchface-complication.cc
@@ -20,13 +20,13 @@
 #include <watchface-complication-provider.h>
 
 #include "watchface-complication/complication.h"
-#include "unittest/mock/system_info_mock.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/app_common.h"
-#include "unittest/mock/mock_util.h"
-#include "unittest/mock/pkgmgr_mock.h"
-#include "unittest/mock/gio/gio.h"
-#include "unittest/mock/aul_mock.h"
+#include "mock/system_info_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/app_common.h"
+#include "mock/mock_util.h"
+#include "mock/pkgmgr_mock.h"
+#include "mock/gio/gio.h"
+#include "mock/aul_mock.h"
 
 using namespace std;
 using namespace tizen_base;

diff --git a/unittest/src/test-watchface-editable.cc b/unittest/src/test-watchface-editable.cc
index 1c754bb..ba35b68 100644 (file)
--- a/unittest/src/test-watchface-editable.cc
+++ b/unittest/src/test-watchface-editable.cc
@@ -23,13 +23,13 @@
 #include "watchface-complication/editables-container.h"
 #include "watchface-complication/received-editable.h"
 
-#include "unittest/mock/system_info_mock.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/app_common.h"
-#include "unittest/mock/mock_util.h"
-#include "unittest/mock/pkgmgr_mock.h"
-#include "unittest/mock/gio/gio.h"
-#include "unittest/mock/aul_mock.h"
+#include "mock/system_info_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/app_common.h"
+#include "mock/mock_util.h"
+#include "mock/pkgmgr_mock.h"
+#include "mock/gio/gio.h"
+#include "mock/aul_mock.h"
 
 using namespace std;
 using namespace tizen_base;

diff --git a/unittest/src/test-watchface-editor.cc b/unittest/src/test-watchface-editor.cc
index a36bfca..ab3a042 100644 (file)
--- a/unittest/src/test-watchface-editor.cc
+++ b/unittest/src/test-watchface-editor.cc
@@ -23,14 +23,14 @@
 #include "watchface-complication/editables-container.h"
 #include "watchface-complication/received-editable.h"
 
-#include "unittest/mock/system_info_mock.h"
-#include "unittest/mock/tzplatform_config_mock.h"
-#include "unittest/mock/app_common.h"
-#include "unittest/mock/mock_util.h"
-#include "unittest/mock/pkgmgr_mock.h"
-#include "unittest/mock/gio/gio.h"
-#include "unittest/mock/aul_mock.h"
-#include "unittest/mock/app_control_mock.h"
+#include "mock/system_info_mock.h"
+#include "mock/tzplatform_config_mock.h"
+#include "mock/app_common.h"
+#include "mock/mock_util.h"
+#include "mock/pkgmgr_mock.h"
+#include "mock/gio/gio.h"
+#include "mock/aul_mock.h"
+#include "mock/app_control_mock.h"
 
 using namespace std;
 using namespace tizen_base;