From cd281e3cc38d1be0c4226e692aa6ce74cd068006 Mon Sep 17 00:00:00 2001 From: Ickhee Woo Date: Mon, 11 Jul 2016 18:26:11 +0900 Subject: [PATCH] [UTC][sync-manager][Non-ACR][removed wrong API usage] Change-Id: Ieeea4e7917ed8b077e4ff7b388a7062c00eaed1c Signed-off-by: Ickhee Woo --- .../sync-manager/tct-sync-manager-core_mobile.h | 2 - .../sync-manager/tct-sync-manager-core_wearable.h | 5 -- src/utc/sync-manager/utc-sync-manager.c | 70 +--------------------- 3 files changed, 3 insertions(+), 74 deletions(-) diff --git a/src/utc/sync-manager/tct-sync-manager-core_mobile.h b/src/utc/sync-manager/tct-sync-manager-core_mobile.h index 2dc7ea7..6001b1f 100755 --- a/src/utc/sync-manager/tct-sync-manager-core_mobile.h +++ b/src/utc/sync-manager/tct-sync-manager-core_mobile.h @@ -46,7 +46,6 @@ extern int utc_sync_manager_add_data_change_sync_job_n3(void); extern int utc_sync_manager_add_data_change_sync_job_n4(void); extern int utc_sync_manager_remove_sync_job_p(void); extern int utc_sync_manager_remove_sync_job_p2(void); -extern int utc_sync_manager_remove_sync_job_p3(void); extern int utc_sync_manager_remove_sync_job_n(void); extern int utc_sync_manager_foreach_sync_job_p(void); extern int utc_sync_manager_foreach_sync_job_n(void); @@ -76,7 +75,6 @@ testcase tc_array[] = { {"utc_sync_manager_add_data_change_sync_job_n4", utc_sync_manager_add_data_change_sync_job_n4, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_remove_sync_job_p", utc_sync_manager_remove_sync_job_p, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_remove_sync_job_p2", utc_sync_manager_remove_sync_job_p2, utc_sync_manager_startup, utc_sync_manager_cleanup}, - {"utc_sync_manager_remove_sync_job_p3", utc_sync_manager_remove_sync_job_p3, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_remove_sync_job_n", utc_sync_manager_remove_sync_job_n, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_foreach_sync_job_p", utc_sync_manager_foreach_sync_job_p, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_foreach_sync_job_n", utc_sync_manager_foreach_sync_job_n, utc_sync_manager_startup, utc_sync_manager_cleanup}, diff --git a/src/utc/sync-manager/tct-sync-manager-core_wearable.h b/src/utc/sync-manager/tct-sync-manager-core_wearable.h index 796484e..6001b1f 100755 --- a/src/utc/sync-manager/tct-sync-manager-core_wearable.h +++ b/src/utc/sync-manager/tct-sync-manager-core_wearable.h @@ -19,9 +19,6 @@ #include "testcase.h" #include "tct_common.h" -#include "testcase.h" -#include "tct_common.h" - extern void utc_sync_manager_startup(void); extern void utc_sync_manager_cleanup(void); @@ -49,7 +46,6 @@ extern int utc_sync_manager_add_data_change_sync_job_n3(void); extern int utc_sync_manager_add_data_change_sync_job_n4(void); extern int utc_sync_manager_remove_sync_job_p(void); extern int utc_sync_manager_remove_sync_job_p2(void); -extern int utc_sync_manager_remove_sync_job_p3(void); extern int utc_sync_manager_remove_sync_job_n(void); extern int utc_sync_manager_foreach_sync_job_p(void); extern int utc_sync_manager_foreach_sync_job_n(void); @@ -79,7 +75,6 @@ testcase tc_array[] = { {"utc_sync_manager_add_data_change_sync_job_n4", utc_sync_manager_add_data_change_sync_job_n4, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_remove_sync_job_p", utc_sync_manager_remove_sync_job_p, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_remove_sync_job_p2", utc_sync_manager_remove_sync_job_p2, utc_sync_manager_startup, utc_sync_manager_cleanup}, - {"utc_sync_manager_remove_sync_job_p3", utc_sync_manager_remove_sync_job_p3, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_remove_sync_job_n", utc_sync_manager_remove_sync_job_n, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_foreach_sync_job_p", utc_sync_manager_foreach_sync_job_p, utc_sync_manager_startup, utc_sync_manager_cleanup}, {"utc_sync_manager_foreach_sync_job_n", utc_sync_manager_foreach_sync_job_n, utc_sync_manager_startup, utc_sync_manager_cleanup}, diff --git a/src/utc/sync-manager/utc-sync-manager.c b/src/utc/sync-manager/utc-sync-manager.c index f552952..9fd64c8 100755 --- a/src/utc/sync-manager/utc-sync-manager.c +++ b/src/utc/sync-manager/utc-sync-manager.c @@ -1096,73 +1096,9 @@ int utc_sync_manager_add_data_change_sync_job_n4(void) /** * @testcase utc_sync_manager_remove_sync_job_p * @since_tizen 2.4 - * @description Positive test case of removing on-demand sync jobs - */ -int utc_sync_manager_remove_sync_job_p(void) -{ - int ret = SYNC_ERROR_NONE; - - sync_manager_setup_adapter(); - assert(set_cb); - - sync_manager_setup_account(); - assert(created_acc); - - user_data = bundle_create(); - bundle_add_str(user_data, "str", "String user_data sample."); - - int sync_job_id = 0; - - ret = sync_manager_on_demand_sync_job(account, name_on_demand, SYNC_OPTION_NONE, user_data, &sync_job_id); - assert_eq(ret, SYNC_ERROR_NONE); - - wait_for_async(); - ret = is_callback_finished(); - assert_eq(ret, SYNC_ERROR_NONE); - is_finished = false; - - ret = sync_manager_on_demand_sync_job(NULL, name_on_demand, SYNC_OPTION_NO_RETRY, user_data, &sync_job_id); - assert_eq(ret, SYNC_ERROR_NONE); - - wait_for_async(); - ret = is_callback_finished(); - assert_eq(ret, SYNC_ERROR_NONE); - is_finished = false; - - ret = sync_manager_on_demand_sync_job(account, name_on_demand, SYNC_OPTION_EXPEDITED, NULL, &sync_job_id); - assert_eq(ret, SYNC_ERROR_NONE); - - wait_for_async(); - ret = is_callback_finished(); - assert_eq(ret, SYNC_ERROR_NONE); - is_finished = false; - - ret = sync_manager_on_demand_sync_job(NULL, name_on_demand, (SYNC_OPTION_NO_RETRY | SYNC_OPTION_EXPEDITED), NULL, &sync_job_id); - assert_eq(ret, SYNC_ERROR_NONE); - - wait_for_async(); - ret = is_callback_finished(); - assert_eq(ret, SYNC_ERROR_NONE); - is_finished = false; - - ret = sync_manager_on_demand_sync_job(NULL, name_on_demand, SYNC_OPTION_NONE, user_data, &sync_job_id); - assert_eq(ret, SYNC_ERROR_NONE); - - ret = sync_manager_remove_sync_job(sync_job_id); - assert_eq(ret, SYNC_ERROR_NONE); - - bundle_free(user_data); - - return 0; -} - - -/** - * @testcase utc_sync_manager_remove_sync_job_p2 - * @since_tizen 2.4 * @description Positive test case of removing periodic sync jobs */ -int utc_sync_manager_remove_sync_job_p2(void) +int utc_sync_manager_remove_sync_job_p(void) { int ret = SYNC_ERROR_NONE; @@ -1212,11 +1148,11 @@ int utc_sync_manager_remove_sync_job_p2(void) /** - * @testcase utc_sync_manager_remove_sync_job_p3 + * @testcase utc_sync_manager_remove_sync_job_p2 * @since_tizen 2.4 * @description Positive test case of removing data change sync jobs */ -int utc_sync_manager_remove_sync_job_p3(void) +int utc_sync_manager_remove_sync_job_p2(void) { int ret = SYNC_ERROR_NONE; -- 2.7.4