From d5d52c41abd1f872e8718b0e0b65b869021ebdd9 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Mon, 2 Aug 2021 15:29:56 +0900 Subject: [PATCH] Change unittest directory hierachy Add pkg_upgrade directory at unit_unitests directory to add unit tests for another tools. Change-Id: I0c6f4d98d30b9ce53721e684703e98fabb3ce482 Signed-off-by: Junghyun Yeon --- tests/unit_tests/CMakeLists.txt | 47 +----------------- tests/unit_tests/pkg_upgrade/CMakeLists.txt | 46 +++++++++++++++++ .../{ => pkg_upgrade}/data/db/.pkgmgr_cert.db | Bin .../data/db/.pkgmgr_cert.db-journal | Bin .../data/db/.pkgmgr_parser.db | Bin .../data/db/.pkgmgr_parser.db-journal | Bin .../data/db_bck/.pkgmgr_cert.db | Bin .../data/db_bck/.pkgmgr_cert.db-journal | Bin .../data/db_bck/.pkgmgr_cert.db.bck | Bin .../data/db_bck/.pkgmgr_cert.db.bck-journal | Bin .../data/db_bck/.pkgmgr_parser.db | Bin .../data/db_bck/.pkgmgr_parser.db-journal | Bin .../data/db_bck/.pkgmgr_parser.db.bck | Bin .../data/db_bck/.pkgmgr_parser.db.bck-journal | Bin .../data/packages/org.tizen.alarm.xml | 0 .../data/packages/org.tizen.app-selector.xml | 0 .../data/packages/org.tizen.bluetooth.xml | 0 .../{ => pkg_upgrade}/data/rw/list.txt | 0 .../src/test_backend_invoker.cc | 0 .../{ => pkg_upgrade}/src/test_main.cc | 0 .../src/test_pkg_upgrader.cc | 14 +++--- 21 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 tests/unit_tests/pkg_upgrade/CMakeLists.txt rename tests/unit_tests/{ => pkg_upgrade}/data/db/.pkgmgr_cert.db (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db/.pkgmgr_cert.db-journal (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db/.pkgmgr_parser.db (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db/.pkgmgr_parser.db-journal (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_cert.db (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_cert.db-journal (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_cert.db.bck (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_cert.db.bck-journal (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_parser.db (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_parser.db-journal (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_parser.db.bck (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/db_bck/.pkgmgr_parser.db.bck-journal (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/packages/org.tizen.alarm.xml (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/packages/org.tizen.app-selector.xml (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/packages/org.tizen.bluetooth.xml (100%) rename tests/unit_tests/{ => pkg_upgrade}/data/rw/list.txt (100%) rename tests/unit_tests/{ => pkg_upgrade}/src/test_backend_invoker.cc (100%) rename tests/unit_tests/{ => pkg_upgrade}/src/test_main.cc (100%) rename tests/unit_tests/{ => pkg_upgrade}/src/test_pkg_upgrader.cc (92%) diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index 02d8349..caa6d7d 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -1,46 +1 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -PROJECT(pkgmgr-tool_unittests C CXX) - -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(pkgmgr-tool_unittests REQUIRED - dlog - gmock - pkgmgr-parser - pkgmgr-info - libtzplatform-config - libsmack - sqlite3 -) - -FOREACH(flag ${pkgmgr-tool_unittests_CFLAGS}) - SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") -ENDFOREACH(flag) -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -fPIE") - -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++14") -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") -SET(CMAKE_CXX_FLAGS_RELEASE "-O2") - -ADD_DEFINITIONS("-DDB_PATH=\"${DB_PATH}\"") - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/pkg_upgrade/include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) - -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCES) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../src/pkg_upgrade/src LIB_SOURCES) -LIST(REMOVE_ITEM LIB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/pkg_upgrade/src/main.cc) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock MOCK_SOURCES) - -ADD_EXECUTABLE(${PROJECT_NAME} - ${SOURCES} - ${MOCK_SOURCES} - ${LIB_SOURCES} -) - -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${EXTRA_CFLAGS}") -TARGET_LINK_LIBRARIES(${PROJECT_NAME} - ${pkgmgr-tool_unittests_LDFLAGS} -) - -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/) -INSTALL(DIRECTORY data/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/data) +ADD_SUBDIRECTORY(pkg_upgrade) diff --git a/tests/unit_tests/pkg_upgrade/CMakeLists.txt b/tests/unit_tests/pkg_upgrade/CMakeLists.txt new file mode 100644 index 0000000..935e117 --- /dev/null +++ b/tests/unit_tests/pkg_upgrade/CMakeLists.txt @@ -0,0 +1,46 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +PROJECT(pkgmgr-tool_unittests C CXX) + +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(pkgmgr-tool_unittests REQUIRED + dlog + gmock + pkgmgr-parser + pkgmgr-info + libtzplatform-config + libsmack + sqlite3 +) + +FOREACH(flag ${pkgmgr-tool_unittests_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) +SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -fPIE") + +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++14") +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") +SET(CMAKE_CXX_FLAGS_RELEASE "-O2") + +ADD_DEFINITIONS("-DDB_PATH=\"${DB_PATH}\"") + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../src/pkg_upgrade/include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) + +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCES) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../../src/pkg_upgrade/src LIB_SOURCES) +LIST(REMOVE_ITEM LIB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/pkg_upgrade/src/main.cc) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../mock MOCK_SOURCES) + +ADD_EXECUTABLE(${PROJECT_NAME} + ${SOURCES} + ${MOCK_SOURCES} + ${LIB_SOURCES} +) + +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${EXTRA_CFLAGS}") +TARGET_LINK_LIBRARIES(${PROJECT_NAME} + ${pkgmgr-tool_unittests_LDFLAGS} +) + +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/) +INSTALL(DIRECTORY data/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/data) diff --git a/tests/unit_tests/data/db/.pkgmgr_cert.db b/tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_cert.db similarity index 100% rename from tests/unit_tests/data/db/.pkgmgr_cert.db rename to tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_cert.db diff --git a/tests/unit_tests/data/db/.pkgmgr_cert.db-journal b/tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_cert.db-journal similarity index 100% rename from tests/unit_tests/data/db/.pkgmgr_cert.db-journal rename to tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_cert.db-journal diff --git a/tests/unit_tests/data/db/.pkgmgr_parser.db b/tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_parser.db similarity index 100% rename from tests/unit_tests/data/db/.pkgmgr_parser.db rename to tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_parser.db diff --git a/tests/unit_tests/data/db/.pkgmgr_parser.db-journal b/tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_parser.db-journal similarity index 100% rename from tests/unit_tests/data/db/.pkgmgr_parser.db-journal rename to tests/unit_tests/pkg_upgrade/data/db/.pkgmgr_parser.db-journal diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_cert.db b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_cert.db rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_cert.db-journal b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db-journal similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_cert.db-journal rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db-journal diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_cert.db.bck b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db.bck similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_cert.db.bck rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db.bck diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_cert.db.bck-journal b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db.bck-journal similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_cert.db.bck-journal rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_cert.db.bck-journal diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_parser.db b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_parser.db rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_parser.db-journal b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db-journal similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_parser.db-journal rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db-journal diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_parser.db.bck b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db.bck similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_parser.db.bck rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db.bck diff --git a/tests/unit_tests/data/db_bck/.pkgmgr_parser.db.bck-journal b/tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db.bck-journal similarity index 100% rename from tests/unit_tests/data/db_bck/.pkgmgr_parser.db.bck-journal rename to tests/unit_tests/pkg_upgrade/data/db_bck/.pkgmgr_parser.db.bck-journal diff --git a/tests/unit_tests/data/packages/org.tizen.alarm.xml b/tests/unit_tests/pkg_upgrade/data/packages/org.tizen.alarm.xml similarity index 100% rename from tests/unit_tests/data/packages/org.tizen.alarm.xml rename to tests/unit_tests/pkg_upgrade/data/packages/org.tizen.alarm.xml diff --git a/tests/unit_tests/data/packages/org.tizen.app-selector.xml b/tests/unit_tests/pkg_upgrade/data/packages/org.tizen.app-selector.xml similarity index 100% rename from tests/unit_tests/data/packages/org.tizen.app-selector.xml rename to tests/unit_tests/pkg_upgrade/data/packages/org.tizen.app-selector.xml diff --git a/tests/unit_tests/data/packages/org.tizen.bluetooth.xml b/tests/unit_tests/pkg_upgrade/data/packages/org.tizen.bluetooth.xml similarity index 100% rename from tests/unit_tests/data/packages/org.tizen.bluetooth.xml rename to tests/unit_tests/pkg_upgrade/data/packages/org.tizen.bluetooth.xml diff --git a/tests/unit_tests/data/rw/list.txt b/tests/unit_tests/pkg_upgrade/data/rw/list.txt similarity index 100% rename from tests/unit_tests/data/rw/list.txt rename to tests/unit_tests/pkg_upgrade/data/rw/list.txt diff --git a/tests/unit_tests/src/test_backend_invoker.cc b/tests/unit_tests/pkg_upgrade/src/test_backend_invoker.cc similarity index 100% rename from tests/unit_tests/src/test_backend_invoker.cc rename to tests/unit_tests/pkg_upgrade/src/test_backend_invoker.cc diff --git a/tests/unit_tests/src/test_main.cc b/tests/unit_tests/pkg_upgrade/src/test_main.cc similarity index 100% rename from tests/unit_tests/src/test_main.cc rename to tests/unit_tests/pkg_upgrade/src/test_main.cc diff --git a/tests/unit_tests/src/test_pkg_upgrader.cc b/tests/unit_tests/pkg_upgrade/src/test_pkg_upgrader.cc similarity index 92% rename from tests/unit_tests/src/test_pkg_upgrader.cc rename to tests/unit_tests/pkg_upgrade/src/test_pkg_upgrader.cc index 5b7d750..5262384 100644 --- a/tests/unit_tests/src/test_pkg_upgrader.cc +++ b/tests/unit_tests/pkg_upgrade/src/test_pkg_upgrader.cc @@ -138,8 +138,8 @@ class PkgFinderTest : public TestFixture { EXPECT_CALL(GetMock(), pkgmgrinfo_pkginfo_filter_destroy(_)) .WillRepeatedly(Return(0)); - finder_.SetManifestDir("./tests/unit_tests/data/packages/"); - finder_.SetPreloadRwListPath("./tests/unit_tests/data/rw/list.txt"); + finder_.SetManifestDir("./tests/unit_tests/pkg_upgrade/data/packages/"); + finder_.SetPreloadRwListPath("./tests/unit_tests/pkg_upgrade/data/rw/list.txt"); } virtual void TearDown() { @@ -189,7 +189,7 @@ class PkgUpgraderTest : public PkgFinderTest { TEST_F(PkgUpgraderTest, Upgrader) { Upgrader upgrader; - upgrader.SetDbPath("./tests/unit_tests/data/db"); + upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db"); ASSERT_TRUE(upgrader.Process(&finder_)); const auto& success = upgrader.GetSuccessList(); @@ -202,7 +202,7 @@ TEST_F(PkgUpgraderTest, Upgrader) { TEST_F(PkgUpgraderTest, Upgrader_db_bck) { Upgrader upgrader; - upgrader.SetDbPath("./tests/unit_tests/data/db_bck"); + upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db_bck"); EXPECT_TRUE(upgrader.Process(&finder_)); } @@ -212,8 +212,8 @@ class PkgUpgraderTestForInvalidDbPath : public TestFixture { virtual ~PkgUpgraderTestForInvalidDbPath() {} virtual void SetUp() { - finder_.SetManifestDir("./tests/unit_tests/data/packages/"); - finder_.SetPreloadRwListPath("./tests/unit_tests/data/rw/list.txt"); + finder_.SetManifestDir("./tests/unit_tests/pkg_upgrade/data/packages/"); + finder_.SetPreloadRwListPath("./tests/unit_tests/pkg_upgrade/data/rw/list.txt"); } virtual void TearDown() { @@ -225,6 +225,6 @@ class PkgUpgraderTestForInvalidDbPath : public TestFixture { TEST_F(PkgUpgraderTestForInvalidDbPath, Upgrader_invalid_db) { Upgrader upgrader; - upgrader.SetDbPath("./tests/unit_tests/data/invalid_path"); + upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/invalid_path"); EXPECT_FALSE(upgrader.Process(&finder_)); } -- 2.34.1