Increase line coverage using LCOV_EXCL

Increase line coverage using LCOV_EXCL in only internal API called function
and additional error handling code except invalid parameter.

Change-Id: I7089703a9185ecc2c91dd3b60b27b763154351e7
Signed-off-by: Unsung Lee <unsung.lee@samsung.com>

diff --git a/src/storage-external-dbus.c b/src/storage-external-dbus.c
index 5a23bc6866a28e49e92ab057e6d27240330a85b9..1dd50e22c2058bf82de36ed7afdc162a2b7aa7cb 100755 (executable)
--- a/src/storage-external-dbus.c
+++ b/src/storage-external-dbus.c
@@ -216,9 +216,11 @@ int storage_ext_get_statvfs(char *path, struct statvfs_32 *buf)
                        &bfree, &bavail, &files,
                        &ffree, &favail, &fsid,
                        &flag, &namemax)) {
                        &bfree, &bavail, &files,
                        &ffree, &favail, &fsid,
                        &flag, &namemax)) {

+               //LCOV_EXCL_START Dbus Error

                _E("Failed to get params from gvariant.");
                g_variant_unref(reply);
                return -EIO;
                _E("Failed to get params from gvariant.");
                g_variant_unref(reply);
                return -EIO;

+               //LCOV_EXCL_STOP

        }
 //     %llu bsize, frsize, blocks, bfree, bavail, files, ffree, favail, fsid, flag, namemax
 
        }
 //     %llu bsize, frsize, blocks, bfree, bavail, files, ffree, favail, fsid, flag, namemax
 


@@ -282,6 +284,7 @@ int storage_ext_get_statvfs_size64(char *path, struct statvfs *buf)
        return 0;
 }
 
        return 0;
 }
 

+//LCOV_EXCL_START Only Internal API call

 int storage_ext_get_storage_level(const char *path, char **level)
 {
        GVariant *reply;
 int storage_ext_get_storage_level(const char *path, char **level)
 {
        GVariant *reply;


@@ -314,18 +317,14 @@ int storage_ext_get_storage_level(const char *path, char **level)
        gdbus_free_connection(dbus_handle);
 
        if (ret_dbus < 0) {
        gdbus_free_connection(dbus_handle);
 
        if (ret_dbus < 0) {

-               //LCOV_EXCL_START Dbus error

                _E("Failed to get %d level", id);
                return -EIO;
                _E("Failed to get %d level", id);
                return -EIO;

-               //LCOV_EXCL_STOP

        }
 
        if (!g_variant_get_safe(reply, "(s)", &reply_val)) {
        }
 
        if (!g_variant_get_safe(reply, "(s)", &reply_val)) {

-               //LCOV_EXCL_START Dbus type error

                _E("Failed to get params from gvariant.");
                g_variant_unref(reply);
                return -EIO;
                _E("Failed to get params from gvariant.");
                g_variant_unref(reply);
                return -EIO;

-               //LCOV_EXCL_STOP

        }
 
        *level = strdup(reply_val);
        }
 
        *level = strdup(reply_val);


@@ -337,6 +336,7 @@ int storage_ext_get_storage_level(const char *path, char **level)
 
        return 0;
 }
 
        return 0;
 }

+//LCOV_EXCL_STOP

 
 //LCOV_EXCL_START Not called Callback
 static void storage_ext_device_changed(GVariant *params, enum storage_ext_state state, gpointer user_data)
 
 //LCOV_EXCL_START Not called Callback
 static void storage_ext_device_changed(GVariant *params, enum storage_ext_state state, gpointer user_data)

diff --git a/src/storage.c b/src/storage.c
index 01ec1fb91eb6f87b2a1e747801b34a0e5c31c3cb..a1367d3f35b4e239c69d2d55489891226eb1a24d 100644 (file)
--- a/src/storage.c
+++ b/src/storage.c
@@ -419,7 +419,11 @@ API int storage_set_state_changed_cb(int storage_id, storage_state_changed_cb ca
                return STORAGE_ERROR_INVALID_PARAMETER;
        }
 
                return STORAGE_ERROR_INVALID_PARAMETER;
        }
 

-       /* For backward compatability */
+       /**
+        * storage_id is different from storage type, but this code handles
+        * incorrect storage_id usage (pass storage type instead of storage id)
+        * For backward compatability.
+        */

        if (storage_id == STORAGE_TYPE_EXTERNAL) {
                if (!storage_ext_is_supported()) {
                        //LCOV_EXCL_START
        if (storage_id == STORAGE_TYPE_EXTERNAL) {
                if (!storage_ext_is_supported()) {
                        //LCOV_EXCL_START


@@ -438,7 +442,7 @@ API int storage_set_state_changed_cb(int storage_id, storage_state_changed_cb ca
 
                ccb_info = malloc(sizeof(struct compat_cb_info));
                if (ccb_info == NULL)
 
                ccb_info = malloc(sizeof(struct compat_cb_info));
                if (ccb_info == NULL)

-                       return STORAGE_ERROR_OPERATION_FAILED;
+                       return STORAGE_ERROR_OPERATION_FAILED;  //LCOV_EXCL_LINE

                ccb_info->user_cb = callback;
                ccb_info->user_data = user_data;
                SYS_G_LIST_APPEND(compat_cb_list, ccb_info);
                ccb_info->user_cb = callback;
                ccb_info->user_data = user_data;
                SYS_G_LIST_APPEND(compat_cb_list, ccb_info);


@@ -489,7 +493,11 @@ API int storage_unset_state_changed_cb(int storage_id, storage_state_changed_cb
                return STORAGE_ERROR_INVALID_PARAMETER;
        }
 
                return STORAGE_ERROR_INVALID_PARAMETER;
        }
 

-       /* For backward compatability */
+       /**
+        * storage_id is different from storage type, but this code handles
+        * incorrect storage_id usage (pass storage type instead of storage id)
+        * For backward compatability.
+        */

        if (storage_id == STORAGE_TYPE_EXTERNAL) {
                if (!storage_ext_is_supported()) {
                        //LCOV_EXCL_START
        if (storage_id == STORAGE_TYPE_EXTERNAL) {
                if (!storage_ext_is_supported()) {
                        //LCOV_EXCL_START


@@ -508,7 +516,8 @@ API int storage_unset_state_changed_cb(int storage_id, storage_state_changed_cb
                                return STORAGE_ERROR_NONE;
                        }
                }
                                return STORAGE_ERROR_NONE;
                        }
                }

-               return STORAGE_ERROR_OPERATION_FAILED;
+
+               return STORAGE_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE

        }
 
        /* Internal storage does not support registering changed callback */
        }
 
        /* Internal storage does not support registering changed callback */