Modify mock directory to improve SAM score

Change-Id: I89f31b58ae9adb2bea93a033cf1ca43639347f10
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

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

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

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

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

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

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

diff --git a/packaging/capi-appfw-component-manager.spec b/packaging/capi-appfw-component-manager.spec
index 4935e31..79a88b1 100644 (file)
--- a/packaging/capi-appfw-component-manager.spec
+++ b/packaging/capi-appfw-component-manager.spec
@@ -76,7 +76,7 @@ find . -name '*.gcno' -exec cp -rf '{}' gcov-obj ';'
 %endif
 
 %check
-ctest --output-on-failure %{?_smp_mflags}
+ctest --verbose %{?_smp_mflags}
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -q -d . -o component-manager.info
 genhtml component-manager.info -o component-manager.out

diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 2d62401..ff45334 100644 (file)
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -20,9 +20,10 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mock)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../mock)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock UNIT_TEST_MOCK_SOURCES)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock UNIT_TEST_MOCK_SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src UNIT_TEST_SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../src COMPMGR_SOURCES)
 

diff --git a/unit_tests/src/test_component_context.cc b/unit_tests/src/test_component_context.cc
index 0961ca8..2df6293 100644 (file)
--- a/unit_tests/src/test_component_context.cc
+++ b/unit_tests/src/test_component_context.cc
@@ -23,9 +23,10 @@
 #include <iostream>
 #include <memory>
 
-#include "mock_aul_comp_types.h"
-#include "mock_aul_comp_context.h"
-#include "component_manager.h"
+#include "include/component_manager.h"
+
+#include "mock/mock_aul_comp_context.h"
+#include "mock/mock_aul_comp_types.h"
 
 static int __fake_aul_comp_context_create(const char* comp_id,
     aul_comp_context_h* handle) {

diff --git a/unit_tests/src/test_component_info.cc b/unit_tests/src/test_component_info.cc
index fec4a5f..582fba9 100644 (file)
--- a/unit_tests/src/test_component_info.cc
+++ b/unit_tests/src/test_component_info.cc
@@ -21,8 +21,9 @@
 #include <iostream>
 #include <memory>
 
-#include "mock_aul_comp_info.h"
-#include "component_manager.h"
+#include "include/component_manager.h"
+
+#include "mock/mock_aul_comp_info.h"
 
 static const char ICON_PATH[] =
   "/opt/usr/home/owner/apps_rw/org.tizen.helloworld/shared/res/helloworld.png";

diff --git a/unit_tests/src/test_component_manager.cc b/unit_tests/src/test_component_manager.cc
index fe9da27..d747b89 100644 (file)
--- a/unit_tests/src/test_component_manager.cc
+++ b/unit_tests/src/test_component_manager.cc
@@ -21,9 +21,10 @@
 #include <iostream>
 #include <memory>
 
-#include "mock_aul_comp_info.h"
-#include "mock_aul_comp_context.h"
-#include "component_manager.h"
+#include "include/component_manager.h"
+
+#include "mock/mock_aul_comp_context.h"
+#include "mock/mock_aul_comp_info.h"
 
 static int __fake_aul_comp_info_foreach_comp_info(aul_comp_info_cb callback,
     void* user_data) {

diff --git a/unit_tests/src/test_component_manager_extension.cc b/unit_tests/src/test_component_manager_extension.cc
index 5dc40cb..f7680ef 100644 (file)
--- a/unit_tests/src/test_component_manager_extension.cc
+++ b/unit_tests/src/test_component_manager_extension.cc
@@ -21,8 +21,9 @@
 #include <iostream>
 #include <memory>
 
-#include "mock_aul_comp_context.h"
-#include "component_manager_extension.h"
+#include "include/component_manager_extension.h"
+
+#include "mock/mock_aul_comp_context.h"
 
 static int __fake_aul_comp_context_create(const char* comp_id,
     aul_comp_context_h* handle) {