From 6c4c290416e0d7dbe1d496a4c79819a59544dd55 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Fri, 1 Jul 2016 19:50:07 +0900 Subject: [PATCH] [ITC][widget_viewer_evas][Non-ACR][Fix wrong tc] - If the content info is NULL, the widget_viewer_evas_get_content_info() returns NULL pointer. Change-Id: Iad40f746f8bbbabb2afe4ce45a273cb2cbb3cb06 Signed-off-by: Hwankyu Jhun --- .../widget_viewer_evas/ITs-widget_viewer_evas.c | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/itc/widget_viewer_evas/ITs-widget_viewer_evas.c b/src/itc/widget_viewer_evas/ITs-widget_viewer_evas.c index 8310273..a9891c1 100755 --- a/src/itc/widget_viewer_evas/ITs-widget_viewer_evas.c +++ b/src/itc/widget_viewer_evas/ITs-widget_viewer_evas.c @@ -1110,8 +1110,29 @@ int ITc_widget_viewer_evas_get_content_info_p(void) Evas_Object *widget; int w, h; int nTimeoutId = 0; + bundle *b; + int len; + char *content_info = NULL; - widget = widget_viewer_evas_add_widget(g_win, TEST_SAMPLE_APPID, NULL, 0.0f); + b = bundle_create(); + if (b == NULL) { + FPRINTF("[Line: %d][%s] bundle_create failed\\n", __LINE__, API_NAMESPACE); + return 1; + } + + if (bundle_add_str(b, "CONTENT_INFO_TEST", "value") != BUNDLE_ERROR_NONE) { + FPRINTF("[Line: %d][%s] bundle_add_str failed\\n", __LINE__, API_NAMESPACE); + bundle_free(b); + return 1; + } + + if (bundle_encode(b, (bundle_raw **)&content_info, &len) != BUNDLE_ERROR_NONE) { + FPRINTF("[Line: %d][%s] bundle_add_str failed\\n", __LINE__, API_NAMESPACE); + bundle_free(b); + return 1; + } + + widget = widget_viewer_evas_add_widget(g_win, TEST_SAMPLE_APPID, content_info, 0.0f); if ( widget == NULL ) { FPRINTF("[Line: %d][%s] widget_viewer_evas_add_widget failed\\n", __LINE__, API_NAMESPACE); @@ -1133,7 +1154,7 @@ int ITc_widget_viewer_evas_get_content_info_p(void) ecore_timer_add(TIMEOUT_CB, WidgetViewerTimeout, NULL); elm_run(); - if ( g_pContentString == NULL ) + if ( g_pContentString == NULL || strcmp(g_pContentString, content_info) != 0 ) { FPRINTF("[Line: %d][%s] widget_viewer_evas_get_content_info failed. \\n", __LINE__, API_NAMESPACE); widget_viewer_evas_set_permanent_delete(widget, 1); @@ -1145,6 +1166,8 @@ int ITc_widget_viewer_evas_get_content_info_p(void) FPRINTF("[Line: %d][%s] widget_viewer_evas_get_content_info passed, content is: %s\\n", __LINE__, API_NAMESPACE, g_pContentString); } + bundle_free(b); + free(content_info); widget_viewer_evas_set_permanent_delete(widget, 1); evas_object_del(widget); return 0; -- 2.7.4