[ITC][capi-ui-sticker][Non-ACR][Fix failed TCs]

Change-Id: I3364ff66d14393459699aa50761646cfa090b5e9

diff --git a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-common.c b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-common.c
index 59fb89a02db3120b433c8d8ba74fe492099b49bd..a5f71c1b0e220a3f0081e2a49f62dba7ce92b9ca 100644 (file)
--- a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-common.c
+++ b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-common.c
@@ -59,6 +59,9 @@ char* StickerGetError(int nRet)
        case STICKER_ERROR_OUT_OF_MEMORY:       szErrorVal = "STICKER_ERROR_OUT_OF_MEMORY";     break;
        case STICKER_ERROR_NOT_SUPPORTED:               szErrorVal = "STICKER_ERROR_NOT_SUPPORTED";             break;
        case STICKER_ERROR_PERMISSION_DENIED:   szErrorVal = "STICKER_ERROR_PERMISSION_DENIED"; break;
+       case STICKER_ERROR_FILE_EXISTS:                 szErrorVal = "STICKER_ERROR_FILE_EXISTS"; break;
+       case STICKER_ERROR_NO_DATA:                             szErrorVal = "STICKER_ERROR_NO_DATA"; break;
+       case STICKER_ERROR_NO_SUCH_FILE:                szErrorVal = "STICKER_ERROR_NO_SUCH_FILE"; break;
        }
 
        return szErrorVal;

diff --git a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-consumer.c b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-consumer.c
index 9a767a13e4c85855ae65b4120d996e1c20f2b64b..3914c866dfa0c21f1f261c720b9581e0b189b1b3 100755 (executable)
--- a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-consumer.c
+++ b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-consumer.c
@@ -112,7 +112,7 @@ void ITs_capi_ui_sticker_consumer_startup(void)
                FPRINTF("[%s:%d] sticker_data_create failed, error returned =(%d)\\n", __FILE__, __LINE__, nRet);
                g_bStickerCreation = false;
        }
-       nRet = sticker_data_set_uri(g_hStickerDataHandle, STICKER_DATA_URI_WEB_RESOURCE, "www.samsung.com");
+       nRet = sticker_data_set_uri(g_hStickerDataHandle, STICKER_DATA_URI_WEB_RESOURCE, "www.samsung.com/ITC/consumer");
        if ( nRet != STICKER_ERROR_NONE )
        {
                FPRINTF("[%s:%d] sticker_data_set_uri failed, error returned =(%d)\\n", __FILE__, __LINE__, nRet);
@@ -168,6 +168,13 @@ void ITs_capi_ui_sticker_consumer_cleanup(void)
                g_hStickerConsumerHandle = NULL;
        }
        if (g_hStickerProviderHandle) {
+               nRet = sticker_provider_delete_data_by_uri (g_hStickerProviderHandle, "www.samsung.com/ITC/consumer");
+               if(nRet !=0)
+               {
+                       FPRINTF("sticker_provider_delete_data_by_uri failed\\n");
+                       dlog_print(DLOG_ERROR, "NativeTCT", "sticker_provider_delete_data_by_uri failed");
+               }
+
                nRet = sticker_provider_destroy (g_hStickerProviderHandle);
                if(nRet !=0)
                {

diff --git a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-provider.c b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-provider.c
index fb546f021d8bdf053c5e34c33605281945d9992d..04a224cadf95d1d3dd4a3c21dad93275a6914769 100644 (file)
--- a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-provider.c
+++ b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker-provider.c
@@ -96,7 +96,7 @@ void ITs_capi_ui_sticker_provider_startup(void)
                FPRINTF("[%s:%d] sticker_date_create failed, error returned =(%d)\\n", __FILE__, __LINE__, nRet);
                g_bStickerCreation = false;
        }
-       nRet = sticker_data_set_uri(g_hStickerDataHandle, STICKER_DATA_URI_WEB_RESOURCE, "www.samsung.com");
+       nRet = sticker_data_set_uri(g_hStickerDataHandle, STICKER_DATA_URI_WEB_RESOURCE, "www.samsung.com/ITC/provider");
        if ( nRet != STICKER_ERROR_NONE )
        {
                FPRINTF("[%s:%d] sticker_data_set_uri failed, error returned =(%d)\\n", __FILE__, __LINE__, nRet);
@@ -155,6 +155,13 @@ void ITs_capi_ui_sticker_provider_cleanup(void)
        FPRINTF("[Line : %d][%s] TEST SUIT clean-up: ITs_capi_ui_sticker_provider_cleanup\\n", __LINE__, API_NAMESPACE);
 #endif
        if (g_hStickerProviderHandle) {
+               nRet = sticker_provider_delete_data_by_uri (g_hStickerProviderHandle, "www.samsung.com/ITC/provider");
+               if(nRet !=0)
+               {
+                       FPRINTF("sticker_provider_delete_data_by_uri failed\\n");
+                       dlog_print(DLOG_ERROR, "NativeTCT", "sticker_provider_delete_data_by_uri failed");
+               }
+
                nRet = sticker_provider_destroy (g_hStickerProviderHandle);
                if(nRet !=0)
                {

diff --git a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker.c b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker.c
index dca45324d66836a6a3267d630954a0757ac535c8..e530c8b4a53a506d9ffbc0bea6b418ad6ab7a312 100644 (file)
--- a/src/itc/capi-ui-sticker/ITs-capi-ui-sticker.c
+++ b/src/itc/capi-ui-sticker/ITs-capi-ui-sticker.c
@@ -267,7 +267,7 @@ int ITc_capi_ui_sticker_data_sticker_data_foreach_keyword_p(void)
        int nRet = -1;
 
        g_bCallbackHit = false;
-       
+
        nRet = sticker_data_add_keyword(g_hStickerDataHandle, "test");
        PRINT_RESULT(STICKER_ERROR_NONE, nRet, "sticker_data_add_keyword", StickerGetError(nRet));
 
@@ -449,8 +449,8 @@ int ITc_capi_ui_sticker_data_sticker_data_get_date_p(void)
        int nRet = -1;
        char *pszStickerDate = NULL;
        nRet = sticker_data_get_date(g_hStickerDataHandle, &pszStickerDate);
-       PRINT_RESULT(STICKER_ERROR_OPERATION_FAILED, nRet, "sticker_data_get_date", StickerGetError(nRet));
-       /* In this API if no data return from DB then STICKER_ERROR_OPERATION_FAILED error code will return  so we are checking against this error code*/
+       PRINT_RESULT(STICKER_ERROR_NO_DATA, nRet, "sticker_data_get_date", StickerGetError(nRet));
+       /* In this API if no data return from DB then STICKER_ERROR_NO_DATA error code will return  so we are checking against this error code*/
 
        FREE_MEMORY(pszStickerDate);