From: hyunho Date: Fri, 5 Oct 2018 08:02:04 +0000 (+0900) Subject: [UTC][widget-service][Non-ACR][Remove unnecessary elm_run] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fd68153f546452609de40a148ecaaf19d68f601;p=test%2Ftct%2Fnative%2Fapi.git [UTC][widget-service][Non-ACR][Remove unnecessary elm_run] Change-Id: I0fb8c06eba5b8d12ea028f86e12ff167b8f0699e Signed-off-by: hyunho --- diff --git a/src/utc/widget_service/utc-widget_service.c b/src/utc/widget_service/utc-widget_service.c index 6cb7c4a3c..c96d53999 100755 --- a/src/utc/widget_service/utc-widget_service.c +++ b/src/utc/widget_service/utc-widget_service.c @@ -865,8 +865,6 @@ static int tc_trigger_update_p_callback(Evas_Object *widget) ret = widget_service_get_widget_instance_list("org.tizen.sample_widget", __list_cb, NULL); if (s_info.appwidget_supported == false) { assert_eq_with_exit(ret, WIDGET_ERROR_NOT_SUPPORTED); - } else { - assert_eq_with_exit(ret, WIDGET_ERROR_NONE); } return ret; @@ -888,8 +886,7 @@ int utc_widget_service_trigger_update_p(void) ret = add_a_sample_widget(tc_trigger_update_p_callback); if (s_info.appwidget_supported == false) { assert_eq_with_exit(ret, WIDGET_ERROR_NOT_SUPPORTED); - } - else { + } else { assert_eq_with_exit(ret, WIDGET_ERROR_NONE); } @@ -908,9 +905,7 @@ static int tct_async_ret_callback(test_case_cb cb, struct widget_evas_event_info assert_neq(info->widget_app_id, NULL); assert_eq_with_exit(strcmp(info->widget_app_id, "org.tizen.sample_widget"), 0); assert_eq_with_exit(info->event, WIDGET_EVENT_CREATED); - - normal_exit(0); - return 0;; + return 0; } static void _widget_create_cb(void *data, Evas_Object *obj, void *event_info) @@ -945,8 +940,6 @@ static int __lifecycle_cb(const char *widget_id, widget_lifecycle_event_e lifecy assert_eq_with_exit(ret, WIDGET_ERROR_NONE); } evas_object_del(_win); - - elm_exit(); normal_exit(0); } return 0; @@ -972,6 +965,7 @@ int add_a_sample_widget(test_case_cb cb) } evas_object_show(_win); + widget_service_set_lifecycle_event_cb("org.tizen.sample_widget", __lifecycle_cb, NULL); widget = widget_viewer_evas_add_widget(_win, "org.tizen.sample_widget", NULL, 0.0f); if (s_info.appwidget_supported == false) { assert_eq_with_exit(widget, NULL); @@ -990,11 +984,9 @@ int add_a_sample_widget(test_case_cb cb) assert_eq_with_exit(ret, WIDGET_ERROR_NONE); } - widget_service_set_lifecycle_event_cb("org.tizen.sample_widget", __lifecycle_cb, NULL); evas_object_resize(widget, w, h); evas_object_show(widget); - elm_run(); return WIDGET_ERROR_NONE; } /* Common routines for creating a widget instance - END*/ @@ -1020,8 +1012,6 @@ static int tc_change_period_p_callback(Evas_Object *widget) ret = widget_service_get_widget_instance_list("org.tizen.sample_widget", instance_list_cb, NULL); if (s_info.appwidget_supported == false) { assert_neq(ret, WIDGET_ERROR_NONE); - } else { - assert_eq_with_exit(ret, WIDGET_ERROR_NONE); } return ret; @@ -1043,7 +1033,7 @@ int utc_widget_service_change_period_p(void) assert_eq_with_exit(ret, WIDGET_ERROR_NONE); } - return s_info.is_asserted; + return ret; } static int widget_list_cb_p(const char *pkgid, const char *widget_id, int is_prime, void *data)