From aa416491ad49efadf74657b623368190276a0fc9 Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Tue, 2 Jun 2020 23:45:10 +0530 Subject: [PATCH] Remove calendar and clock apps dependencies Change-Id: Ic527f172ffcc326f7e0da21382950f26cbc78bd7 Signed-off-by: Amritanshu --- project_def.prop | 2 +- src/cluster_data.c | 2 +- ...group_feature_scroll_page_after_adding_widget.c | 8 +- test/function_test/group_function_apps_db.c | 382 +-------------------- test/function_test/group_function_cluster_db.c | 207 +---------- 5 files changed, 29 insertions(+), 572 deletions(-) diff --git a/project_def.prop b/project_def.prop index 66db803..f4d56e4 100755 --- a/project_def.prop +++ b/project_def.prop @@ -9,7 +9,7 @@ type = app profile = mobile-4.0 # C/CPP Sources -USER_SRCS = test/function_test/group_function_apps_db.c test/function_test/function_test.c src/apps_data.c test/unit/unit_test/unit_test_group_test/unit_test_group_result.c test/unit/unit_test/unit_test_main.c src/popup.c test/unit/unit_test/unit_test_function_test/unit_test_unit_function.c test/unit/unit_group.c test/function_test/group_function_cluster_db.c test/unit/unit_test/unit_test_group_test/unit_test_group.c src/cluster_page.c src/cluster_db.c test/feature_test/group_feature_all_page_back.c src/cluster_view.c test/feature_test/feature_test.c src/widget_viewer.c test/unit/unit_test/unit_test_function_test/unit_test_group_function.c src/main.c test/unit/unit_test/unit_test_assert_test/unit_test_assert.c test/unit/unit_test/unit_test_function_test/unit_test_log_buf_function.c src/page_indicator.c src/cluster_data.c src/add_widget_viewer/add_widget_data.c src/conf.c test/unit/unit_assert.c test/feature_test/group_feature_scroll_page_after_adding_widget.c test/unit/unit_test/unit_test_append_log/unit_test_append_log.c src/apps_view.c src/homescreen-manager.c src/menu.c test/unit/unit_log_buf.c test/unit/unit_result.c src/hw_key.c src/screen_reader_handler.c test/unit/unit_test/unit_test_function_test/unit_test_function.c test/feature_test/group_feature_scroll_to_page.c src/add_widget_viewer/add_widget_viewer.c src/apps_db.c src/apps_package_manager.c test/test_main.c src/util.c test/unit/unit.c +USER_SRCS = test/function_test/group_function_apps_db.c test/function_test/function_test.c src/apps_data.c test/unit/unit_test/unit_test_group_test/unit_test_group_result.c test/unit/unit_test/unit_test_main.c src/popup.c test/unit/unit_test/unit_test_function_test/unit_test_unit_function.c test/unit/unit_group.c test/function_test/group_function_cluster_db.c test/unit/unit_test/unit_test_group_test/unit_test_group.c src/cluster_page.c src/cluster_db.c test/feature_test/group_feature_all_page_back.c src/cluster_view.c test/feature_test/feature_test.c src/widget_viewer.c test/unit/unit_test/unit_test_function_test/unit_test_group_function.c src/main.c test/unit/unit_test/unit_test_assert_test/unit_test_assert.c test/unit/unit_test/unit_test_function_test/unit_test_log_buf_function.c src/page_indicator.c src/cluster_data.c src/add_widget_viewer/add_widget_data.c src/conf.c test/unit/unit_assert.c test/feature_test/group_feature_scroll_page_after_adding_widget.c test/feature_test/group_feature_add_widget_default_ui.c test/unit/unit_test/unit_test_append_log/unit_test_append_log.c src/apps_view.c src/homescreen-manager.c src/menu.c test/unit/unit_log_buf.c test/unit/unit_result.c src/hw_key.c src/screen_reader_handler.c test/unit/unit_test/unit_test_function_test/unit_test_function.c test/feature_test/group_feature_scroll_to_page.c src/add_widget_viewer/add_widget_viewer.c src/apps_db.c src/apps_package_manager.c test/test_main.c src/util.c test/unit/unit.c # EDC Sources USER_EDCS = diff --git a/src/cluster_data.c b/src/cluster_data.c index 5a45bf2..1ae9867 100755 --- a/src/cluster_data.c +++ b/src/cluster_data.c @@ -123,7 +123,7 @@ static void __cluster_data_insert_default_data(void) new_item->page_idx = 0; new_item->pos_y = 0; new_item->pos_x = 0; - new_item->pkg_name = strdup("org.tizen.calendar.widget"); + new_item->pkg_name = strdup("org.tizen.gallery.widget"); widget_label = add_widget_data_get_widget_label(new_item->pkg_name); new_item->widget_label = strdup(widget_label); if (widget_label) { diff --git a/test/feature_test/group_feature_scroll_page_after_adding_widget.c b/test/feature_test/group_feature_scroll_page_after_adding_widget.c index 99f4539..949f698 100755 --- a/test/feature_test/group_feature_scroll_page_after_adding_widget.c +++ b/test/feature_test/group_feature_scroll_page_after_adding_widget.c @@ -55,7 +55,7 @@ static void __group_tear_down(void) __t__cluster_view_scroll_to_page(0, false); - char *widget_id = "org.tizen.calendar.widget"; + char *widget_id = "org.tizen.gallery.widget"; char *widget_label = add_widget_data_get_widget_label(widget_id); __t__add_widget_viewer_insert_widget(widget_id, widget_label, NULL, WIDGET_SIZE_TYPE_4x4); @@ -160,7 +160,7 @@ static unit_case_func_t __case_add_to_available_page(void * data) TEST_ASSERT_EQUAL_INT(page, __get_current_page_from_scroller()); TEST_ASSERT_TRUE(__t__cluster_view_page_has_widget(page) == EINA_FALSE); - char *widget_id = "org.tizen.calendar.widget"; + char *widget_id = "org.tizen.gallery.widget"; char *widget_label = add_widget_data_get_widget_label(widget_id); __t__add_widget_viewer_insert_widget(widget_id, widget_label, NULL, WIDGET_SIZE_TYPE_4x4); @@ -227,7 +227,7 @@ static unit_case_func_t __continue_add_to_prev_available_page(void * data) TEST_ASSERT_TRUE(__t__cluster_view_get_is_scrolling() == false); TEST_ASSERT_TRUE(__t__cluster_view_page_has_widget(4) == EINA_TRUE); - char *widget_id = "org.tizen.calendar.widget"; + char *widget_id = "org.tizen.gallery.widget"; char *widget_label = add_widget_data_get_widget_label(widget_id); __t__add_widget_viewer_insert_widget(widget_id, widget_label, NULL, WIDGET_SIZE_TYPE_4x4); @@ -241,7 +241,7 @@ static unit_case_func_t __case_add_to_new_page(void * data) int page_count = __t__cluster_view_get_page_count(); if (__t__cluster_view_page_has_widget(page_count -1) == EINA_FALSE) { - char *widget_id = "org.tizen.calendar.widget"; + char *widget_id = "org.tizen.gallery.widget"; char *widget_label = add_widget_data_get_widget_label(widget_id); __t__add_widget_viewer_insert_widget(widget_id, widget_label, NULL, WIDGET_SIZE_TYPE_4x4); diff --git a/test/function_test/group_function_apps_db.c b/test/function_test/group_function_apps_db.c index 29ae6ba..3ee35cb 100755 --- a/test/function_test/group_function_apps_db.c +++ b/test/function_test/group_function_apps_db.c @@ -35,72 +35,6 @@ static struct { #define APPS_DB_NAME ".apps-data.db" -app_data_t calendar = { - INIT_VALUE, - APPS_ROOT, - TEMP_OWNER, - false, - INIT_VALUE, - "org.tizen.calendar", - "org.tizen.calendar", - "Calendar", - "/usr/apps/org.tizen.calendar/shared/res/calendar.png", - NULL, - APPS_DATA_TYPE_APP, - false, - false, - NULL, - NULL, - 0, - false, - false, - INTERNAL, - true}; - -app_data_t calendar2 = { - INIT_VALUE, - APPS_ROOT, - TEMP_OWNER, - false, - INIT_VALUE, - "org.tizen.calendar2", - "org.tizen.calendar", - "Calendar", - "/usr/apps/org.tizen.calendar/shared/res/calendar.png", - NULL, - APPS_DATA_TYPE_APP, - false, - false, - NULL, - NULL, - 0, - false, - false, - INTERNAL, - true}; - -app_data_t clock_app = { - INIT_VALUE, - APPS_ROOT, - TEMP_OWNER, - false, - INIT_VALUE, - "org.tizen.clock", - "org.tizen.clock", - "Clockr", - "/usr/apps/org.tizen.clock/shared/res/clock.png", - NULL, - APPS_DATA_TYPE_APP, - true, - false, - NULL, - NULL, - 0, - false, - false, - EXTERNAL, - true}; - app_data_t folder = { INIT_VALUE, APPS_ROOT, @@ -180,82 +114,10 @@ static unit_case_func_t __case_insert_app_item(void * data) Eina_List *list = NULL, *find_list = NULL; app_data_t * item = NULL; - /* insert calendar */ - TEST_ASSERT_TRUE(apps_db_insert(&calendar)); - - /* check calendar */ - EINA_LIST_FREE(list, item) { - __t__apps_data_item_free(item); - } - list = NULL; - apps_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - - TEST_ASSERT_EQUAL_INT(calendar.parent_db_id, item->parent_db_id); - TEST_ASSERT_EQUAL_STRING(calendar.owner, item->owner); - TEST_ASSERT_EQUAL_INT(calendar.is_folder, item->is_folder); - TEST_ASSERT_EQUAL_INT(calendar.position, item->position); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - TEST_ASSERT_EQUAL_STRING(calendar.pkg_id, item->pkg_id); - TEST_ASSERT_EQUAL_STRING(calendar.label_str, item->label_str); - TEST_ASSERT_EQUAL_STRING(calendar.icon_path_str, item->icon_path_str); - TEST_ASSERT_TRUE(item->uri == NULL); - TEST_ASSERT_EQUAL_INT(calendar.type, item->type); - TEST_ASSERT_EQUAL_INT(calendar.is_removable, item->is_removable); - TEST_ASSERT_EQUAL_INT(calendar.is_system, item->is_system); - TEST_ASSERT_EQUAL_INT(calendar.storage_type, item->storage_type); - TEST_ASSERT_EQUAL_INT(calendar.enable, item->enable); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - - /* insert clock */ - TEST_ASSERT_TRUE(apps_db_insert(&clock_app)); - - /*check calendar, clock */ - EINA_LIST_FREE(list, item) { - __t__apps_data_item_free(item); - } - list = NULL; - apps_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_INT(clock_app.parent_db_id, item->parent_db_id); - TEST_ASSERT_EQUAL_STRING(clock_app.owner, item->owner); - TEST_ASSERT_EQUAL_INT(clock_app.is_folder, item->is_folder); - TEST_ASSERT_EQUAL_INT(clock_app.position, item->position); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - TEST_ASSERT_EQUAL_STRING(clock_app.pkg_id, item->pkg_id); - TEST_ASSERT_EQUAL_STRING(clock_app.label_str, item->label_str); - TEST_ASSERT_EQUAL_STRING(clock_app.icon_path_str, item->icon_path_str); - TEST_ASSERT_TRUE(item->uri == NULL); - TEST_ASSERT_EQUAL_INT(clock_app.type, item->type); - TEST_ASSERT_EQUAL_INT(clock_app.is_removable, item->is_removable); - TEST_ASSERT_EQUAL_INT(clock_app.is_system, item->is_system); - TEST_ASSERT_EQUAL_INT(clock_app.storage_type, item->storage_type); - TEST_ASSERT_EQUAL_INT(clock_app.enable, item->enable); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - /* insert folder */ TEST_ASSERT_TRUE(apps_db_insert(&folder)); - /*check calendar, clock, folder */ + /*check folder */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -267,14 +129,6 @@ static unit_case_func_t __case_insert_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_INT(folder.parent_db_id, item->parent_db_id); TEST_ASSERT_EQUAL_STRING(folder.owner, item->owner); TEST_ASSERT_EQUAL_INT(folder.is_folder, item->is_folder); @@ -296,7 +150,7 @@ static unit_case_func_t __case_insert_app_item(void * data) /* insert shorcut */ TEST_ASSERT_TRUE(apps_db_insert(&shortcut)); - /*check calendar, clock, folder, shortcut */ + /*check folder, shortcut */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -308,14 +162,6 @@ static unit_case_func_t __case_insert_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(folder.app_id, item->app_id); find_list = eina_list_next(find_list); @@ -346,13 +192,11 @@ static unit_case_func_t __case_delete_app_item(void * data) Eina_List *list = NULL, *find_list = NULL; app_data_t * item = NULL; - /* insert calendar, clock, folder, shorcut */ - TEST_ASSERT_TRUE(apps_db_insert(&calendar)); - TEST_ASSERT_TRUE(apps_db_insert(&clock_app)); + /* insert folder, shorcut */ TEST_ASSERT_TRUE(apps_db_insert(&folder)); TEST_ASSERT_TRUE(apps_db_insert(&shortcut)); - /* check calendar, clock, folder, shortcut */ + /* check folder, shortcut */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -364,14 +208,6 @@ static unit_case_func_t __case_delete_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(folder.app_id, item->app_id); find_list = eina_list_next(find_list); @@ -384,7 +220,7 @@ static unit_case_func_t __case_delete_app_item(void * data) /* delete shortcut */ TEST_ASSERT_TRUE(apps_db_delete(&shortcut)); - /* check calendar, clock, folder */ + /* check folder */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -396,23 +232,12 @@ static unit_case_func_t __case_delete_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(folder.app_id, item->app_id); find_list = eina_list_next(find_list); TEST_ASSERT_TRUE(find_list == NULL); - /* delete clock */ - TEST_ASSERT_TRUE(apps_db_delete(&clock_app)); - - /* check calendar, folder */ + /* check folder */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -424,18 +249,11 @@ static unit_case_func_t __case_delete_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(folder.app_id, item->app_id); find_list = eina_list_next(find_list); TEST_ASSERT_TRUE(find_list == NULL); - /* delete calendar */ - TEST_ASSERT_TRUE(apps_db_delete(&calendar)); - /* check folder */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); @@ -468,138 +286,16 @@ static unit_case_func_t __case_delete_app_item(void * data) TEST_CASE_DONE(s_info.group); } -static unit_case_func_t __case_delete_by_app_id(void * data) -{ - Eina_List *list = NULL, *find_list = NULL; - app_data_t * item = NULL; - - /* insert calendar, calendar2, clock */ - TEST_ASSERT_TRUE(apps_db_insert(&calendar)); - TEST_ASSERT_TRUE(apps_db_insert(&calendar2)); - TEST_ASSERT_TRUE(apps_db_insert(&clock_app)); - - /* check calendar, calendar2, clock */ - EINA_LIST_FREE(list, item) { - __t__apps_data_item_free(item); - } - list = NULL; - apps_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar2.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - - /* delete calendar2 */ - TEST_ASSERT_TRUE(apps_db_delete_by_app_id(calendar2.app_id)); - - /* check calendar, clock */ - EINA_LIST_FREE(list, item) { - __t__apps_data_item_free(item); - } - list = NULL; - apps_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - - TEST_CASE_DONE(s_info.group); -} - -static unit_case_func_t __case_delete_by_package_id(void * data) -{ - Eina_List *list = NULL, *find_list = NULL; - app_data_t * item = NULL; - - /* insert calendar, calendar2, clock */ - TEST_ASSERT_TRUE(apps_db_insert(&calendar)); - TEST_ASSERT_TRUE(apps_db_insert(&calendar2)); - TEST_ASSERT_TRUE(apps_db_insert(&clock_app)); - - /* check calendar, calendar2, clock */ - EINA_LIST_FREE(list, item) { - __t__apps_data_item_free(item); - } - list = NULL; - apps_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar2.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - - /* delete calendar, calendar2 */ - TEST_ASSERT_TRUE(apps_db_delete_by_pkg_id(calendar.pkg_id)); - - /* check clock */ - EINA_LIST_FREE(list, item) { - __t__apps_data_item_free(item); - } - list = NULL; - apps_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - - TEST_CASE_DONE(s_info.group); -} - static unit_case_func_t __case_update_app_item(void * data) { Eina_List *list = NULL, *find_list = NULL; app_data_t * item = NULL; - /* insert calendar, clock, folder, shorcut */ - TEST_ASSERT_TRUE(apps_db_insert(&calendar)); - TEST_ASSERT_TRUE(apps_db_insert(&clock_app)); + /* insert folder, shorcut */ TEST_ASSERT_TRUE(apps_db_insert(&folder)); TEST_ASSERT_TRUE(apps_db_insert(&shortcut)); - /* check calendar, clock, folder, shortcut */ + /* check folder, shortcut */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -611,14 +307,6 @@ static unit_case_func_t __case_update_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(folder.app_id, item->app_id); find_list = eina_list_next(find_list); @@ -628,11 +316,7 @@ static unit_case_func_t __case_update_app_item(void * data) TEST_ASSERT_TRUE(find_list == NULL); - /* update calendar -> calendar2 */ - calendar2.db_id = calendar.db_id; - TEST_ASSERT_TRUE(apps_db_update(&calendar2)); - - /* check calendar2, clock, folder, shorcut */ + /* check folder, shorcut */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -644,14 +328,6 @@ static unit_case_func_t __case_update_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar2.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(folder.app_id, item->app_id); find_list = eina_list_next(find_list); @@ -661,14 +337,7 @@ static unit_case_func_t __case_update_app_item(void * data) TEST_ASSERT_TRUE(find_list == NULL); - /* delete clock */ - TEST_ASSERT_TRUE(apps_db_delete(&clock_app)); - - /* update folder -> clock */ - clock_app.db_id = folder.db_id; - TEST_ASSERT_TRUE(apps_db_update(&clock_app)); - - /* check calendar2, clock, shorcut */ + /* check shorcut */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -680,14 +349,6 @@ static unit_case_func_t __case_update_app_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar2.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(shortcut.app_id, item->app_id); find_list = eina_list_next(find_list); @@ -699,25 +360,14 @@ static unit_case_func_t __case_update_app_item(void * data) /* update shorcut */ TEST_ASSERT_TRUE(apps_db_update(&shortcut)); - /* check calendar2, clock */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } list = NULL; apps_db_get_list(&list); - TEST_ASSERT_TRUE(list != NULL); - find_list = list; - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar2.app_id, item->app_id); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); - find_list = eina_list_next(find_list); - TEST_ASSERT_TRUE(find_list == NULL); TEST_CASE_DONE(s_info.group); @@ -728,13 +378,11 @@ static unit_case_func_t __case_get_app_type(void * data) Eina_List *list = NULL, *find_list = NULL; app_data_t * item = NULL; - /* insert calendar, clock, folder, shorcut */ - TEST_ASSERT_TRUE(apps_db_insert(&calendar)); - TEST_ASSERT_TRUE(apps_db_insert(&clock_app)); + /* insert folder, shorcut */ TEST_ASSERT_TRUE(apps_db_insert(&folder)); TEST_ASSERT_TRUE(apps_db_insert(&shortcut)); - /* check calendar, clock */ + /* check folder, shorcut */ EINA_LIST_FREE(list, item) { __t__apps_data_item_free(item); } @@ -746,11 +394,11 @@ static unit_case_func_t __case_get_app_type(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar.app_id, item->app_id); + TEST_ASSERT_EQUAL_STRING(folder.app_id, item->app_id); find_list = eina_list_next(find_list); item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(clock_app.app_id, item->app_id); + TEST_ASSERT_EQUAL_STRING(shortcut.app_id, item->app_id); find_list = eina_list_next(find_list); TEST_ASSERT_TRUE(find_list == NULL); @@ -767,8 +415,6 @@ void group_function_apps_db(unit_group_t * group) TEST_CASE_ADD(s_info.group, __case_check_apps_db, NULL); TEST_CASE_ADD(s_info.group, __case_insert_app_item, NULL); TEST_CASE_ADD(s_info.group, __case_delete_app_item, NULL); - TEST_CASE_ADD(s_info.group, __case_delete_by_app_id, NULL); - TEST_CASE_ADD(s_info.group, __case_delete_by_package_id, NULL); TEST_CASE_ADD(s_info.group, __case_update_app_item, NULL); TEST_CASE_ADD(s_info.group, __case_get_app_type, NULL); diff --git a/test/function_test/group_function_cluster_db.c b/test/function_test/group_function_cluster_db.c index 7e6eadb..135acb8 100755 --- a/test/function_test/group_function_cluster_db.c +++ b/test/function_test/group_function_cluster_db.c @@ -36,22 +36,6 @@ static struct { #define CLUSTER_DB_NAME ".cluster-data.db" -widget_data_t calendar_widget = { - INIT_VALUE, - 0, - 0, - 0, - "org.tizen.calendar", - "org.tizen.calendar.widget", - "org.tizen.calendar", - WIDGET_SIZE_TYPE_4x4, - 0.0, - 1, - NULL, - NULL, - NULL, -}; - widget_data_t contact_widget = { INIT_VALUE, 0, @@ -84,22 +68,6 @@ widget_data_t contact_widget2 = { NULL, }; -widget_data_t memo_widget = { - INIT_VALUE, - 0, - 0, - 0, - "org.tizen.memo", - "org.tizen.memo.widget", - "org.tizen.memo", - WIDGET_SIZE_TYPE_4x4, - 0.0, - 1, - NULL, - NULL, - NULL, -}; - widget_data_t music_widget = { INIT_VALUE, 0, @@ -151,35 +119,6 @@ static unit_case_func_t __case_insert_widget_item(void * data) Eina_List *list = NULL, *find_list = NULL; widget_data_t * item = NULL; - /* insert calendar */ - TEST_ASSERT_TRUE(cluster_db_insert(&calendar_widget)); - - /* check calendar */ - EINA_LIST_FREE(list, item) { - __t__cluster_data_item_free(item); - } - list = NULL; - cluster_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - - TEST_ASSERT_EQUAL_INT(calendar_widget.page_idx, item->page_idx); - TEST_ASSERT_EQUAL_INT(calendar_widget.pos_y, item->pos_y); - TEST_ASSERT_EQUAL_INT(calendar_widget.pos_x, item->pos_x); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - TEST_ASSERT_EQUAL_STRING(calendar_widget.widget_label, item->widget_label); - TEST_ASSERT_EQUAL_STRING(calendar_widget.content_info, item->content_info); - TEST_ASSERT_EQUAL_INT(calendar_widget.type, item->type); - TEST_ASSERT_EQUAL_DOUBLE(calendar_widget.period, item->period); - TEST_ASSERT_EQUAL_INT(calendar_widget.allow_duplicate, item->allow_duplicate); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - /* insert contact */ TEST_ASSERT_TRUE(cluster_db_insert(&contact_widget)); @@ -195,11 +134,6 @@ static unit_case_func_t __case_insert_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_INT(contact_widget.page_idx, item->page_idx); TEST_ASSERT_EQUAL_INT(contact_widget.pos_y, item->pos_y); TEST_ASSERT_EQUAL_INT(contact_widget.pos_x, item->pos_x); @@ -213,10 +147,6 @@ static unit_case_func_t __case_insert_widget_item(void * data) TEST_ASSERT_TRUE(find_list == NULL); - /* insert memo */ - TEST_ASSERT_TRUE(cluster_db_insert(&memo_widget)); - - /*check calendar, contact, memo */ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -228,31 +158,15 @@ static unit_case_func_t __case_insert_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget.pkg_name, item->pkg_name); find_list = eina_list_next(find_list); - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_INT(memo_widget.page_idx, item->page_idx); - TEST_ASSERT_EQUAL_INT(memo_widget.pos_y, item->pos_y); - TEST_ASSERT_EQUAL_INT(memo_widget.pos_x, item->pos_x); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - TEST_ASSERT_EQUAL_STRING(memo_widget.widget_label, item->widget_label); - TEST_ASSERT_EQUAL_STRING(memo_widget.content_info, item->content_info); - TEST_ASSERT_EQUAL_INT(memo_widget.type, item->type); - TEST_ASSERT_EQUAL_DOUBLE(memo_widget.period, item->period); - TEST_ASSERT_EQUAL_INT(memo_widget.allow_duplicate, item->allow_duplicate); - find_list = eina_list_next(find_list); - TEST_ASSERT_TRUE(find_list == NULL); /* insert music */ TEST_ASSERT_TRUE(cluster_db_insert(&music_widget)); - /*check calendar, contact, memo, music */ + /*check contact, music */ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -264,18 +178,10 @@ static unit_case_func_t __case_insert_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget.pkg_name, item->pkg_name); find_list = eina_list_next(find_list); item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_INT(music_widget.page_idx, item->page_idx); TEST_ASSERT_EQUAL_INT(music_widget.pos_y, item->pos_y); TEST_ASSERT_EQUAL_INT(music_widget.pos_x, item->pos_x); @@ -297,13 +203,11 @@ static unit_case_func_t __case_delete_widget_item(void * data) Eina_List *list = NULL, *find_list = NULL; widget_data_t * item = NULL; - /* insert calendar, contact, memo, music*/ - TEST_ASSERT_TRUE(cluster_db_insert(&calendar_widget)); + /* insert contact, music*/ TEST_ASSERT_TRUE(cluster_db_insert(&contact_widget)); - TEST_ASSERT_TRUE(cluster_db_insert(&memo_widget)); TEST_ASSERT_TRUE(cluster_db_insert(&music_widget)); - /* check calendar, contact, memo, music*/ + /* check contact, music*/ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -315,18 +219,10 @@ static unit_case_func_t __case_delete_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget.pkg_name, item->pkg_name); find_list = eina_list_next(find_list); item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(music_widget.pkg_name, item->pkg_name); find_list = eina_list_next(find_list); @@ -335,7 +231,7 @@ static unit_case_func_t __case_delete_widget_item(void * data) /* delete music */ TEST_ASSERT_TRUE(cluster_db_delete(&music_widget)); - /* check calendar, contact, memo*/ + /* check contact*/ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -347,66 +243,14 @@ static unit_case_func_t __case_delete_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget.pkg_name, item->pkg_name); find_list = eina_list_next(find_list); - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - TEST_ASSERT_TRUE(find_list == NULL); /* delete contact */ TEST_ASSERT_TRUE(cluster_db_delete(&contact_widget)); - /* check calendar, memo */ - EINA_LIST_FREE(list, item) { - __t__cluster_data_item_free(item); - } - list = NULL; - cluster_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - - /* delete calendar */ - TEST_ASSERT_TRUE(cluster_db_delete(&calendar_widget)); - - /* check memo */ - EINA_LIST_FREE(list, item) { - __t__cluster_data_item_free(item); - } - list = NULL; - cluster_db_get_list(&list); - - TEST_ASSERT_TRUE(list != NULL); - - find_list = list; - - item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - TEST_ASSERT_TRUE(find_list == NULL); - - /* delete memo */ - TEST_ASSERT_TRUE(cluster_db_delete(&memo_widget)); - /* check empty list */ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); @@ -424,13 +268,11 @@ static unit_case_func_t __case_update_widget_item(void * data) Eina_List *list = NULL, *find_list = NULL; widget_data_t * item = NULL; - /* insert calendar, contact, memo, music*/ - TEST_ASSERT_TRUE(cluster_db_insert(&calendar_widget)); + /* insert contact, music*/ TEST_ASSERT_TRUE(cluster_db_insert(&contact_widget)); - TEST_ASSERT_TRUE(cluster_db_insert(&memo_widget)); TEST_ASSERT_TRUE(cluster_db_insert(&music_widget)); - /* check calendar, contact, memo, music*/ + /* check contact, music*/ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -442,19 +284,11 @@ static unit_case_func_t __case_update_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget.pkg_name, item->pkg_name); TEST_ASSERT_EQUAL_INT(WIDGET_SIZE_TYPE_4x4, item->type); find_list = eina_list_next(find_list); item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(music_widget.pkg_name, item->pkg_name); find_list = eina_list_next(find_list); @@ -464,7 +298,7 @@ static unit_case_func_t __case_update_widget_item(void * data) contact_widget2.db_id = contact_widget.db_id; TEST_ASSERT_TRUE(cluster_db_update(&contact_widget2)); - /* check calendar, contact2, memo, music*/ + /* check contact2, music*/ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -476,32 +310,17 @@ static unit_case_func_t __case_update_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(calendar_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget2.pkg_name, item->pkg_name); TEST_ASSERT_EQUAL_INT(WIDGET_SIZE_TYPE_4x2, item->type); find_list = eina_list_next(find_list); item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(music_widget.pkg_name, item->pkg_name); find_list = eina_list_next(find_list); TEST_ASSERT_TRUE(find_list == NULL); - /* delete memo */ - TEST_ASSERT_TRUE(cluster_db_delete(&memo_widget)); - - /* update calendar -> memo */ - memo_widget.db_id = calendar_widget.db_id; - TEST_ASSERT_TRUE(cluster_db_update(&memo_widget)); - - /* check memo, contact2, music */ + /* check contact2, music */ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -513,10 +332,6 @@ static unit_case_func_t __case_update_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget2.pkg_name, item->pkg_name); TEST_ASSERT_EQUAL_INT(WIDGET_SIZE_TYPE_4x2, item->type); find_list = eina_list_next(find_list); @@ -533,7 +348,7 @@ static unit_case_func_t __case_update_widget_item(void * data) /* update music */ TEST_ASSERT_TRUE(cluster_db_update(&music_widget)); - /* check memo, contact2 */ + /* check contact2 */ EINA_LIST_FREE(list, item) { __t__cluster_data_item_free(item); } @@ -545,10 +360,6 @@ static unit_case_func_t __case_update_widget_item(void * data) find_list = list; item = eina_list_data_get(find_list); - TEST_ASSERT_EQUAL_STRING(memo_widget.pkg_name, item->pkg_name); - find_list = eina_list_next(find_list); - - item = eina_list_data_get(find_list); TEST_ASSERT_EQUAL_STRING(contact_widget2.pkg_name, item->pkg_name); TEST_ASSERT_EQUAL_INT(WIDGET_SIZE_TYPE_4x2, item->type); find_list = eina_list_next(find_list); -- 2.7.4