From 23b58cd276c18716e1201cd9bbe4d077b8c832b2 Mon Sep 17 00:00:00 2001 From: Karol Pawlowski Date: Mon, 18 Feb 2013 11:44:53 +0100 Subject: [PATCH] Renaming tests binaries [Issue#] LINUXWRT-130 [Problem] Tests binaries should be named -tests- [Cause] N/A [Solution] N/A [Verification] Build wrt-commons repository Change-Id: I09e8be4b79dda7fe03818aeb869af3fb6fa73d74 --- packaging/wrt-commons.spec | 4 +- tests/CMakeLists.txt | 10 ++++- tests/{dpl => }/core/CMakeLists.txt | 42 ++++++++++----------- tests/{dpl => }/core/DESCRIPTION | 0 tests/{dpl => }/core/data/sample.zip | Bin tests/{dpl/utils => core}/main.cpp | 0 tests/{dpl => }/core/test_address.cpp | 0 tests/{dpl => }/core/test_binary_queue.cpp | 0 tests/{dpl => }/core/test_fast_delegate.cpp | 0 tests/{dpl => }/core/test_foreach.cpp | 0 .../core/test_log_unhandled_exception.cpp | 0 tests/{dpl => }/core/test_once.cpp | 0 tests/{dpl => }/core/test_scoped_array.cpp | 0 tests/{dpl => }/core/test_scoped_close.cpp | 0 tests/{dpl => }/core/test_scoped_fclose.cpp | 0 tests/{dpl => }/core/test_scoped_free.cpp | 0 tests/{dpl => }/core/test_scoped_ptr.cpp | 0 tests/{dpl => }/core/test_semaphore.cpp | 0 tests/{dpl => }/core/test_serialization.cpp | 0 tests/{dpl => }/core/test_shared_ptr.cpp | 0 tests/{dpl => }/core/test_string.cpp | 0 tests/{dpl => }/core/test_thread.cpp | 0 tests/{dpl => }/core/test_type_list.cpp | 0 tests/{dpl => }/core/test_zip_input.cpp | 0 tests/dao/CMakeLists.txt | 3 +- tests/{dpl => }/db/CMakeLists.txt | 10 ++--- tests/{dpl/event => db}/main.cpp | 0 tests/{dpl => }/db/orm/CMakeLists.txt | 0 tests/{dpl => }/db/orm/dpl_orm_test_db | 0 tests/{dpl => }/db/orm/dpl_orm_test_db_definitions | 0 .../db/orm/dpl_orm_test_db_sql_generator.h | 0 .../db/orm/dpl_orm_test_db_sql_generator.h.gch | Bin tests/{dpl => }/db/orm/generator_dpl_orm_test.h | 0 tests/{dpl => }/db/test_orm.cpp | 0 tests/{dpl => }/db/test_sql_connection.cpp | 0 tests/{dpl => }/dbus/CMakeLists.txt | 16 ++++---- tests/dbus/data/org.tizen.DBusTestService.service | 3 ++ tests/{dpl => }/dbus/dbus_test.cpp | 0 tests/{dpl => }/dbus/dbus_test.h | 0 tests/{dpl => }/dbus/main.cpp | 0 tests/{dpl => }/dbus/test_cases.cpp | 0 tests/{dpl => }/dbus/test_service.cpp | 0 tests/dpl/CMakeLists.txt | 29 -------------- tests/dpl/README | 13 ------- tests/dpl/core/.swp | Bin 12288 -> 0 bytes .../dbus/data/org.tizen.DBusTestService.service | 3 -- tests/{dpl => }/event/CMakeLists.txt | 12 +++--- tests/{dpl/db => event}/main.cpp | 0 tests/{dpl => }/event/test_controller.cpp | 0 tests/{dpl => }/event/test_event_support.cpp | 0 tests/{dpl => }/event/test_ic_delegate.cpp | 0 tests/{dpl => }/event/test_property.cpp | 0 .../CMakeLists.txt | 6 +-- .../files/CMakeLists.txt | 0 .../localization => files_localization}/files/one | 0 .../localization => files_localization}/files/two | 0 .../dpl/wrt-dao-ro/common_dao_types.h | 0 .../mockup_include/dpl/wrt-dao-rw/widget_dao.h | 0 .../mockup_src/widget_dao.cpp | 0 .../test_localization.cpp | 0 .../test_suite01.cpp | 0 .../CMakeLists.txt | 11 +++--- .../Localization_testcases.cpp | 0 .../misc_unit => localizationTagsProvider}/README | 0 .../tests_miscunit.cpp | 0 tests/{dpl => }/test/CMakeLists.txt | 6 +-- tests/{dpl => }/test/main.cpp | 0 tests/{dpl => }/test/runner_child.cpp | 0 tests/unit_tests/CMakeLists.txt | 19 ---------- tests/{dpl => }/unused/test_caller.cpp | 0 tests/{dpl => }/unused/test_crypto_hash.cpp | 0 tests/{dpl => }/unused/test_message_queue.cpp | 0 tests/{dpl => }/unused/test_shm.cpp | 0 tests/{dpl => }/unused/test_sql_connection.cpp | 0 tests/{dpl => }/unused/test_task.cpp | 0 tests/{dpl => }/utils/CMakeLists.txt | 10 ++--- tests/{dpl => }/utils/bash_utils.cpp | 0 tests/{dpl/core => utils}/main.cpp | 0 tests/{dpl => }/utils/widget_version.cpp | 0 tests/{dpl => }/utils/wrt_utility.cpp | 0 80 files changed, 69 insertions(+), 128 deletions(-) rename tests/{dpl => }/core/CMakeLists.txt (55%) rename tests/{dpl => }/core/DESCRIPTION (100%) rename tests/{dpl => }/core/data/sample.zip (100%) rename tests/{dpl/utils => core}/main.cpp (100%) rename tests/{dpl => }/core/test_address.cpp (100%) rename tests/{dpl => }/core/test_binary_queue.cpp (100%) rename tests/{dpl => }/core/test_fast_delegate.cpp (100%) rename tests/{dpl => }/core/test_foreach.cpp (100%) rename tests/{dpl => }/core/test_log_unhandled_exception.cpp (100%) rename tests/{dpl => }/core/test_once.cpp (100%) rename tests/{dpl => }/core/test_scoped_array.cpp (100%) rename tests/{dpl => }/core/test_scoped_close.cpp (100%) rename tests/{dpl => }/core/test_scoped_fclose.cpp (100%) rename tests/{dpl => }/core/test_scoped_free.cpp (100%) rename tests/{dpl => }/core/test_scoped_ptr.cpp (100%) rename tests/{dpl => }/core/test_semaphore.cpp (100%) rename tests/{dpl => }/core/test_serialization.cpp (100%) rename tests/{dpl => }/core/test_shared_ptr.cpp (100%) rename tests/{dpl => }/core/test_string.cpp (100%) rename tests/{dpl => }/core/test_thread.cpp (100%) rename tests/{dpl => }/core/test_type_list.cpp (100%) rename tests/{dpl => }/core/test_zip_input.cpp (100%) rename tests/{dpl => }/db/CMakeLists.txt (86%) rename tests/{dpl/event => db}/main.cpp (100%) rename tests/{dpl => }/db/orm/CMakeLists.txt (100%) rename tests/{dpl => }/db/orm/dpl_orm_test_db (100%) rename tests/{dpl => }/db/orm/dpl_orm_test_db_definitions (100%) rename tests/{dpl => }/db/orm/dpl_orm_test_db_sql_generator.h (100%) rename tests/{dpl => }/db/orm/dpl_orm_test_db_sql_generator.h.gch (100%) rename tests/{dpl => }/db/orm/generator_dpl_orm_test.h (100%) rename tests/{dpl => }/db/test_orm.cpp (100%) rename tests/{dpl => }/db/test_sql_connection.cpp (100%) rename tests/{dpl => }/dbus/CMakeLists.txt (83%) create mode 100644 tests/dbus/data/org.tizen.DBusTestService.service rename tests/{dpl => }/dbus/dbus_test.cpp (100%) rename tests/{dpl => }/dbus/dbus_test.h (100%) rename tests/{dpl => }/dbus/main.cpp (100%) rename tests/{dpl => }/dbus/test_cases.cpp (100%) rename tests/{dpl => }/dbus/test_service.cpp (100%) delete mode 100644 tests/dpl/CMakeLists.txt delete mode 100644 tests/dpl/README delete mode 100644 tests/dpl/core/.swp delete mode 100644 tests/dpl/dbus/data/org.tizen.DBusTestService.service rename tests/{dpl => }/event/CMakeLists.txt (78%) rename tests/{dpl/db => event}/main.cpp (100%) rename tests/{dpl => }/event/test_controller.cpp (100%) rename tests/{dpl => }/event/test_event_support.cpp (100%) rename tests/{dpl => }/event/test_ic_delegate.cpp (100%) rename tests/{dpl => }/event/test_property.cpp (100%) rename tests/{dpl/localization => files_localization}/CMakeLists.txt (90%) rename tests/{dpl/localization => files_localization}/files/CMakeLists.txt (100%) rename tests/{dpl/localization => files_localization}/files/one (100%) rename tests/{dpl/localization => files_localization}/files/two (100%) rename tests/{dpl/localization => files_localization}/mockup_include/dpl/wrt-dao-ro/common_dao_types.h (100%) rename tests/{dpl/localization => files_localization}/mockup_include/dpl/wrt-dao-rw/widget_dao.h (100%) rename tests/{dpl/localization => files_localization}/mockup_src/widget_dao.cpp (100%) rename tests/{dpl/localization => files_localization}/test_localization.cpp (100%) rename tests/{dpl/localization => files_localization}/test_suite01.cpp (100%) rename tests/{unit_tests/misc_unit => localizationTagsProvider}/CMakeLists.txt (76%) rename tests/{unit_tests/misc_unit => localizationTagsProvider}/Localization_testcases.cpp (100%) rename tests/{unit_tests/misc_unit => localizationTagsProvider}/README (100%) rename tests/{unit_tests/misc_unit => localizationTagsProvider}/tests_miscunit.cpp (100%) rename tests/{dpl => }/test/CMakeLists.txt (88%) rename tests/{dpl => }/test/main.cpp (100%) rename tests/{dpl => }/test/runner_child.cpp (100%) delete mode 100644 tests/unit_tests/CMakeLists.txt rename tests/{dpl => }/unused/test_caller.cpp (100%) rename tests/{dpl => }/unused/test_crypto_hash.cpp (100%) rename tests/{dpl => }/unused/test_message_queue.cpp (100%) rename tests/{dpl => }/unused/test_shm.cpp (100%) rename tests/{dpl => }/unused/test_sql_connection.cpp (100%) rename tests/{dpl => }/unused/test_task.cpp (100%) rename tests/{dpl => }/utils/CMakeLists.txt (83%) rename tests/{dpl => }/utils/bash_utils.cpp (100%) rename tests/{dpl/core => utils}/main.cpp (100%) rename tests/{dpl => }/utils/widget_version.cpp (100%) rename tests/{dpl => }/utils/wrt_utility.cpp (100%) diff --git a/packaging/wrt-commons.spec b/packaging/wrt-commons.spec index cf92fb0..e0008d9 100644 --- a/packaging/wrt-commons.spec +++ b/packaging/wrt-commons.spec @@ -139,9 +139,7 @@ echo "[WRT] wrt-commons postinst done ..." %attr(755,root,root) %{_bindir}/wrt_commons_create_clean_db.sh %attr(755,root,root) %{_bindir}/wrt_commons_reset_db.sh %if %{with_tests} - %attr(755,root,root) %{_bindir}/dpl-tests-* - %attr(755,root,root) %{_bindir}/dpl-dbus-test-service - %attr(755,root,root) %{_bindir}/wrt-tests-* + %attr(755,root,root) %{_bindir}/wrt-commons-tests-* %attr(755,root,root) %{_bindir}/wrt_dao_tests_prepare_db.sh %{_datadir}/dbus-1/services/org.tizen.DBusTestService.service /opt/share/wrt/wrt-commons/tests/* diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9a9007c..8ebf885 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,9 +11,15 @@ WRT_ADD_INTERNAL_DEPENDENCIES( ${TARGET_DPL_TEST_ENGINE_EFL} ) +ADD_SUBDIRECTORY(core) ADD_SUBDIRECTORY(dao) -ADD_SUBDIRECTORY(dpl) -ADD_SUBDIRECTORY(unit_tests) +ADD_SUBDIRECTORY(db) +ADD_SUBDIRECTORY(dbus) +ADD_SUBDIRECTORY(event) +#ADD_SUBDIRECTORY(files_localization) TODO localization mockups need to be fixed +ADD_SUBDIRECTORY(localizationTagsProvider) +ADD_SUBDIRECTORY(utils) +ADD_SUBDIRECTORY(test) # Rollback CXX flags #SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_BACKUP}) \ No newline at end of file diff --git a/tests/dpl/core/CMakeLists.txt b/tests/core/CMakeLists.txt similarity index 55% rename from tests/dpl/core/CMakeLists.txt rename to tests/core/CMakeLists.txt index 48d2c93..9e7ffa4 100644 --- a/tests/dpl/core/CMakeLists.txt +++ b/tests/core/CMakeLists.txt @@ -26,29 +26,29 @@ # generating proper output files # -SET(TARGET_NAME "dpl-tests-core") +SET(TARGET_NAME "wrt-commons-tests-core") # Set DPL tests sources SET(DPL_TESTS_CORE_SOURCES - ${TESTS_DPL_DIR}/core/main.cpp - ${TESTS_DPL_DIR}/core/test_address.cpp - ${TESTS_DPL_DIR}/core/test_binary_queue.cpp - ${TESTS_DPL_DIR}/core/test_foreach.cpp - ${TESTS_DPL_DIR}/core/test_fast_delegate.cpp - ${TESTS_DPL_DIR}/core/test_log_unhandled_exception.cpp - ${TESTS_DPL_DIR}/core/test_once.cpp - ${TESTS_DPL_DIR}/core/test_serialization.cpp - ${TESTS_DPL_DIR}/core/test_scoped_array.cpp - ${TESTS_DPL_DIR}/core/test_scoped_close.cpp - ${TESTS_DPL_DIR}/core/test_scoped_fclose.cpp - ${TESTS_DPL_DIR}/core/test_scoped_free.cpp - ${TESTS_DPL_DIR}/core/test_scoped_ptr.cpp - ${TESTS_DPL_DIR}/core/test_semaphore.cpp - ${TESTS_DPL_DIR}/core/test_shared_ptr.cpp - ${TESTS_DPL_DIR}/core/test_string.cpp - ${TESTS_DPL_DIR}/core/test_thread.cpp - ${TESTS_DPL_DIR}/core/test_type_list.cpp - ${TESTS_DPL_DIR}/core/test_zip_input.cpp + ${TESTS_DIR}/core/main.cpp + ${TESTS_DIR}/core/test_address.cpp + ${TESTS_DIR}/core/test_binary_queue.cpp + ${TESTS_DIR}/core/test_foreach.cpp + ${TESTS_DIR}/core/test_fast_delegate.cpp + ${TESTS_DIR}/core/test_log_unhandled_exception.cpp + ${TESTS_DIR}/core/test_once.cpp + ${TESTS_DIR}/core/test_serialization.cpp + ${TESTS_DIR}/core/test_scoped_array.cpp + ${TESTS_DIR}/core/test_scoped_close.cpp + ${TESTS_DIR}/core/test_scoped_fclose.cpp + ${TESTS_DIR}/core/test_scoped_free.cpp + ${TESTS_DIR}/core/test_scoped_ptr.cpp + ${TESTS_DIR}/core/test_semaphore.cpp + ${TESTS_DIR}/core/test_shared_ptr.cpp + ${TESTS_DIR}/core/test_string.cpp + ${TESTS_DIR}/core/test_thread.cpp + ${TESTS_DIR}/core/test_type_list.cpp + ${TESTS_DIR}/core/test_zip_input.cpp ) WRT_TEST_ADD_INTERNAL_DEPENDENCIES(${TARGET_NAME} ${TARGET_DPL_EFL}) @@ -56,6 +56,6 @@ WRT_TEST_BUILD(${TARGET_NAME} ${DPL_TESTS_CORE_SOURCES}) WRT_TEST_INSTALL(${TARGET_NAME}) INSTALL(FILES - ${TESTS_DPL_DIR}/core/data/sample.zip + ${TESTS_DIR}/core/data/sample.zip DESTINATION /opt/share/wrt/wrt-commons/tests/core ) diff --git a/tests/dpl/core/DESCRIPTION b/tests/core/DESCRIPTION similarity index 100% rename from tests/dpl/core/DESCRIPTION rename to tests/core/DESCRIPTION diff --git a/tests/dpl/core/data/sample.zip b/tests/core/data/sample.zip similarity index 100% rename from tests/dpl/core/data/sample.zip rename to tests/core/data/sample.zip diff --git a/tests/dpl/utils/main.cpp b/tests/core/main.cpp similarity index 100% rename from tests/dpl/utils/main.cpp rename to tests/core/main.cpp diff --git a/tests/dpl/core/test_address.cpp b/tests/core/test_address.cpp similarity index 100% rename from tests/dpl/core/test_address.cpp rename to tests/core/test_address.cpp diff --git a/tests/dpl/core/test_binary_queue.cpp b/tests/core/test_binary_queue.cpp similarity index 100% rename from tests/dpl/core/test_binary_queue.cpp rename to tests/core/test_binary_queue.cpp diff --git a/tests/dpl/core/test_fast_delegate.cpp b/tests/core/test_fast_delegate.cpp similarity index 100% rename from tests/dpl/core/test_fast_delegate.cpp rename to tests/core/test_fast_delegate.cpp diff --git a/tests/dpl/core/test_foreach.cpp b/tests/core/test_foreach.cpp similarity index 100% rename from tests/dpl/core/test_foreach.cpp rename to tests/core/test_foreach.cpp diff --git a/tests/dpl/core/test_log_unhandled_exception.cpp b/tests/core/test_log_unhandled_exception.cpp similarity index 100% rename from tests/dpl/core/test_log_unhandled_exception.cpp rename to tests/core/test_log_unhandled_exception.cpp diff --git a/tests/dpl/core/test_once.cpp b/tests/core/test_once.cpp similarity index 100% rename from tests/dpl/core/test_once.cpp rename to tests/core/test_once.cpp diff --git a/tests/dpl/core/test_scoped_array.cpp b/tests/core/test_scoped_array.cpp similarity index 100% rename from tests/dpl/core/test_scoped_array.cpp rename to tests/core/test_scoped_array.cpp diff --git a/tests/dpl/core/test_scoped_close.cpp b/tests/core/test_scoped_close.cpp similarity index 100% rename from tests/dpl/core/test_scoped_close.cpp rename to tests/core/test_scoped_close.cpp diff --git a/tests/dpl/core/test_scoped_fclose.cpp b/tests/core/test_scoped_fclose.cpp similarity index 100% rename from tests/dpl/core/test_scoped_fclose.cpp rename to tests/core/test_scoped_fclose.cpp diff --git a/tests/dpl/core/test_scoped_free.cpp b/tests/core/test_scoped_free.cpp similarity index 100% rename from tests/dpl/core/test_scoped_free.cpp rename to tests/core/test_scoped_free.cpp diff --git a/tests/dpl/core/test_scoped_ptr.cpp b/tests/core/test_scoped_ptr.cpp similarity index 100% rename from tests/dpl/core/test_scoped_ptr.cpp rename to tests/core/test_scoped_ptr.cpp diff --git a/tests/dpl/core/test_semaphore.cpp b/tests/core/test_semaphore.cpp similarity index 100% rename from tests/dpl/core/test_semaphore.cpp rename to tests/core/test_semaphore.cpp diff --git a/tests/dpl/core/test_serialization.cpp b/tests/core/test_serialization.cpp similarity index 100% rename from tests/dpl/core/test_serialization.cpp rename to tests/core/test_serialization.cpp diff --git a/tests/dpl/core/test_shared_ptr.cpp b/tests/core/test_shared_ptr.cpp similarity index 100% rename from tests/dpl/core/test_shared_ptr.cpp rename to tests/core/test_shared_ptr.cpp diff --git a/tests/dpl/core/test_string.cpp b/tests/core/test_string.cpp similarity index 100% rename from tests/dpl/core/test_string.cpp rename to tests/core/test_string.cpp diff --git a/tests/dpl/core/test_thread.cpp b/tests/core/test_thread.cpp similarity index 100% rename from tests/dpl/core/test_thread.cpp rename to tests/core/test_thread.cpp diff --git a/tests/dpl/core/test_type_list.cpp b/tests/core/test_type_list.cpp similarity index 100% rename from tests/dpl/core/test_type_list.cpp rename to tests/core/test_type_list.cpp diff --git a/tests/dpl/core/test_zip_input.cpp b/tests/core/test_zip_input.cpp similarity index 100% rename from tests/dpl/core/test_zip_input.cpp rename to tests/core/test_zip_input.cpp diff --git a/tests/dao/CMakeLists.txt b/tests/dao/CMakeLists.txt index 350431c..4028598 100644 --- a/tests/dao/CMakeLists.txt +++ b/tests/dao/CMakeLists.txt @@ -22,13 +22,12 @@ FILE(GLOB DAO_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/tests/dao/*DAO.cpp") # target wrt-tests-dao -SET(TARGET_DAO_TEST "wrt-tests-dao") +SET(TARGET_DAO_TEST "wrt-commons-tests-dao") WRT_TEST_INCLUDE_DIRECTORIES(${TARGET_DAO_TEST} ${PROJECT_SOURCE_DIR}/modules/support/) WRT_TEST_ADD_INTERNAL_DEPENDENCIES(${TARGET_DAO_TEST} ${TARGET_WRT_DAO_RW_LIB} ${TARGET_CUSTOM_HANDLER_DAO_RW_LIB}) WRT_TEST_BUILD(${TARGET_DAO_TEST} ${DAO_TESTS_SOURCES} tests_dao.cpp) WRT_TEST_INSTALL(${TARGET_DAO_TEST}) - # common installed files INSTALL(PROGRAMS ${PROJECT_SOURCE_DIR}/tests/dao/wrt_dao_tests_prepare_db.sh diff --git a/tests/dpl/db/CMakeLists.txt b/tests/db/CMakeLists.txt similarity index 86% rename from tests/dpl/db/CMakeLists.txt rename to tests/db/CMakeLists.txt index f4b5c22..837679e 100644 --- a/tests/dpl/db/CMakeLists.txt +++ b/tests/db/CMakeLists.txt @@ -26,13 +26,13 @@ # generating proper output files # -SET(TARGET_NAME "dpl-tests-db") +SET(TARGET_NAME "wrt-commons-tests-db") # Set DPL tests sources SET(DPL_TESTS_DB_SOURCES - ${TESTS_DPL_DIR}/db/main.cpp - ${TESTS_DPL_DIR}/db/test_orm.cpp - ${TESTS_DPL_DIR}/db/test_sql_connection.cpp + ${TESTS_DIR}/db/main.cpp + ${TESTS_DIR}/db/test_orm.cpp + ${TESTS_DIR}/db/test_sql_connection.cpp ) ADD_SUBDIRECTORY(orm) @@ -44,6 +44,6 @@ WRT_TEST_BUILD(${TARGET_NAME} ${DPL_TESTS_DB_SOURCES}) WRT_TEST_INSTALL(${TARGET_NAME}) INSTALL(FILES - ${TESTS_DPL_DIR}/db/orm/dpl_orm_test.db + ${TESTS_DIR}/db/orm/dpl_orm_test.db DESTINATION /opt/share/wrt/wrt-commons/tests/db ) diff --git a/tests/dpl/event/main.cpp b/tests/db/main.cpp similarity index 100% rename from tests/dpl/event/main.cpp rename to tests/db/main.cpp diff --git a/tests/dpl/db/orm/CMakeLists.txt b/tests/db/orm/CMakeLists.txt similarity index 100% rename from tests/dpl/db/orm/CMakeLists.txt rename to tests/db/orm/CMakeLists.txt diff --git a/tests/dpl/db/orm/dpl_orm_test_db b/tests/db/orm/dpl_orm_test_db similarity index 100% rename from tests/dpl/db/orm/dpl_orm_test_db rename to tests/db/orm/dpl_orm_test_db diff --git a/tests/dpl/db/orm/dpl_orm_test_db_definitions b/tests/db/orm/dpl_orm_test_db_definitions similarity index 100% rename from tests/dpl/db/orm/dpl_orm_test_db_definitions rename to tests/db/orm/dpl_orm_test_db_definitions diff --git a/tests/dpl/db/orm/dpl_orm_test_db_sql_generator.h b/tests/db/orm/dpl_orm_test_db_sql_generator.h similarity index 100% rename from tests/dpl/db/orm/dpl_orm_test_db_sql_generator.h rename to tests/db/orm/dpl_orm_test_db_sql_generator.h diff --git a/tests/dpl/db/orm/dpl_orm_test_db_sql_generator.h.gch b/tests/db/orm/dpl_orm_test_db_sql_generator.h.gch similarity index 100% rename from tests/dpl/db/orm/dpl_orm_test_db_sql_generator.h.gch rename to tests/db/orm/dpl_orm_test_db_sql_generator.h.gch diff --git a/tests/dpl/db/orm/generator_dpl_orm_test.h b/tests/db/orm/generator_dpl_orm_test.h similarity index 100% rename from tests/dpl/db/orm/generator_dpl_orm_test.h rename to tests/db/orm/generator_dpl_orm_test.h diff --git a/tests/dpl/db/test_orm.cpp b/tests/db/test_orm.cpp similarity index 100% rename from tests/dpl/db/test_orm.cpp rename to tests/db/test_orm.cpp diff --git a/tests/dpl/db/test_sql_connection.cpp b/tests/db/test_sql_connection.cpp similarity index 100% rename from tests/dpl/db/test_sql_connection.cpp rename to tests/db/test_sql_connection.cpp diff --git a/tests/dpl/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt similarity index 83% rename from tests/dpl/dbus/CMakeLists.txt rename to tests/dbus/CMakeLists.txt index 066ad79..4a1f338 100644 --- a/tests/dpl/dbus/CMakeLists.txt +++ b/tests/dbus/CMakeLists.txt @@ -20,20 +20,20 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(DEPENDENCIES gthread-2.0 REQUIRED) +PKG_CHECK_MODULES(DEPENDENCIES gthread-2.0 REQUIRED) -SET(TARGET_DBUS_TESTS "dpl-tests-dbus") -SET(TARGET_DBUS_TEST_SERVICE "dpl-dbus-test-service") +SET(TARGET_DBUS_TESTS "wrt-commons-tests-dbus") +SET(TARGET_DBUS_TEST_SERVICE "wrt-commons-tests-dbus-test-service") SET(DBUS_TESTS_SRCS - ${TESTS_DPL_DIR}/dbus/main.cpp - ${TESTS_DPL_DIR}/dbus/test_cases.cpp - ${TESTS_DPL_DIR}/dbus/dbus_test.cpp + ${TESTS_DIR}/dbus/main.cpp + ${TESTS_DIR}/dbus/test_cases.cpp + ${TESTS_DIR}/dbus/dbus_test.cpp ${TESTS_COMMON_DIR}/src/loop_control.cpp ) SET(DBUS_TEST_SERVICE_SRCS - ${TESTS_DPL_DIR}/dbus/test_service.cpp + ${TESTS_DIR}/dbus/test_service.cpp ${TESTS_COMMON_DIR}/src/loop_control.cpp ) @@ -58,6 +58,6 @@ WRT_TEST_BUILD(${TARGET_DBUS_TEST_SERVICE} ${DBUS_TEST_SERVICE_SRCS}) WRT_TEST_INSTALL(${TARGET_DBUS_TEST_SERVICE}) INSTALL(FILES - ${TESTS_DPL_DIR}/dbus/data/org.tizen.DBusTestService.service + ${TESTS_DIR}/dbus/data/org.tizen.DBusTestService.service DESTINATION /usr/share/dbus-1/services ) diff --git a/tests/dbus/data/org.tizen.DBusTestService.service b/tests/dbus/data/org.tizen.DBusTestService.service new file mode 100644 index 0000000..94b3d67 --- /dev/null +++ b/tests/dbus/data/org.tizen.DBusTestService.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.tizen.DBusTestService +Exec=/usr/bin/wrt-commons-tests-dbus-test-service diff --git a/tests/dpl/dbus/dbus_test.cpp b/tests/dbus/dbus_test.cpp similarity index 100% rename from tests/dpl/dbus/dbus_test.cpp rename to tests/dbus/dbus_test.cpp diff --git a/tests/dpl/dbus/dbus_test.h b/tests/dbus/dbus_test.h similarity index 100% rename from tests/dpl/dbus/dbus_test.h rename to tests/dbus/dbus_test.h diff --git a/tests/dpl/dbus/main.cpp b/tests/dbus/main.cpp similarity index 100% rename from tests/dpl/dbus/main.cpp rename to tests/dbus/main.cpp diff --git a/tests/dpl/dbus/test_cases.cpp b/tests/dbus/test_cases.cpp similarity index 100% rename from tests/dpl/dbus/test_cases.cpp rename to tests/dbus/test_cases.cpp diff --git a/tests/dpl/dbus/test_service.cpp b/tests/dbus/test_service.cpp similarity index 100% rename from tests/dpl/dbus/test_service.cpp rename to tests/dbus/test_service.cpp diff --git a/tests/dpl/CMakeLists.txt b/tests/dpl/CMakeLists.txt deleted file mode 100644 index 1dea774..0000000 --- a/tests/dpl/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# @file CMakeLists.txt -# @author Krzysztof Jackiewicz (k.jackiewicz@samsung.com) -# @version 1.0 -# @brief -# - -SET(TESTS_DPL_DIR "${TESTS_DIR}/dpl") - -ADD_SUBDIRECTORY(core) -ADD_SUBDIRECTORY(db) -ADD_SUBDIRECTORY(dbus) -ADD_SUBDIRECTORY(event) -#ADD_SUBDIRECTORY(localization) TODO localization mockups need to be fixed -ADD_SUBDIRECTORY(utils) -ADD_SUBDIRECTORY(test) diff --git a/tests/dpl/README b/tests/dpl/README deleted file mode 100644 index 6641953..0000000 --- a/tests/dpl/README +++ /dev/null @@ -1,13 +0,0 @@ -Unit tests for dpl library functionality. -There are 6 binaries: dpl-dbus-test-service, dpl-tests-core, dpl-tests-db, -dpl-tests-dbus, dpl-tests-event, dpl-tests-utils. -All binaries are using our test framework - it allows to use different types of -output. Text output shows results on console - green passed. -To run: -1. Install wrt-extra on target -2. Run for f in /usr/bin/dpl-tests-*; do $f --output=text; done - -Automatic: YES -Included in Daily Build: YES (http://build01.sprc.samsung.pl/browse/LINUXNGWAP-INT) -Included in Gerrit Builds: YES (http://build01.sprc.samsung.pl/browse/LINUXNGWAP-GERRIT) -Number of test cases: 151 \ No newline at end of file diff --git a/tests/dpl/core/.swp b/tests/dpl/core/.swp deleted file mode 100644 index e25a05b48227470164a5b546ec0bb135d5e190aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI%ze>YE90%~Ln~N6p0qP%cEBzygqv+yLaH;EY&0U&<^m1MGIE2;hgAC*2+v2bf#IC7bX!#rnCWd7AgCEw=r#0 kM9HK-7KA2Ms=C4l59(+mT%Vs7stBq=N~iLC)IBEn07(a^&j0`b diff --git a/tests/dpl/dbus/data/org.tizen.DBusTestService.service b/tests/dpl/dbus/data/org.tizen.DBusTestService.service deleted file mode 100644 index f024543..0000000 --- a/tests/dpl/dbus/data/org.tizen.DBusTestService.service +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.tizen.DBusTestService -Exec=/usr/bin/dpl-dbus-test-service diff --git a/tests/dpl/event/CMakeLists.txt b/tests/event/CMakeLists.txt similarity index 78% rename from tests/dpl/event/CMakeLists.txt rename to tests/event/CMakeLists.txt index de3db4a..08fa4fa 100644 --- a/tests/dpl/event/CMakeLists.txt +++ b/tests/event/CMakeLists.txt @@ -26,15 +26,15 @@ # generating proper output files # -SET(TARGET_NAME "dpl-tests-event") +SET(TARGET_NAME "wrt-commons-tests-event") # Set DPL tests sources SET(DPL_TESTS_EVENT_SOURCES - ${TESTS_DPL_DIR}/event/main.cpp - ${TESTS_DPL_DIR}/event/test_controller.cpp - ${TESTS_DPL_DIR}/event/test_event_support.cpp - ${TESTS_DPL_DIR}/event/test_ic_delegate.cpp - ${TESTS_DPL_DIR}/event/test_property.cpp + ${TESTS_DIR}/event/main.cpp + ${TESTS_DIR}/event/test_controller.cpp + ${TESTS_DIR}/event/test_event_support.cpp + ${TESTS_DIR}/event/test_ic_delegate.cpp + ${TESTS_DIR}/event/test_property.cpp ) WRT_TEST_ADD_INTERNAL_DEPENDENCIES(${TARGET_NAME} ${TARGET_DPL_EVENT_EFL}) diff --git a/tests/dpl/db/main.cpp b/tests/event/main.cpp similarity index 100% rename from tests/dpl/db/main.cpp rename to tests/event/main.cpp diff --git a/tests/dpl/event/test_controller.cpp b/tests/event/test_controller.cpp similarity index 100% rename from tests/dpl/event/test_controller.cpp rename to tests/event/test_controller.cpp diff --git a/tests/dpl/event/test_event_support.cpp b/tests/event/test_event_support.cpp similarity index 100% rename from tests/dpl/event/test_event_support.cpp rename to tests/event/test_event_support.cpp diff --git a/tests/dpl/event/test_ic_delegate.cpp b/tests/event/test_ic_delegate.cpp similarity index 100% rename from tests/dpl/event/test_ic_delegate.cpp rename to tests/event/test_ic_delegate.cpp diff --git a/tests/dpl/event/test_property.cpp b/tests/event/test_property.cpp similarity index 100% rename from tests/dpl/event/test_property.cpp rename to tests/event/test_property.cpp diff --git a/tests/dpl/localization/CMakeLists.txt b/tests/files_localization/CMakeLists.txt similarity index 90% rename from tests/dpl/localization/CMakeLists.txt rename to tests/files_localization/CMakeLists.txt index a50727a..37d79c1 100644 --- a/tests/dpl/localization/CMakeLists.txt +++ b/tests/files_localization/CMakeLists.txt @@ -26,11 +26,11 @@ # generating proper output files # -SET(TARGET_LOC "dpl-tests-loc") +SET(TARGET_LOC "wrt-commons-tests-loc") SET(LOC_TESTS_SOURCES - ${DPL_TESTS_DIR}/localization/test_localization.cpp - ${DPL_TESTS_DIR}/localization/test_suite01.cpp + ${TESTS_DIR}/files_localization/test_localization.cpp + ${TESTS_DIR}/files_localization/test_suite01.cpp #${DPL_TESTS_DIR}/localization/mockup_src/widget_dao.cpp #${PROJECT_SOURCE_DIR}/modules/localization/src/localization_utils.cpp #${PROJECT_SOURCE_DIR}/modules/localization/src/w3c_file_localization.cpp diff --git a/tests/dpl/localization/files/CMakeLists.txt b/tests/files_localization/files/CMakeLists.txt similarity index 100% rename from tests/dpl/localization/files/CMakeLists.txt rename to tests/files_localization/files/CMakeLists.txt diff --git a/tests/dpl/localization/files/one b/tests/files_localization/files/one similarity index 100% rename from tests/dpl/localization/files/one rename to tests/files_localization/files/one diff --git a/tests/dpl/localization/files/two b/tests/files_localization/files/two similarity index 100% rename from tests/dpl/localization/files/two rename to tests/files_localization/files/two diff --git a/tests/dpl/localization/mockup_include/dpl/wrt-dao-ro/common_dao_types.h b/tests/files_localization/mockup_include/dpl/wrt-dao-ro/common_dao_types.h similarity index 100% rename from tests/dpl/localization/mockup_include/dpl/wrt-dao-ro/common_dao_types.h rename to tests/files_localization/mockup_include/dpl/wrt-dao-ro/common_dao_types.h diff --git a/tests/dpl/localization/mockup_include/dpl/wrt-dao-rw/widget_dao.h b/tests/files_localization/mockup_include/dpl/wrt-dao-rw/widget_dao.h similarity index 100% rename from tests/dpl/localization/mockup_include/dpl/wrt-dao-rw/widget_dao.h rename to tests/files_localization/mockup_include/dpl/wrt-dao-rw/widget_dao.h diff --git a/tests/dpl/localization/mockup_src/widget_dao.cpp b/tests/files_localization/mockup_src/widget_dao.cpp similarity index 100% rename from tests/dpl/localization/mockup_src/widget_dao.cpp rename to tests/files_localization/mockup_src/widget_dao.cpp diff --git a/tests/dpl/localization/test_localization.cpp b/tests/files_localization/test_localization.cpp similarity index 100% rename from tests/dpl/localization/test_localization.cpp rename to tests/files_localization/test_localization.cpp diff --git a/tests/dpl/localization/test_suite01.cpp b/tests/files_localization/test_suite01.cpp similarity index 100% rename from tests/dpl/localization/test_suite01.cpp rename to tests/files_localization/test_suite01.cpp diff --git a/tests/unit_tests/misc_unit/CMakeLists.txt b/tests/localizationTagsProvider/CMakeLists.txt similarity index 76% rename from tests/unit_tests/misc_unit/CMakeLists.txt rename to tests/localizationTagsProvider/CMakeLists.txt index 8429573..fb3fee7 100644 --- a/tests/unit_tests/misc_unit/CMakeLists.txt +++ b/tests/localizationTagsProvider/CMakeLists.txt @@ -19,7 +19,7 @@ # @brief # -SET(MISCUNIT_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +SET(LOCALIZATION_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) PKG_CHECK_MODULES(TEST_PKGS vconf @@ -34,10 +34,9 @@ WRT_INCLUDE_DIRECTORIES( WRT_LINK_DIRECTORIES(${TEST_PKGS_LIBRARY_DIRS}) WRT_TARGET_LINK_LIBRARIES(${TEST_PKGS_LIBRARIES}) -FILE(GLOB MISCUNIT_TESTS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*testcases.cpp") +FILE(GLOB LOCALIZATION_TESTS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*testcases.cpp") -# target wrt-test-miscunit -SET(TARGET_MISCUNIT_TEST "wrt-tests-localization") -WRT_TEST_BUILD(${TARGET_MISCUNIT_TEST} ${MISCUNIT_TESTS_SOURCES} tests_miscunit.cpp) -WRT_TEST_INSTALL(${TARGET_MISCUNIT_TEST}) +SET(TARGET_LOCALIZATION_TEST "wrt-commons-tests-localization") +WRT_TEST_BUILD(${TARGET_LOCALIZATION_TEST} ${LOCALIZATION_TESTS_SOURCES} tests_miscunit.cpp) +WRT_TEST_INSTALL(${TARGET_LOCALIZATION_TEST}) diff --git a/tests/unit_tests/misc_unit/Localization_testcases.cpp b/tests/localizationTagsProvider/Localization_testcases.cpp similarity index 100% rename from tests/unit_tests/misc_unit/Localization_testcases.cpp rename to tests/localizationTagsProvider/Localization_testcases.cpp diff --git a/tests/unit_tests/misc_unit/README b/tests/localizationTagsProvider/README similarity index 100% rename from tests/unit_tests/misc_unit/README rename to tests/localizationTagsProvider/README diff --git a/tests/unit_tests/misc_unit/tests_miscunit.cpp b/tests/localizationTagsProvider/tests_miscunit.cpp similarity index 100% rename from tests/unit_tests/misc_unit/tests_miscunit.cpp rename to tests/localizationTagsProvider/tests_miscunit.cpp diff --git a/tests/dpl/test/CMakeLists.txt b/tests/test/CMakeLists.txt similarity index 88% rename from tests/dpl/test/CMakeLists.txt rename to tests/test/CMakeLists.txt index 6e34912..1c0bf55 100644 --- a/tests/dpl/test/CMakeLists.txt +++ b/tests/test/CMakeLists.txt @@ -18,12 +18,12 @@ # @brief # -SET(TARGET_NAME "dpl-tests-test") +SET(TARGET_NAME "wrt-commons-tests-test-runner-child") # Set DPL tests sources SET(DPL_TESTS_UTIL_SOURCES - ${TESTS_DPL_DIR}/test/main.cpp - ${TESTS_DPL_DIR}/test/runner_child.cpp + ${TESTS_DIR}/test/main.cpp + ${TESTS_DIR}/test/runner_child.cpp ) #WRT_TEST_ADD_INTERNAL_DEPENDENCIES(${TARGET_NAME} ${TARGET_DPL_UTILS_EFL}) diff --git a/tests/dpl/test/main.cpp b/tests/test/main.cpp similarity index 100% rename from tests/dpl/test/main.cpp rename to tests/test/main.cpp diff --git a/tests/dpl/test/runner_child.cpp b/tests/test/runner_child.cpp similarity index 100% rename from tests/dpl/test/runner_child.cpp rename to tests/test/runner_child.cpp diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt deleted file mode 100644 index 9dfb50f..0000000 --- a/tests/unit_tests/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# @file CMakeLists.txt -# @author Lukasz Marek (l.marek@samsung.com) -# - -ADD_SUBDIRECTORY(misc_unit) diff --git a/tests/dpl/unused/test_caller.cpp b/tests/unused/test_caller.cpp similarity index 100% rename from tests/dpl/unused/test_caller.cpp rename to tests/unused/test_caller.cpp diff --git a/tests/dpl/unused/test_crypto_hash.cpp b/tests/unused/test_crypto_hash.cpp similarity index 100% rename from tests/dpl/unused/test_crypto_hash.cpp rename to tests/unused/test_crypto_hash.cpp diff --git a/tests/dpl/unused/test_message_queue.cpp b/tests/unused/test_message_queue.cpp similarity index 100% rename from tests/dpl/unused/test_message_queue.cpp rename to tests/unused/test_message_queue.cpp diff --git a/tests/dpl/unused/test_shm.cpp b/tests/unused/test_shm.cpp similarity index 100% rename from tests/dpl/unused/test_shm.cpp rename to tests/unused/test_shm.cpp diff --git a/tests/dpl/unused/test_sql_connection.cpp b/tests/unused/test_sql_connection.cpp similarity index 100% rename from tests/dpl/unused/test_sql_connection.cpp rename to tests/unused/test_sql_connection.cpp diff --git a/tests/dpl/unused/test_task.cpp b/tests/unused/test_task.cpp similarity index 100% rename from tests/dpl/unused/test_task.cpp rename to tests/unused/test_task.cpp diff --git a/tests/dpl/utils/CMakeLists.txt b/tests/utils/CMakeLists.txt similarity index 83% rename from tests/dpl/utils/CMakeLists.txt rename to tests/utils/CMakeLists.txt index b3ce494..9898084 100644 --- a/tests/dpl/utils/CMakeLists.txt +++ b/tests/utils/CMakeLists.txt @@ -18,14 +18,14 @@ # @brief # -SET(TARGET_NAME "dpl-tests-utils") +SET(TARGET_NAME "wrt-commons-tests-utils") # Set DPL tests sources SET(DPL_TESTS_UTIL_SOURCES - ${TESTS_DPL_DIR}/utils/main.cpp - ${TESTS_DPL_DIR}/utils/widget_version.cpp - ${TESTS_DPL_DIR}/utils/bash_utils.cpp - ${TESTS_DPL_DIR}/utils/wrt_utility.cpp + ${TESTS_DIR}/utils/main.cpp + ${TESTS_DIR}/utils/widget_version.cpp + ${TESTS_DIR}/utils/bash_utils.cpp + ${TESTS_DIR}/utils/wrt_utility.cpp ) #WRT_TEST_ADD_INTERNAL_DEPENDENCIES(${TARGET_NAME} ${TARGET_DPL_UTILS_EFL}) diff --git a/tests/dpl/utils/bash_utils.cpp b/tests/utils/bash_utils.cpp similarity index 100% rename from tests/dpl/utils/bash_utils.cpp rename to tests/utils/bash_utils.cpp diff --git a/tests/dpl/core/main.cpp b/tests/utils/main.cpp similarity index 100% rename from tests/dpl/core/main.cpp rename to tests/utils/main.cpp diff --git a/tests/dpl/utils/widget_version.cpp b/tests/utils/widget_version.cpp similarity index 100% rename from tests/dpl/utils/widget_version.cpp rename to tests/utils/widget_version.cpp diff --git a/tests/dpl/utils/wrt_utility.cpp b/tests/utils/wrt_utility.cpp similarity index 100% rename from tests/dpl/utils/wrt_utility.cpp rename to tests/utils/wrt_utility.cpp -- 2.7.4