From ac775c3ded36c0c0c9b1439f81ebf37d8b710936 Mon Sep 17 00:00:00 2001 From: hyunho Date: Thu, 6 Aug 2020 14:17:44 +0900 Subject: [PATCH] Move mock directory - To improve module circular dependency Change-Id: Ic40258a4b0365b404a10e29fc1f38ca4e7949cbc Signed-off-by: hyunho --- {unittest/mock => mock}/app_common.h | 0 {unittest/mock => mock}/appsvc_mock.h | 0 {unittest/mock => mock}/aul_mock.h | 0 {unittest/mock => mock}/cynara_mock.h | 0 {unittest/mock => mock}/evas_mock.h | 0 {unittest/mock => mock}/fff.h | 0 {unittest/mock => mock}/gio/gio.h | 0 {unittest/mock => mock}/mock.cc | 0 {unittest/mock => mock}/mock.h | 0 {unittest/mock => mock}/system_info_mock.h | 0 {unittest/mock => mock}/tzplatform_config_mock.h | 0 {unittest/mock => mock}/vconf_mock.h | 0 {unittest/mock => mock}/widget_service_mock.h | 0 unittest/CMakeLists.txt | 4 ++-- unittest/src/test_ambient_viewer.cc | 8 ++++---- 15 files changed, 6 insertions(+), 6 deletions(-) rename {unittest/mock => mock}/app_common.h (100%) rename {unittest/mock => mock}/appsvc_mock.h (100%) rename {unittest/mock => mock}/aul_mock.h (100%) rename {unittest/mock => mock}/cynara_mock.h (100%) rename {unittest/mock => mock}/evas_mock.h (100%) rename {unittest/mock => mock}/fff.h (100%) rename {unittest/mock => mock}/gio/gio.h (100%) rename {unittest/mock => mock}/mock.cc (100%) rename {unittest/mock => mock}/mock.h (100%) rename {unittest/mock => mock}/system_info_mock.h (100%) rename {unittest/mock => mock}/tzplatform_config_mock.h (100%) rename {unittest/mock => mock}/vconf_mock.h (100%) rename {unittest/mock => mock}/widget_service_mock.h (100%) 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/appsvc_mock.h b/mock/appsvc_mock.h similarity index 100% rename from unittest/mock/appsvc_mock.h rename to mock/appsvc_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/evas_mock.h b/mock/evas_mock.h similarity index 100% rename from unittest/mock/evas_mock.h rename to mock/evas_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/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/mock/vconf_mock.h b/mock/vconf_mock.h similarity index 100% rename from unittest/mock/vconf_mock.h rename to mock/vconf_mock.h diff --git a/unittest/mock/widget_service_mock.h b/mock/widget_service_mock.h similarity index 100% rename from unittest/mock/widget_service_mock.h rename to mock/widget_service_mock.h diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 441ce72e..494748dd 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -46,10 +46,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../ambient-viewer/src) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../ambient-viewer/include) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watch-holder/src) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watch-holder-base/src) -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 UNIT_TEST_SOURCES) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock UNIT_TEST_SOURCES) AUX_SOURCE_DIRECTORY(src SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../ambient-viewer/src AMBIENT_VIEWER_SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watch-holder-base/src WATCH_HOLDER_BASE_SOURCES) diff --git a/unittest/src/test_ambient_viewer.cc b/unittest/src/test_ambient_viewer.cc index c5de1cc3..dbbe254b 100644 --- a/unittest/src/test_ambient_viewer.cc +++ b/unittest/src/test_ambient_viewer.cc @@ -22,10 +22,10 @@ #include #include -#include "unittest/mock/vconf_mock.h" -#include "unittest/mock/aul_mock.h" -#include "unittest/mock/system_info_mock.h" -#include "unittest/mock/evas_mock.h" +#include "mock/vconf_mock.h" +#include "mock/aul_mock.h" +#include "mock/system_info_mock.h" +#include "mock/evas_mock.h" #include "ambient-viewer/include/ambient_viewer.h" #include "ambient-viewer/include/ambient_viewer_common.h" -- 2.34.1