[UTC][context,motion,push,sensor,service-adaptor,sync-manager][Non-ACR][Fix SVACE...

Change-Id: I6dcca65679bd20245b799bfe71497559df457d46
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/src/common/assert.h b/src/common/assert.h
index 56f7245..d3740f5 100755 (executable)
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -88,5 +88,15 @@
         } \
     } while (0)
 
+#define assert_eq_destroy(var, ref, app) \
+    do { \
+        if (var != ref) { \
+               app_control_destroy(app); \
+            fprintf(stderr, \
+                "\\n[TCT][%s][Line : %d] Assert fail; Values (%s == 0x%x) and (%s == 0x%x) are not equal\\n", \
+                __FILE__, __LINE__, #var, (int)var, #ref, (int)ref); \
+            return 1; \
+        } \
+    } while (0)
 
 #endif //  _ASSERT_H_

diff --git a/src/utc/context/utc-context-trigger.c b/src/utc/context/utc-context-trigger.c
index 23c267f..a1d680b 100755 (executable)
--- a/src/utc/context/utc-context-trigger.c
+++ b/src/utc/context/utc-context-trigger.c
@@ -114,6 +114,7 @@ void utc_context_trigger_startup(void)
  */
 void utc_context_trigger_cleanup(void)
 {
+       int error = CONTEXT_TRIGGER_ERROR_NONE;
        int* enabled_arr = NULL;
        int enabled_count = 0;
        int* disabled_arr = NULL;
@@ -123,7 +124,8 @@ void utc_context_trigger_cleanup(void)
        if (!is_trigger_supported)
                return;
 
-       context_trigger_get_own_rule_ids(&enabled_arr, &enabled_count, &disabled_arr, &disabled_count);
+       error = context_trigger_get_own_rule_ids(&enabled_arr, &enabled_count, &disabled_arr, &disabled_count);
+       TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);
 
        for (i = 0; i < enabled_count; i++) {
                context_trigger_disable_rule(enabled_arr[i]);
@@ -663,7 +665,7 @@ int utc_context_trigger_get_rule_by_id_p(void)
        int error = CONTEXT_TRIGGER_ERROR_NONE;
        context_trigger_rule_h rule = NULL;
        context_trigger_rule_entry_h event = NULL;
-       int rule_id;
+       int rule_id = 0;
        context_trigger_rule_h rule_result = NULL;
        const char* description = "At 15:00";
        char* des_result = NULL;
@@ -880,9 +882,15 @@ int utc_context_trigger_rule_add_entry_p(void)
        context_trigger_rule_event_create(CONTEXT_TRIGGER_EVENT_CALL, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, &e_call);
        context_trigger_rule_condition_create(CONTEXT_TRIGGER_CONDITION_WIFI, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, &c_wifi);
        context_trigger_rule_entry_add_key(c_wifi, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, CONTEXT_TRIGGER_STATE);
-       context_trigger_rule_entry_add_comparison(c_wifi, CONTEXT_TRIGGER_STATE, CONTEXT_TRIGGER_EQUAL_TO, CONTEXT_TRIGGER_STATE);
+
+       error = context_trigger_rule_entry_add_comparison(c_wifi, CONTEXT_TRIGGER_STATE, CONTEXT_TRIGGER_EQUAL_TO, CONTEXT_TRIGGER_STATE);
+       assert_eq(error, CONTEXT_TRIGGER_ERROR_NONE);
+
        context_trigger_rule_condition_create(CONTEXT_TRIGGER_CONDITION_COMMUNICATION_FREQUENCY, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, &c_comm);
-       context_trigger_rule_entry_add_option(c_comm, CONTEXT_TRIGGER_ADDRESS, CONTEXT_TRIGGER_ADDRESS);
+
+       error = context_trigger_rule_entry_add_option(c_comm, CONTEXT_TRIGGER_ADDRESS, CONTEXT_TRIGGER_ADDRESS);
+       assert_eq(error, CONTEXT_TRIGGER_ERROR_NONE);
+
        context_trigger_rule_entry_add_key(c_comm, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, CONTEXT_TRIGGER_RANK);
        context_trigger_rule_entry_add_comparison_int(c_comm, CONTEXT_TRIGGER_RANK, CONTEXT_TRIGGER_LESS_THAN, 6);
 
@@ -1025,7 +1033,9 @@ int utc_context_trigger_rule_add_entry_n2(void)
                context_trigger_rule_add_entry(rule2, e_call);
 
                // Err: Invalid referential comparison key (attribute data not provided)
-               context_trigger_rule_entry_add_key(c_wifi, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, CONTEXT_TRIGGER_BSSID);
+               error = context_trigger_rule_entry_add_key(c_wifi, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, CONTEXT_TRIGGER_BSSID);
+               TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);
+
                context_trigger_rule_entry_add_comparison(c_wifi, CONTEXT_TRIGGER_BSSID, CONTEXT_TRIGGER_EQUAL_TO, CONTEXT_TRIGGER_EVENT);
                error = context_trigger_rule_add_entry(rule2, c_wifi);
                TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_INVALID_RULE);
@@ -1050,7 +1060,10 @@ int utc_context_trigger_rule_add_entry_n2(void)
 
                // Err: Referential comparison data type not matched
                context_trigger_rule_entry_add_key(c_headphone, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, CONTEXT_TRIGGER_IS_CONNECTED);
-               context_trigger_rule_entry_add_comparison(c_headphone, CONTEXT_TRIGGER_IS_CONNECTED, CONTEXT_TRIGGER_EQUAL_TO, CONTEXT_TRIGGER_MEDIUM);
+
+               error = context_trigger_rule_entry_add_comparison(c_headphone, CONTEXT_TRIGGER_IS_CONNECTED, CONTEXT_TRIGGER_EQUAL_TO, CONTEXT_TRIGGER_MEDIUM);
+               TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);
+
                error = context_trigger_rule_add_entry(rule3, c_headphone);
                TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_INVALID_RULE);
 
@@ -1073,7 +1086,9 @@ int utc_context_trigger_rule_add_entry_n2(void)
                context_trigger_rule_add_entry(rule4, e_call3);
 
                // Err: Invalid referential option key (attribute data not provided)
-               context_trigger_rule_entry_add_option(c_comm3, CONTEXT_TRIGGER_ADDRESS, CONTEXT_TRIGGER_APP_ID);
+               error = context_trigger_rule_entry_add_option(c_comm3, CONTEXT_TRIGGER_ADDRESS, CONTEXT_TRIGGER_APP_ID);
+               assert_eq(error, CONTEXT_TRIGGER_ERROR_NONE);
+
                context_trigger_rule_entry_add_key(c_comm3, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, CONTEXT_TRIGGER_RANK);
                context_trigger_rule_entry_add_comparison_int(c_comm3, CONTEXT_TRIGGER_RANK, CONTEXT_TRIGGER_LESS_THAN, 6);
                error = context_trigger_rule_add_entry(rule4, c_comm3);
@@ -1168,6 +1183,7 @@ int utc_context_trigger_rule_set_action_app_control_p(void)
 int utc_context_trigger_rule_set_action_app_control_n(void)
 {
        int error = CONTEXT_TRIGGER_ERROR_NONE;
+       int app_err = APP_CONTROL_ERROR_NONE;
 
        bool ret = initialize_app_handle();
        assert_eq(ret, true);
@@ -1185,9 +1201,14 @@ int utc_context_trigger_rule_set_action_app_control_n(void)
 
 #ifdef MOBILE
        // Err: Invalid app id
-       app_control_create(&invalid_app);
-       app_control_set_operation(invalid_app, APP_CONTROL_OPERATION_DEFAULT);
-       app_control_set_app_id (invalid_app, "invalid_app_id");
+       app_err = app_control_create(&invalid_app);
+       assert_eq(app_err, APP_CONTROL_ERROR_NONE);
+
+       app_err = app_control_set_operation(invalid_app, APP_CONTROL_OPERATION_DEFAULT);
+       assert_eq_destroy(app_err, APP_CONTROL_ERROR_NONE, invalid_app);
+
+       app_err = app_control_set_app_id (invalid_app, "invalid_app_id");
+       assert_eq_destroy(app_err, APP_CONTROL_ERROR_NONE, invalid_app);
 
        error = context_trigger_rule_set_action_app_control(rule, invalid_app);
        app_control_destroy(invalid_app);
@@ -1195,9 +1216,15 @@ int utc_context_trigger_rule_set_action_app_control_n(void)
 
        // Err: Service application
        app_control_h service_app;
-       app_control_create(&service_app);
-       app_control_set_operation(service_app, APP_CONTROL_OPERATION_DEFAULT);
-       app_control_set_app_id (service_app, "org.tizen.testservice");
+
+       app_err = app_control_create(&service_app);
+       assert_eq(app_err, APP_CONTROL_ERROR_NONE);
+
+       app_err = app_control_set_operation(service_app, APP_CONTROL_OPERATION_DEFAULT);
+       assert_eq_destroy(app_err, APP_CONTROL_ERROR_NONE, service_app);
+
+       app_err = app_control_set_app_id (service_app, "org.tizen.testservice");
+       assert_eq_destroy(app_err, APP_CONTROL_ERROR_NONE, service_app);
 
        error = context_trigger_rule_set_action_app_control(rule, service_app);
        app_control_destroy(service_app);
@@ -1271,6 +1298,7 @@ int utc_context_trigger_rule_set_action_notification_p(void)
 int utc_context_trigger_rule_set_action_notification_n(void)
 {
        int error = CONTEXT_TRIGGER_ERROR_NONE;
+       int app_err = APP_CONTROL_ERROR_NONE;
 
        bool ret = initialize_app_handle();
        assert_eq(ret, true);
@@ -1291,9 +1319,15 @@ int utc_context_trigger_rule_set_action_notification_n(void)
 #ifdef MOBILE
        // Err: Invalid app id
        app_control_h invalid_app = NULL;
-       app_control_create(&invalid_app);
-       app_control_set_operation(invalid_app, APP_CONTROL_OPERATION_DEFAULT);
-       app_control_set_app_id (invalid_app, "invalid_app_id");
+
+       app_err = app_control_create(&invalid_app);
+       assert_eq(app_err, APP_CONTROL_ERROR_NONE);
+
+       app_err = app_control_set_operation(invalid_app, APP_CONTROL_OPERATION_DEFAULT);
+       assert_eq_destroy(app_err, APP_CONTROL_ERROR_NONE, invalid_app);
+
+       app_err = app_control_set_app_id (invalid_app, "invalid_app_id");
+       assert_eq_destroy(app_err, APP_CONTROL_ERROR_NONE, invalid_app);
 
        error = context_trigger_rule_set_action_app_control(rule, invalid_app);
        app_control_destroy(invalid_app);
@@ -3083,7 +3117,8 @@ int utc_context_trigger_custom_publish_n(void)
        error = context_trigger_custom_publish(CUSTOM_ITEM_WEATHER, CUSTOM_WEATHER_DATA1);
        TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NOT_SUPPORTED);
 
-       context_trigger_custom_register(CUSTOM_ITEM_WEATHER, CUSTOM_WEATHER_TEMPLATE);
+       error = context_trigger_custom_register(CUSTOM_ITEM_WEATHER, CUSTOM_WEATHER_TEMPLATE);
+       TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);
 
        // Err: Invalid parameter
        error = context_trigger_custom_publish(CUSTOM_ITEM_WEATHER, NULL);
@@ -3126,7 +3161,8 @@ int utc_context_trigger_rule_custom_event_create_p(void)
        context_trigger_rule_entry_h event1 = NULL;
        context_trigger_rule_entry_h event2 = NULL;
 
-       context_trigger_custom_register(CUSTOM_ITEM_WEATHER, CUSTOM_WEATHER_TEMPLATE);
+       error = context_trigger_custom_register(CUSTOM_ITEM_WEATHER, CUSTOM_WEATHER_TEMPLATE);
+       TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);
 
        error = context_trigger_rule_custom_event_create(CUSTOM_ITEM_WEATHER, CONTEXT_TEST_PACKAGE_ID, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, &event1);
        TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);
@@ -3183,7 +3219,8 @@ int utc_context_trigger_rule_custom_condition_create_p(void)
        context_trigger_rule_entry_h condition1 = NULL;
        context_trigger_rule_entry_h condition2 = NULL;
 
-       context_trigger_custom_register(CUSTOM_ITEM_WEATHER, CUSTOM_WEATHER_TEMPLATE);
+       error = context_trigger_custom_register(CUSTOM_ITEM_WEATHER, CUSTOM_WEATHER_TEMPLATE);
+       TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);
 
        error = context_trigger_rule_custom_condition_create(CUSTOM_ITEM_WEATHER, CONTEXT_TEST_PACKAGE_ID, CONTEXT_TRIGGER_LOGICAL_CONJUNCTION, &condition1);
        TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE);

diff --git a/src/utc/motion/utc-motion-gesture.c b/src/utc/motion/utc-motion-gesture.c
index dda9bcf..fb74266 100755 (executable)
--- a/src/utc/motion/utc-motion-gesture.c
+++ b/src/utc/motion/utc-motion-gesture.c
@@ -288,7 +288,8 @@ int utc_motion_gesture_stop_recognition_p(void)
 {
        int error = GESTURE_ERROR_NONE;
 
-       gesture_start_recognition(handle, gesture_type, GESTURE_OPTION_DEFAULT, gesture_cb, NULL);
+       error = gesture_start_recognition(handle, gesture_type, GESTURE_OPTION_DEFAULT, gesture_cb, NULL);
+       assert_eq(error, GESTURE_ERROR_NONE);
 
        error = gesture_stop_recognition(handle);
 

diff --git a/src/utc/push/sppc-common.c b/src/utc/push/sppc-common.c
index 980bfb3..4016b84 100755 (executable)
--- a/src/utc/push/sppc-common.c
+++ b/src/utc/push/sppc-common.c
@@ -598,8 +598,13 @@ int SendNotificationUsingCurl(OutgoingNotification *pstNotificationInfo, bool ve
                }
 
                if (connection) {
-                        connection_destroy(connection);
-                        connection = NULL;
+                        ret = connection_destroy(connection);
+                        if (ret != CONNECTION_ERROR_NONE) {
+                               _LOG("Fail to destroy connection[%d]", ret);
+                               return -1;
+                        }
+                        else
+                               connection = NULL;
                }
 
                // Display DEBUG info

diff --git a/src/utc/sensor/utc-system-sensor-basic.c b/src/utc/sensor/utc-system-sensor-basic.c
index fb8e767..d635783 100755 (executable)
--- a/src/utc/sensor/utc-system-sensor-basic.c
+++ b/src/utc/sensor/utc-system-sensor-basic.c
@@ -476,10 +476,10 @@ int utc_system_sensor_create_listener_n(void)
        int error = SENSOR_ERROR_NONE;
        sensor_h sensor;
 
-       sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor);
+       error = sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor);
+       assert_eq(error, SENSOR_ERROR_NOT_SUPPORTED);
 
        error = sensor_create_listener(sensor, NULL);
-
        assert_eq(error, SENSOR_ERROR_INVALID_PARAMETER);
 
        return 0;
@@ -721,7 +721,8 @@ int utc_system_sensor_listener_set_event_cb_n(void)
        if (!sensor_supported[SENSOR_ACCELEROMETER])
                return 0;
 
-       sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor);
+       error = sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor);
+       assert_eq(error, SENSOR_ERROR_NOT_SUPPORTED);
 
        sensor_create_listener(sensor, &listener);
 
@@ -857,7 +858,8 @@ int utc_system_sensor_listener_set_accuracy_cb_n(void)
        if (!sensor_supported[SENSOR_ACCELEROMETER])
                return 0;
 
-       sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor);
+       error = sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor);
+       assert_eq(error, SENSOR_ERROR_NOT_SUPPORTED);
 
        sensor_create_listener(sensor, &listener);
 

diff --git a/src/utc/service-adaptor/utc-service-adaptor-client-storage.c b/src/utc/service-adaptor/utc-service-adaptor-client-storage.c
index c647a4a..88726ce 100755 (executable)
--- a/src/utc/service-adaptor/utc-service-adaptor-client-storage.c
+++ b/src/utc/service-adaptor/utc-service-adaptor-client-storage.c
@@ -349,13 +349,22 @@ void utc_service_adaptor_client_storage_startup(void)
        if ( true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE ))
        {
                PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received = %s\\n", __LINE__, API_NAMESPACE,  pszValue);
-               
+
                int path_size = strlen(pszValue)+strlen("/Original.png")+1;
                media_thumbnail_path=(char*)calloc(path_size, sizeof(char));
+               if (media_thumbnail_path == NULL) {
+                       log_error("Memory allocation failed for media_thumbnail_path");
+                       assert(false);
+               }
+
                snprintf(media_thumbnail_path, path_size, "%s/Original.png", pszValue);
 
                path_size = strlen(pszValue)+strlen("/")+1;
                test_download_dir=(char*)calloc(path_size, sizeof(char));
+               if (test_download_dir == NULL) {
+                       log_error("Memory allocation failed for test_download_dir");
+                       assert(false);
+               }
                snprintf(test_download_dir, path_size, "%s/", pszValue);
        }
        else

diff --git a/src/utc/sync-manager/utc-sync-manager.c b/src/utc/sync-manager/utc-sync-manager.c
index 877ff23..6d9802d 100755 (executable)
--- a/src/utc/sync-manager/utc-sync-manager.c
+++ b/src/utc/sync-manager/utc-sync-manager.c
@@ -111,7 +111,7 @@ static bool sync_job_cb(account_h account, const char *sync_job_name, const char
 }
 
 
-void sync_manager_setup_account(void)
+int sync_manager_setup_account(void)
 {
        int ret = ACCOUNT_ERROR_NONE;
 
@@ -119,11 +119,22 @@ void sync_manager_setup_account(void)
        if (ret == ACCOUNT_ERROR_NONE)
                created_acc = true;
 
-       account_set_user_name(account, name);
-       account_set_email_address(account, email_address);
-       account_set_package_name(account, app_id);
-       account_set_sync_support(account, ACCOUNT_SUPPORTS_SYNC);
-       account_insert_to_db(account, &account_id);
+       ret = account_set_user_name(account, name);
+       assert_eq(ret, ACCOUNT_ERROR_NONE);
+
+       ret = account_set_email_address(account, email_address);
+       assert_eq(ret, ACCOUNT_ERROR_NONE);
+
+       ret = account_set_package_name(account, app_id);
+       assert_eq(ret, ACCOUNT_ERROR_NONE);
+
+       ret = account_set_sync_support(account, ACCOUNT_SUPPORTS_SYNC);
+       assert_eq(ret, ACCOUNT_ERROR_NONE);
+
+       ret = account_insert_to_db(account, &account_id);
+       assert_eq(ret, ACCOUNT_ERROR_NONE);
+
+       return SYNC_ERROR_NONE;
 }
 
 
@@ -261,8 +272,12 @@ int utc_sync_manager_on_demand_sync_job_p(void)
        if (sync_supported)
                assert(set_cb);
 
-       sync_manager_setup_account();
-       assert(created_acc);
+       ret = sync_manager_setup_account();
+       if (!sync_supported) { assert_eq(ret, SYNC_ERROR_NOT_SUPPORTED); }
+       else {
+               assert_eq(ret, SYNC_ERROR_NONE);
+               assert(created_acc);
+       }
 
        user_data = bundle_create();
        bundle_add_str(user_data, "str", "String user_data sample.");