Move test codes

Move test codes info ${src root}/test and rename it to smoke_tests

Change-Id: Ifc954d6d38c403c7cf47a565edec744574b212e5
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 997543c..48ea915 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,3 +70,4 @@ FIND_PACKAGE(Boost REQUIRED COMPONENTS system filesystem program_options iostrea
 FIND_PACKAGE(GTest REQUIRED)
 
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(test)

diff --git a/packaging/app-installers.spec b/packaging/app-installers.spec
index ce87c27..884726a 100644 (file)
--- a/packaging/app-installers.spec
+++ b/packaging/app-installers.spec
@@ -64,11 +64,11 @@ Requires:   %{name} = %{version}
 This package contains header files of app-installers common library
 
 %package tests
-Summary: Unit tests for app-installers
+Summary: Smoke tests for app-installers
 Requires: %{name} = %{version}
 
 %description tests
-Unit tests for al modules of app-installers and common utils for smoke test
+Smoke tests for all modules of app-installers and common utils for smoke test
 
 %prep
 %setup -q
@@ -139,7 +139,7 @@ chsmack -a System %{logdir}
 %{_datadir}/app-installers-ut/*
 %{_libdir}/libtest-assessor-lib.so*
 %{_libdir}/libsmoke-utils.so*
-%{_includedir}/app-installers/unit_tests/common/smoke_utils.h
+%{_includedir}/app-installers/smoke_tests/common/smoke_utils.h
 
 %changelog
 * Tue Sep 01 2015 Pawel Sikorski <p.sikorski@samsung.com> 1.8-1

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5d3dfbf..de069bc 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,4 +2,3 @@ ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(pkg_initdb)
 ADD_SUBDIRECTORY(pkg_recovery)
 ADD_SUBDIRECTORY(pkgdir_tool)
-ADD_SUBDIRECTORY(unit_tests)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d506da3
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(smoke_tests)

diff --git a/src/unit_tests/CMakeLists.txt b/test/smoke_tests/CMakeLists.txt
similarity index 88%
rename from src/unit_tests/CMakeLists.txt
rename to test/smoke_tests/CMakeLists.txt
index e032591..4d9c161 100644 (file)
--- a/src/unit_tests/CMakeLists.txt
+++ b/test/smoke_tests/CMakeLists.txt
@@ -10,16 +10,16 @@ SET(TARGET_TEST_TAG_FAIL_PLUGIN "test-tag-fail-plugin")
 SET(TARGET_TEST_CATEGORY_FAIL_PLUGIN "test-category-fail-plugin")
 SET(TARGET_TEST_METADATA_FAIL_PLUGIN "test-metadata-fail-plugin")
 
-SET(TARGET_PLUGINS_TEST "plugins_unittest")
-SET(TARGET_SIGNATURE_TEST "signature_unittest")
+SET(TARGET_PLUGINS_TEST "plugins_smoketest")
+SET(TARGET_SIGNATURE_TEST "signature_smoketest")
 
 # Executables
 ADD_EXECUTABLE(${TARGET_SIGNATURE_TEST}
-  signature_unittest.cc
+  signature_smoketest.cc
 )
 
 ADD_EXECUTABLE(${TARGET_PLUGINS_TEST}
-  plugins_unittest.cc
+  plugins_smoketest.cc
 )
 
 INSTALL(DIRECTORY test_samples/ DESTINATION ${SHAREDIR}/${DESTINATION_DIR}/test_samples)
@@ -29,7 +29,7 @@ APPLY_PKG_CONFIG(${TARGET_SIGNATURE_TEST} PUBLIC
   GTEST
 )
 
-APPLY_PKG_CONFIG(plugins_unittest PUBLIC
+APPLY_PKG_CONFIG(${TARGET_PLUGINS_TEST} PUBLIC
   Boost
   GTEST
 )

diff --git a/src/unit_tests/common/CMakeLists.txt b/test/smoke_tests/common/CMakeLists.txt
similarity index 93%
rename from src/unit_tests/common/CMakeLists.txt
rename to test/smoke_tests/common/CMakeLists.txt
index e200daa..afbb867 100644 (file)
--- a/src/unit_tests/common/CMakeLists.txt
+++ b/test/smoke_tests/common/CMakeLists.txt
@@ -13,4 +13,4 @@ TARGET_LINK_LIBRARIES(${TARGET_SMOKE_UTILS} PRIVATE
 )
 
 INSTALL(TARGETS ${TARGET_SMOKE_UTILS} DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(FILES smoke_utils.h DESTINATION ${INCLUDEDIR}/app-installers/unit_tests/common/)
+INSTALL(FILES smoke_utils.h DESTINATION ${INCLUDEDIR}/app-installers/smoke_tests/common/)

diff --git a/src/unit_tests/common/smoke_utils.cc b/test/smoke_tests/common/smoke_utils.cc
similarity index 99%
rename from src/unit_tests/common/smoke_utils.cc
rename to test/smoke_tests/common/smoke_utils.cc
index 76588e5..50f3187 100644 (file)
--- a/src/unit_tests/common/smoke_utils.cc
+++ b/test/smoke_tests/common/smoke_utils.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "unit_tests/common/smoke_utils.h"
+#include "smoke_tests/common/smoke_utils.h"
 
 #include <gum/gum-user.h>
 #include <gum/gum-user-service.h>

diff --git a/src/unit_tests/common/smoke_utils.h b/test/smoke_tests/common/smoke_utils.h
similarity index 99%
rename from src/unit_tests/common/smoke_utils.h
rename to test/smoke_tests/common/smoke_utils.h
index 57afe29..59efc2e 100644 (file)
--- a/src/unit_tests/common/smoke_utils.h
+++ b/test/smoke_tests/common/smoke_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef UNIT_TESTS_COMMON_SMOKE_UTILS_H_
-#define UNIT_TESTS_COMMON_SMOKE_UTILS_H_
+#ifndef SMOKE_TESTS_COMMON_SMOKE_UTILS_H_
+#define SMOKE_TESTS_COMMON_SMOKE_UTILS_H_
 
 #include <pkgmgr-info.h>
 #include <signal.h>
@@ -402,4 +402,4 @@ class StepCrash : public common_installer::Step {
 
 }  // namespace smoke_test
 
-#endif  // UNIT_TESTS_COMMON_SMOKE_UTILS_H_
+#endif  // SMOKE_TESTS_COMMON_SMOKE_UTILS_H_

diff --git a/src/unit_tests/libs/CMakeLists.txt b/test/smoke_tests/libs/CMakeLists.txt
similarity index 100%
rename from src/unit_tests/libs/CMakeLists.txt
rename to test/smoke_tests/libs/CMakeLists.txt

diff --git a/src/unit_tests/libs/test_assessor.cc b/test/smoke_tests/libs/test_assessor.cc
similarity index 94%
rename from src/unit_tests/libs/test_assessor.cc
rename to test/smoke_tests/libs/test_assessor.cc
index 2becc77..cec0524 100644 (file)
--- a/src/unit_tests/libs/test_assessor.cc
+++ b/test/smoke_tests/libs/test_assessor.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "unit_tests/libs/test_assessor.h"
+#include "smoke_tests/libs/test_assessor.h"
 
 namespace common_installer {
 

diff --git a/src/unit_tests/libs/test_assessor.h b/test/smoke_tests/libs/test_assessor.h
similarity index 89%
rename from src/unit_tests/libs/test_assessor.h
rename to test/smoke_tests/libs/test_assessor.h
index 21473d4..805fed1 100644 (file)
--- a/src/unit_tests/libs/test_assessor.h
+++ b/test/smoke_tests/libs/test_assessor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by an apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef UNIT_TESTS_LIBS_TEST_ASSESSOR_H_
-#define UNIT_TESTS_LIBS_TEST_ASSESSOR_H_
+#ifndef SMOKE_TESTS_LIBS_TEST_ASSESSOR_H_
+#define SMOKE_TESTS_LIBS_TEST_ASSESSOR_H_
 
 #include <boost/optional/optional.hpp>
 
@@ -41,4 +41,4 @@ class TestAssessor : public common_installer::Singleton<TestAssessor> {
 
 }  // namespace common_installer
 
-#endif  // UNIT_TESTS_LIBS_TEST_ASSESSOR_H_
+#endif  // SMOKE_TESTS_LIBS_TEST_ASSESSOR_H_

diff --git a/src/unit_tests/libs/test_category_fail_plugin.cc b/test/smoke_tests/libs/test_category_fail_plugin.cc
similarity index 100%
rename from src/unit_tests/libs/test_category_fail_plugin.cc
rename to test/smoke_tests/libs/test_category_fail_plugin.cc

diff --git a/src/unit_tests/libs/test_category_plugin.cc b/test/smoke_tests/libs/test_category_plugin.cc
similarity index 98%
rename from src/unit_tests/libs/test_category_plugin.cc
rename to test/smoke_tests/libs/test_category_plugin.cc
index e0c2797..de97b77 100644 (file)
--- a/src/unit_tests/libs/test_category_plugin.cc
+++ b/test/smoke_tests/libs/test_category_plugin.cc
@@ -14,7 +14,7 @@
 
 #include "common/plugins/plugin.h"
 #include "common/utils/glist_range.h"
-#include "unit_tests/libs/test_assessor.h"
+#include "smoke_tests/libs/test_assessor.h"
 
 namespace ci = common_installer;
 

diff --git a/src/unit_tests/libs/test_metadata_fail_plugin.cc b/test/smoke_tests/libs/test_metadata_fail_plugin.cc
similarity index 100%
rename from src/unit_tests/libs/test_metadata_fail_plugin.cc
rename to test/smoke_tests/libs/test_metadata_fail_plugin.cc

diff --git a/src/unit_tests/libs/test_metadata_plugin.cc b/test/smoke_tests/libs/test_metadata_plugin.cc
similarity index 98%
rename from src/unit_tests/libs/test_metadata_plugin.cc
rename to test/smoke_tests/libs/test_metadata_plugin.cc
index 5253845..1c178d8 100644 (file)
--- a/src/unit_tests/libs/test_metadata_plugin.cc
+++ b/test/smoke_tests/libs/test_metadata_plugin.cc
@@ -14,7 +14,7 @@
 
 #include "common/plugins/plugin.h"
 #include "common/utils/glist_range.h"
-#include "unit_tests/libs/test_assessor.h"
+#include "smoke_tests/libs/test_assessor.h"
 
 namespace ci = common_installer;
 

diff --git a/src/unit_tests/libs/test_tag_fail_plugin.cc b/test/smoke_tests/libs/test_tag_fail_plugin.cc
similarity index 100%
rename from src/unit_tests/libs/test_tag_fail_plugin.cc
rename to test/smoke_tests/libs/test_tag_fail_plugin.cc

diff --git a/src/unit_tests/libs/test_tag_plugin.cc b/test/smoke_tests/libs/test_tag_plugin.cc
similarity index 98%
rename from src/unit_tests/libs/test_tag_plugin.cc
rename to test/smoke_tests/libs/test_tag_plugin.cc
index 8eeaa81..653609b 100644 (file)
--- a/src/unit_tests/libs/test_tag_plugin.cc
+++ b/test/smoke_tests/libs/test_tag_plugin.cc
@@ -9,7 +9,7 @@
 #include <tuple>
 
 #include "common/plugins/plugin.h"
-#include "unit_tests/libs/test_assessor.h"
+#include "smoke_tests/libs/test_assessor.h"
 
 namespace ci = common_installer;
 

diff --git a/src/unit_tests/plugins_unittest.cc b/test/smoke_tests/plugins_smoketest.cc
similarity index 99%
rename from src/unit_tests/plugins_unittest.cc
rename to test/smoke_tests/plugins_smoketest.cc
index c3a28ee..1607474 100644 (file)
--- a/src/unit_tests/plugins_unittest.cc
+++ b/test/smoke_tests/plugins_smoketest.cc
@@ -15,7 +15,7 @@
 #include "common/plugins/plugin_list_parser.h"
 #include "common/plugins/plugin_manager.h"
 #include "common/plugins/plugin_xml_parser.h"
-#include "unit_tests/libs/test_assessor.h"
+#include "smoke_tests/libs/test_assessor.h"
 
 namespace bf = boost::filesystem;
 namespace ci = common_installer;

diff --git a/src/unit_tests/signature_unittest.cc b/test/smoke_tests/signature_smoketest.cc
similarity index 100%
rename from src/unit_tests/signature_unittest.cc
rename to test/smoke_tests/signature_smoketest.cc

diff --git a/src/unit_tests/test_samples/bad_signatures/author-signature.xml b/test/smoke_tests/test_samples/bad_signatures/author-signature.xml
similarity index 100%
rename from src/unit_tests/test_samples/bad_signatures/author-signature.xml
rename to test/smoke_tests/test_samples/bad_signatures/author-signature.xml

diff --git a/src/unit_tests/test_samples/good_signatures/config.xml b/test/smoke_tests/test_samples/bad_signatures/config.xml
similarity index 100%
rename from src/unit_tests/test_samples/good_signatures/config.xml
rename to test/smoke_tests/test_samples/bad_signatures/config.xml

diff --git a/src/unit_tests/test_samples/good_signatures/icon.png b/test/smoke_tests/test_samples/bad_signatures/icon.png
similarity index 100%
rename from src/unit_tests/test_samples/good_signatures/icon.png
rename to test/smoke_tests/test_samples/bad_signatures/icon.png

diff --git a/src/unit_tests/test_samples/good_signatures/index.html b/test/smoke_tests/test_samples/bad_signatures/index.html
similarity index 100%
rename from src/unit_tests/test_samples/good_signatures/index.html
rename to test/smoke_tests/test_samples/bad_signatures/index.html

diff --git a/src/unit_tests/test_samples/bad_signatures/signature1.xml b/test/smoke_tests/test_samples/bad_signatures/signature1.xml
similarity index 100%
rename from src/unit_tests/test_samples/bad_signatures/signature1.xml
rename to test/smoke_tests/test_samples/bad_signatures/signature1.xml

diff --git a/src/unit_tests/test_samples/good_signatures/version.txt b/test/smoke_tests/test_samples/bad_signatures/version.txt
similarity index 100%
rename from src/unit_tests/test_samples/good_signatures/version.txt
rename to test/smoke_tests/test_samples/bad_signatures/version.txt

diff --git a/src/unit_tests/test_samples/good_signatures/author-signature.xml b/test/smoke_tests/test_samples/good_signatures/author-signature.xml
similarity index 100%
rename from src/unit_tests/test_samples/good_signatures/author-signature.xml
rename to test/smoke_tests/test_samples/good_signatures/author-signature.xml

diff --git a/src/unit_tests/test_samples/bad_signatures/config.xml b/test/smoke_tests/test_samples/good_signatures/config.xml
similarity index 100%
rename from src/unit_tests/test_samples/bad_signatures/config.xml
rename to test/smoke_tests/test_samples/good_signatures/config.xml

diff --git a/src/unit_tests/test_samples/bad_signatures/icon.png b/test/smoke_tests/test_samples/good_signatures/icon.png
similarity index 100%
rename from src/unit_tests/test_samples/bad_signatures/icon.png
rename to test/smoke_tests/test_samples/good_signatures/icon.png

diff --git a/src/unit_tests/test_samples/bad_signatures/index.html b/test/smoke_tests/test_samples/good_signatures/index.html
similarity index 100%
rename from src/unit_tests/test_samples/bad_signatures/index.html
rename to test/smoke_tests/test_samples/good_signatures/index.html

diff --git a/src/unit_tests/test_samples/good_signatures/signature1.xml b/test/smoke_tests/test_samples/good_signatures/signature1.xml
similarity index 100%
rename from src/unit_tests/test_samples/good_signatures/signature1.xml
rename to test/smoke_tests/test_samples/good_signatures/signature1.xml

diff --git a/src/unit_tests/test_samples/bad_signatures/version.txt b/test/smoke_tests/test_samples/good_signatures/version.txt
similarity index 100%
rename from src/unit_tests/test_samples/bad_signatures/version.txt
rename to test/smoke_tests/test_samples/good_signatures/version.txt

diff --git a/src/unit_tests/test_samples/plugins/category-manifest/tizen-manifest.xml b/test/smoke_tests/test_samples/plugins/category-manifest/tizen-manifest.xml
similarity index 100%
rename from src/unit_tests/test_samples/plugins/category-manifest/tizen-manifest.xml
rename to test/smoke_tests/test_samples/plugins/category-manifest/tizen-manifest.xml

diff --git a/src/unit_tests/test_samples/plugins/invalid-parser-plugins/invalid_plugin_list.txt b/test/smoke_tests/test_samples/plugins/invalid-parser-plugins/invalid_plugin_list.txt
similarity index 100%
rename from src/unit_tests/test_samples/plugins/invalid-parser-plugins/invalid_plugin_list.txt
rename to test/smoke_tests/test_samples/plugins/invalid-parser-plugins/invalid_plugin_list.txt

diff --git a/src/unit_tests/test_samples/plugins/invalid_manifest.xml b/test/smoke_tests/test_samples/plugins/invalid_manifest.xml
similarity index 100%
rename from src/unit_tests/test_samples/plugins/invalid_manifest.xml
rename to test/smoke_tests/test_samples/plugins/invalid_manifest.xml

diff --git a/src/unit_tests/test_samples/plugins/metadata-manifest/tizen-manifest.xml b/test/smoke_tests/test_samples/plugins/metadata-manifest/tizen-manifest.xml
similarity index 100%
rename from src/unit_tests/test_samples/plugins/metadata-manifest/tizen-manifest.xml
rename to test/smoke_tests/test_samples/plugins/metadata-manifest/tizen-manifest.xml

diff --git a/src/unit_tests/test_samples/plugins/tag-manifest/tizen-manifest.xml b/test/smoke_tests/test_samples/plugins/tag-manifest/tizen-manifest.xml
similarity index 100%
rename from src/unit_tests/test_samples/plugins/tag-manifest/tizen-manifest.xml
rename to test/smoke_tests/test_samples/plugins/tag-manifest/tizen-manifest.xml

diff --git a/src/unit_tests/test_samples/plugins/tizen-manifest.xml b/test/smoke_tests/test_samples/plugins/tizen-manifest.xml
similarity index 100%
rename from src/unit_tests/test_samples/plugins/tizen-manifest.xml
rename to test/smoke_tests/test_samples/plugins/tizen-manifest.xml

diff --git a/src/unit_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list1.txt b/test/smoke_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list1.txt
similarity index 99%
rename from src/unit_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list1.txt
rename to test/smoke_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list1.txt
index a7b3487..20c196a 100644 (file)
--- a/src/unit_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list1.txt
+++ b/test/smoke_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list1.txt
@@ -1 +1 @@
-type="metadata";name="http://developer.samsung.com/tizen/metadata/test_metadata";path="/usr/share/app-installers-ut/test_samples/plugins/libtest-metadata-fail-plugin.so";vitalness="true"\r
+type="metadata";name="http://developer.samsung.com/tizen/metadata/test_metadata";path="/usr/share/app-installers-ut/test_samples/plugins/libtest-metadata-fail-plugin.so";vitalness="true"

diff --git a/src/unit_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list2.txt b/test/smoke_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list2.txt
similarity index 100%
rename from src/unit_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list2.txt
rename to test/smoke_tests/test_samples/plugins/valid-fail-parser-plugins/test_plugin_list2.txt

diff --git a/src/unit_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list1.txt b/test/smoke_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list1.txt
similarity index 100%
rename from src/unit_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list1.txt
rename to test/smoke_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list1.txt

diff --git a/src/unit_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list2.txt b/test/smoke_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list2.txt
similarity index 100%
rename from src/unit_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list2.txt
rename to test/smoke_tests/test_samples/plugins/valid-parser-plugins/test_plugin_list2.txt

diff --git a/src/unit_tests/test_samples/tpk-sample-manifest.xml b/test/smoke_tests/test_samples/tpk-sample-manifest.xml
similarity index 100%
rename from src/unit_tests/test_samples/tpk-sample-manifest.xml
rename to test/smoke_tests/test_samples/tpk-sample-manifest.xml