Revert "[ITC][accounts=svc][Non-ACR][Fixing fails in the tpk approach]"

This reverts commit 47f13dadd8c5cba768a883998d5420eed721288c.

Change-Id: I407eb63c801ff3098d167cd57172e6dc53bc5f12

diff --git a/src/itc/accounts-svc/ITs-accounts-svc-common.h b/src/itc/accounts-svc/ITs-accounts-svc-common.h
index 3182242..37f7990 100755 (executable)
--- a/src/itc/accounts-svc/ITs-accounts-svc-common.h
+++ b/src/itc/accounts-svc/ITs-accounts-svc-common.h
@@ -34,7 +34,7 @@
 #define SERVICEPROID           "http://tizen.org/account/capability/contact"
 #define TIMEOUT_CB                             10000
 #define ACCESSTOKEN             "access-token"
-#define APPID                                  "org.tizen.accounts-svc-native-itc"
+#define APPID                                  "native.accounts-svc-itc"
 #define EMAILID                                        "TCTSampleAccount@tizen.org"
 #define USERNAME                               "TizenLite Test"
 #define PATH_LEN                               1024
@@ -42,8 +42,8 @@
 #define BUFFER                                 20
 #define CALENDAR_CAPABILITY            "http://tizen.org/account/capability/calendar"
 #define CONTACT_CAPABILITY             "http://tizen.org/account/capability/contact"
-#define ACCOUNT_ICON_PATH              "/opt/home/owner/apps_rw/org.tizen.accounts-svc-native-itc/shared/res/account.png"
-#define ACCOUNT_SMALL_ICON_PATH "/opt/home/owner/apps_rw/org.tizen.accounts-svc-native-itc/shared/res/account_small.png"
+#define ACCOUNT_ICON_PATH              "/usr/apps/native-accounts-svc-itc/shared/res/account.png"
+#define ACCOUNT_SMALL_ICON_PATH "/usr/apps/native-accounts-svc-itc/shared/res/account_small.png"
 #define SERVICE_PROVIDER_ID            "http://www.tizen.org/"
 #define MULTIPLE_ACCOUNT_SUPPORT 1
 

diff --git a/src/itc/accounts-svc/ITs-accounts-svc.c b/src/itc/accounts-svc/ITs-accounts-svc.c
index 11f3454..c883200 100755 (executable)
--- a/src/itc/accounts-svc/ITs-accounts-svc.c
+++ b/src/itc/accounts-svc/ITs-accounts-svc.c
@@ -513,7 +513,6 @@ bool AccountPreConditionHelper(void)
                if ( g_AccId != -1 )
                {
                        nRet = account_delete_from_db_by_id(g_AccId);
-
                        if ( nRet != ACCOUNT_ERROR_NONE )
                        {
                                FPRINTF("[Line : %d][%s] account_delete_from_db_by_id failed, error returned = %s\\n", __LINE__, API_NAMESPACE, AccManagerGetErrorMSG(nRet));
@@ -1737,6 +1736,12 @@ int ITc_account_type_get_icon_path_p(void)
        START_TEST;
 
        char* pszGetIconPath = NULL;
+       char pIconPath[PATH_LEN] = {0,};
+       if ( false == AccManagerAppendToAppDataPath(ICONPATH, pIconPath) )
+       {
+               FPRINTF( "[Line : %d][%s] unable to get the Icon data path", __LINE__, API_NAMESPACE);
+               return 1;
+       }
 
        account_type_h accountTypeHandle;
 
@@ -1843,6 +1848,12 @@ int ITc_account_type_get_small_icon_path_p(void)
        START_TEST;
 
        char* pszGetIconPath = NULL;
+       char pIconPath[PATH_LEN] = {0,};
+       if ( false == AccManagerAppendToAppDataPath(ICONPATH, pIconPath))
+       {
+               FPRINTF( "[Line : %d][%s] unable to get the Icon data path", __LINE__, API_NAMESPACE);
+               return 1;
+       }
 
        account_type_h accountTypeHandle;