[UTC][battery-monitor][ACR-1533][unit test cases] 66/229066/3
authorDewal Agarwal <d1.agarwal@samsung.com>
Fri, 27 Mar 2020 11:27:52 +0000 (16:57 +0530)
committerDewal Agarwal <d1.agarwal@samsung.com>
Mon, 6 Apr 2020 11:52:58 +0000 (17:22 +0530)
Change-Id: Ia21847588e7548a4ff79d1a7a03fa776f9562562
Signed-off-by: Dewal Agarwal <d1.agarwal@samsung.com>
src/utc/battery-monitor/public.list
src/utc/battery-monitor/tct-battery-monitor-core_mobile.h
src/utc/battery-monitor/tct-battery-monitor-core_tizeniot.h
src/utc/battery-monitor/tct-battery-monitor-core_wearable.h
src/utc/battery-monitor/utc-battery-monitor.c

index b94c420b41f7eb68f26017b232974ccae4f3ddc0..bc296dedef0a6f27a7bc7489f90155e38eed1927 100644 (file)
@@ -1,8 +1,6 @@
-battery_monitor_create
-battery_monitor_destroy
-battery_monitor_get_usage_for_resource_id
-battery_monitor_get_usage_by_app_id_for_all_resource_id
-battery_monitor_get_usage_by_app_id_for_resource_id
-battery_monitor_get_total_usage_by_app_id
-battery_monitor_get_total_usage_by_resource_id
-
+battery_monitor_battery_usage_data_destroy
+battery_monitor_usage_data_get_power_usage_per_resource
+battery_monitor_get_power_usage_by_app_for_all_resources
+battery_monitor_get_power_usage_by_app_per_resource
+battery_monitor_get_power_usage_by_app
+battery_monitor_get_power_usage_by_resource
index 3760b11116f826c8f5bd699216a2c886fdeaac2c..448ca200c61f0a1bf91f66dde89c3016bd636bc3 100644 (file)
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_create_p(void);
-extern int utc_battery_monitor_create_n(void);
+extern int utc_battery_monitor_battery_usage_data_destroy_p(void);
+extern int utc_battery_monitor_battery_usage_data_destroy_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_destroy_p(void);
-extern int utc_battery_monitor_destroy_n(void);
+extern int utc_battery_monitor_usage_data_get_power_usage_per_resource_p(void);
+extern int utc_battery_monitor_usage_data_get_power_usage_per_resource_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_for_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_for_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_for_all_resources_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_for_all_resources_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_per_resource_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_per_resource_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_total_usage_by_app_id_p(void);
-extern int utc_battery_monitor_get_total_usage_by_app_id_n(void);
-
-extern void utc_battery_monitor_startup(void);
-extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_total_usage_by_resource_id_p(void);
-extern int utc_battery_monitor_get_total_usage_by_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_resource_p(void);
+extern int utc_battery_monitor_get_power_usage_by_resource_n(void);
 
 testcase tc_array[] = {
        {
-               "utc_battery_monitor_create_p",
-               utc_battery_monitor_create_p,
-               utc_battery_monitor_startup,
-               utc_battery_monitor_cleanup
-       },
-       {
-               "utc_battery_monitor_create_n",
-               utc_battery_monitor_create_n,
-               utc_battery_monitor_startup,
-               utc_battery_monitor_cleanup
-       },
-       {
-               "utc_battery_monitor_destroy_p",
-               utc_battery_monitor_destroy_p,
+               "utc_battery_monitor_battery_usage_data_destroy_p",
+               utc_battery_monitor_battery_usage_data_destroy_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_destroy_n",
-               utc_battery_monitor_destroy_n,
+               "utc_battery_monitor_battery_usage_data_destroy_n",
+               utc_battery_monitor_battery_usage_data_destroy_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_for_resource_id_p",
-               utc_battery_monitor_get_usage_for_resource_id_p,
+               "utc_battery_monitor_usage_data_get_power_usage_per_resource_p",
+               utc_battery_monitor_usage_data_get_power_usage_per_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_for_resource_id_n",
-               utc_battery_monitor_get_usage_for_resource_id_n,
+               "utc_battery_monitor_usage_data_get_power_usage_per_resource_n",
+               utc_battery_monitor_usage_data_get_power_usage_per_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p",
-               utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_for_all_resources_p",
+               utc_battery_monitor_get_power_usage_by_app_for_all_resources_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n",
-               utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_for_all_resources_n",
+               utc_battery_monitor_get_power_usage_by_app_for_all_resources_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_resource_id_p",
-               utc_battery_monitor_get_usage_by_app_id_for_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_per_resource_p",
+               utc_battery_monitor_get_power_usage_by_app_per_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_resource_id_n",
-               utc_battery_monitor_get_usage_by_app_id_for_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_per_resource_n",
+               utc_battery_monitor_get_power_usage_by_app_per_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_app_id_p",
-               utc_battery_monitor_get_total_usage_by_app_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_p",
+               utc_battery_monitor_get_power_usage_by_app_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_app_id_n",
-               utc_battery_monitor_get_total_usage_by_app_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_n",
+               utc_battery_monitor_get_power_usage_by_app_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_resource_id_p",
-               utc_battery_monitor_get_total_usage_by_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_resource_p",
+               utc_battery_monitor_get_power_usage_by_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_resource_id_n",
-               utc_battery_monitor_get_total_usage_by_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_resource_n",
+               utc_battery_monitor_get_power_usage_by_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
index 3760b11116f826c8f5bd699216a2c886fdeaac2c..448ca200c61f0a1bf91f66dde89c3016bd636bc3 100644 (file)
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_create_p(void);
-extern int utc_battery_monitor_create_n(void);
+extern int utc_battery_monitor_battery_usage_data_destroy_p(void);
+extern int utc_battery_monitor_battery_usage_data_destroy_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_destroy_p(void);
-extern int utc_battery_monitor_destroy_n(void);
+extern int utc_battery_monitor_usage_data_get_power_usage_per_resource_p(void);
+extern int utc_battery_monitor_usage_data_get_power_usage_per_resource_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_for_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_for_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_for_all_resources_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_for_all_resources_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_per_resource_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_per_resource_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_total_usage_by_app_id_p(void);
-extern int utc_battery_monitor_get_total_usage_by_app_id_n(void);
-
-extern void utc_battery_monitor_startup(void);
-extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_total_usage_by_resource_id_p(void);
-extern int utc_battery_monitor_get_total_usage_by_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_resource_p(void);
+extern int utc_battery_monitor_get_power_usage_by_resource_n(void);
 
 testcase tc_array[] = {
        {
-               "utc_battery_monitor_create_p",
-               utc_battery_monitor_create_p,
-               utc_battery_monitor_startup,
-               utc_battery_monitor_cleanup
-       },
-       {
-               "utc_battery_monitor_create_n",
-               utc_battery_monitor_create_n,
-               utc_battery_monitor_startup,
-               utc_battery_monitor_cleanup
-       },
-       {
-               "utc_battery_monitor_destroy_p",
-               utc_battery_monitor_destroy_p,
+               "utc_battery_monitor_battery_usage_data_destroy_p",
+               utc_battery_monitor_battery_usage_data_destroy_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_destroy_n",
-               utc_battery_monitor_destroy_n,
+               "utc_battery_monitor_battery_usage_data_destroy_n",
+               utc_battery_monitor_battery_usage_data_destroy_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_for_resource_id_p",
-               utc_battery_monitor_get_usage_for_resource_id_p,
+               "utc_battery_monitor_usage_data_get_power_usage_per_resource_p",
+               utc_battery_monitor_usage_data_get_power_usage_per_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_for_resource_id_n",
-               utc_battery_monitor_get_usage_for_resource_id_n,
+               "utc_battery_monitor_usage_data_get_power_usage_per_resource_n",
+               utc_battery_monitor_usage_data_get_power_usage_per_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p",
-               utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_for_all_resources_p",
+               utc_battery_monitor_get_power_usage_by_app_for_all_resources_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n",
-               utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_for_all_resources_n",
+               utc_battery_monitor_get_power_usage_by_app_for_all_resources_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_resource_id_p",
-               utc_battery_monitor_get_usage_by_app_id_for_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_per_resource_p",
+               utc_battery_monitor_get_power_usage_by_app_per_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_resource_id_n",
-               utc_battery_monitor_get_usage_by_app_id_for_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_per_resource_n",
+               utc_battery_monitor_get_power_usage_by_app_per_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_app_id_p",
-               utc_battery_monitor_get_total_usage_by_app_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_p",
+               utc_battery_monitor_get_power_usage_by_app_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_app_id_n",
-               utc_battery_monitor_get_total_usage_by_app_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_n",
+               utc_battery_monitor_get_power_usage_by_app_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_resource_id_p",
-               utc_battery_monitor_get_total_usage_by_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_resource_p",
+               utc_battery_monitor_get_power_usage_by_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_resource_id_n",
-               utc_battery_monitor_get_total_usage_by_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_resource_n",
+               utc_battery_monitor_get_power_usage_by_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
index 3760b11116f826c8f5bd699216a2c886fdeaac2c..448ca200c61f0a1bf91f66dde89c3016bd636bc3 100644 (file)
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_create_p(void);
-extern int utc_battery_monitor_create_n(void);
+extern int utc_battery_monitor_battery_usage_data_destroy_p(void);
+extern int utc_battery_monitor_battery_usage_data_destroy_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_destroy_p(void);
-extern int utc_battery_monitor_destroy_n(void);
+extern int utc_battery_monitor_usage_data_get_power_usage_per_resource_p(void);
+extern int utc_battery_monitor_usage_data_get_power_usage_per_resource_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_for_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_for_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_for_all_resources_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_for_all_resources_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_per_resource_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_per_resource_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_resource_id_p(void);
-extern int utc_battery_monitor_get_usage_by_app_id_for_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_app_p(void);
+extern int utc_battery_monitor_get_power_usage_by_app_n(void);
 
 extern void utc_battery_monitor_startup(void);
 extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_total_usage_by_app_id_p(void);
-extern int utc_battery_monitor_get_total_usage_by_app_id_n(void);
-
-extern void utc_battery_monitor_startup(void);
-extern void utc_battery_monitor_cleanup(void);
-extern int utc_battery_monitor_get_total_usage_by_resource_id_p(void);
-extern int utc_battery_monitor_get_total_usage_by_resource_id_n(void);
+extern int utc_battery_monitor_get_power_usage_by_resource_p(void);
+extern int utc_battery_monitor_get_power_usage_by_resource_n(void);
 
 testcase tc_array[] = {
        {
-               "utc_battery_monitor_create_p",
-               utc_battery_monitor_create_p,
-               utc_battery_monitor_startup,
-               utc_battery_monitor_cleanup
-       },
-       {
-               "utc_battery_monitor_create_n",
-               utc_battery_monitor_create_n,
-               utc_battery_monitor_startup,
-               utc_battery_monitor_cleanup
-       },
-       {
-               "utc_battery_monitor_destroy_p",
-               utc_battery_monitor_destroy_p,
+               "utc_battery_monitor_battery_usage_data_destroy_p",
+               utc_battery_monitor_battery_usage_data_destroy_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_destroy_n",
-               utc_battery_monitor_destroy_n,
+               "utc_battery_monitor_battery_usage_data_destroy_n",
+               utc_battery_monitor_battery_usage_data_destroy_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_for_resource_id_p",
-               utc_battery_monitor_get_usage_for_resource_id_p,
+               "utc_battery_monitor_usage_data_get_power_usage_per_resource_p",
+               utc_battery_monitor_usage_data_get_power_usage_per_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_for_resource_id_n",
-               utc_battery_monitor_get_usage_for_resource_id_n,
+               "utc_battery_monitor_usage_data_get_power_usage_per_resource_n",
+               utc_battery_monitor_usage_data_get_power_usage_per_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p",
-               utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_for_all_resources_p",
+               utc_battery_monitor_get_power_usage_by_app_for_all_resources_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n",
-               utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_for_all_resources_n",
+               utc_battery_monitor_get_power_usage_by_app_for_all_resources_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_resource_id_p",
-               utc_battery_monitor_get_usage_by_app_id_for_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_per_resource_p",
+               utc_battery_monitor_get_power_usage_by_app_per_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_usage_by_app_id_for_resource_id_n",
-               utc_battery_monitor_get_usage_by_app_id_for_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_per_resource_n",
+               utc_battery_monitor_get_power_usage_by_app_per_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_app_id_p",
-               utc_battery_monitor_get_total_usage_by_app_id_p,
+               "utc_battery_monitor_get_power_usage_by_app_p",
+               utc_battery_monitor_get_power_usage_by_app_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_app_id_n",
-               utc_battery_monitor_get_total_usage_by_app_id_n,
+               "utc_battery_monitor_get_power_usage_by_app_n",
+               utc_battery_monitor_get_power_usage_by_app_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_resource_id_p",
-               utc_battery_monitor_get_total_usage_by_resource_id_p,
+               "utc_battery_monitor_get_power_usage_by_resource_p",
+               utc_battery_monitor_get_power_usage_by_resource_p,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
        {
-               "utc_battery_monitor_get_total_usage_by_resource_id_n",
-               utc_battery_monitor_get_total_usage_by_resource_id_n,
+               "utc_battery_monitor_get_power_usage_by_resource_n",
+               utc_battery_monitor_get_power_usage_by_resource_n,
                utc_battery_monitor_startup,
                utc_battery_monitor_cleanup
        },
index 20168db4a9953d017b9712f9d811f16f57153950..4654eea64307b7ff754fa12bb4369df14a65d0e2 100644 (file)
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include <time.h>
 #include <dlog.h>
 #include <system_info.h>
 #include "battery_monitor.h"
 #define LOG_TAG "NativeTCT"
 
 #define BATTERY_FEATURE                                "http://tizen.org/feature/battery"
-#define BATTERY_MONITOR_RESOURCE_ID_MAX                (BATTERY_MONITOR_RESOURCE_ID_HRM_SENSOR + 1)
-#define BATTERY_MONITOR_DURATION_TYPE_MAX      (BATTERY_MONITOR_DURATION_TYPE_1WEEK + 1)
 
 #define TEST_APP_ID "org.tizen.battery-monitor-native-utc"
 
-static battery_monitor_h data_handle;
+static battery_usage_data_h data_handle;
 static bool is_battery_supported = false;
-static int battery_usage = -1;
+static double power_usage = -1;
+time_t s_t, e_t;
+const int tmin = 604800; /* Time interval for 7 days in seconds */
+
+static void get_custom_time_values(void)
+{
+       time_t ret_time;
+       long int crr_time = 0;
+       time(&ret_time);
+       if (ret_time == -1) {
+               dlog_print(DLOG_ERROR, LOG_TAG, "Precondition Fails: Time failed");
+               return;
+       }
+       crr_time = ret_time;
+       s_t = 0; e_t = 0;
+       s_t = (crr_time - tmin/2); e_t = (crr_time - 1);
+
+       return;
+}
 
 /**
  * @function           utc_battery_monitor_startup
@@ -52,8 +69,9 @@ static int battery_usage = -1;
 void utc_battery_monitor_startup(void)
 {
        system_info_get_platform_bool(BATTERY_FEATURE, &is_battery_supported);
+       get_custom_time_values();
        data_handle = NULL;
-       battery_usage = -1;
+       power_usage = -1;
 
        return;
 }
@@ -69,8 +87,7 @@ void utc_battery_monitor_cleanup(void)
        int error_code = 0;
 
        if (data_handle != NULL) {
-               error_code = battery_monitor_destroy(data_handle);
-
+               error_code = battery_monitor_battery_usage_data_destroy(data_handle);
                if (error_code != BATTERY_MONITOR_ERROR_NONE)
                        dlog_print(DLOG_ERROR, LOG_TAG, "Failed to delete handle cleanup");
 
@@ -81,35 +98,78 @@ void utc_battery_monitor_cleanup(void)
 }
 
 /**
- * @testcase           utc_battery_monitor_create_p
+ * @testcase           utc_battery_monitor_battery_usage_data_destroy_p
  * @since_tizen                5.5
- * @description                Positive test case of battery_monitor_create()
+ * @description                Positive test case of battery_monitor_battery_usage_data_destroy()
  */
-int utc_battery_monitor_create_p(void)
+int utc_battery_monitor_battery_usage_data_destroy_p(void)
 {
        int error_code = 0;
 
-       error_code = battery_monitor_create(&data_handle);
+       if (data_handle != NULL) {
+               error_code = battery_monitor_battery_usage_data_destroy(data_handle);
+               if (!is_battery_supported)
+                       assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+               else
+                       assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+       } else {
+               error_code = BATTERY_MONITOR_ERROR_NONE;
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+       }
+
+       data_handle = NULL;
+
+       return 0;
+}
+
+/**
+ * @testcase           utc_battery_monitor_battery_usage_data_destroy_n
+ * @since_tizen                5.5
+ * @description                Negative test case of battery_monitor_battery_usage_data_destroy()
+ */
+int utc_battery_monitor_battery_usage_data_destroy_n(void)
+{
+       int error_code = 0;
 
+       error_code = battery_monitor_battery_usage_data_destroy(NULL);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
 
 /**
- * @testcase           utc_battery_monitor_create_n
+ * @testcase           utc_battery_monitor_usage_data_get_power_usage_per_resource_n
  * @since_tizen                5.5
- * @description                Negative test case of battery_monitor_create()
+ * @description                Negative test case of battery_monitor_usage_data_get_power_usage_per_resource()
  */
-int utc_battery_monitor_create_n(void)
+int utc_battery_monitor_usage_data_get_power_usage_per_resource_n(void)
 {
        int error_code = 0;
 
-       error_code = battery_monitor_create(NULL);
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(TEST_APP_ID, s_t, e_t, &data_handle);
+       if (!is_battery_supported)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else if (error_code == BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND);
+       else
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
+       error_code = battery_monitor_usage_data_get_power_usage_per_resource(NULL, BATTERY_MONITOR_RESOURCE_ID_CPU, &power_usage);
+       if (!is_battery_supported)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
+
+       error_code = battery_monitor_usage_data_get_power_usage_per_resource(data_handle, BATTERY_MONITOR_RESOURCE_ID_CPU, NULL);
+       if (!is_battery_supported)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
+
+       error_code = battery_monitor_usage_data_get_power_usage_per_resource(data_handle, BATTERY_MONITOR_RESOURCE_ID_MAX, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
@@ -119,78 +179,86 @@ int utc_battery_monitor_create_n(void)
 }
 
 /**
- * @testcase           utc_battery_monitor_destroy_p
+ * @testcase           utc_battery_monitor_usage_data_get_power_usage_per_resource_p
  * @since_tizen                5.5
- * @description                Positive test case of battery_monitor_destroy()
+ * @description                Positive test case of battery_monitor_usage_data_get_power_usage_per_resource()
  */
-int utc_battery_monitor_destroy_p(void)
+int utc_battery_monitor_usage_data_get_power_usage_per_resource_p(void)
 {
        int error_code = 0;
 
-       error_code = battery_monitor_create(&data_handle);
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(TEST_APP_ID, s_t, e_t, &data_handle);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else if (error_code == BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND)
+               return 0;
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
 
-       error_code = battery_monitor_destroy(data_handle);
+       error_code = battery_monitor_usage_data_get_power_usage_per_resource(data_handle, BATTERY_MONITOR_RESOURCE_ID_CPU, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
 
-       data_handle = NULL;
-
        return 0;
 }
 
 /**
- * @testcase           utc_battery_monitor_destroy_n
+ * @testcase           utc_battery_monitor_get_power_usage_by_app_for_all_resources_p
  * @since_tizen                5.5
- * @description                Negative test case of battery_monitor_destroy()
+ * @description                Positive test case of battery_monitor_get_power_usage_by_app_for_all_resources()
  */
-int utc_battery_monitor_destroy_n(void)
+int utc_battery_monitor_get_power_usage_by_app_for_all_resources_p(void)
 {
        int error_code = 0;
 
-       error_code = battery_monitor_destroy(NULL);
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(TEST_APP_ID, s_t, e_t, &data_handle);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else if (error_code == BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
 
        return 0;
 }
 
 /**
- * @testcase           utc_battery_monitor_get_usage_for_resource_id_n
+ * @testcase           utc_battery_monitor_get_power_usage_by_app_for_all_resources_n
  * @since_tizen                5.5
- * @description                Negative test case of battery_monitor_get_usage_for_resource_id()
+ * @description                Negative test case of battery_monitor_get_power_usage_by_app_for_all_resources()
  */
-int utc_battery_monitor_get_usage_for_resource_id_n(void)
+int utc_battery_monitor_get_power_usage_by_app_for_all_resources_n(void)
 {
        int error_code = 0;
-       int battery_usage = 0;
 
-       error_code = battery_monitor_create(&data_handle);
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(TEST_APP_ID, s_t, e_t, NULL);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_for_resource_id(NULL, BATTERY_MONITOR_RESOURCE_ID_CPU, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(NULL, s_t, e_t, &data_handle);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_for_resource_id(data_handle, BATTERY_MONITOR_RESOURCE_ID_CPU, NULL);
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(TEST_APP_ID, -1, -1, &data_handle);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_for_resource_id(data_handle, BATTERY_MONITOR_RESOURCE_ID_MAX, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(TEST_APP_ID, s_t, -1, &data_handle);
+       if (!is_battery_supported)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
+
+       /* Interchange time */
+       error_code = battery_monitor_get_power_usage_by_app_for_all_resources(TEST_APP_ID, e_t, s_t, &data_handle);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
@@ -200,24 +268,19 @@ int utc_battery_monitor_get_usage_for_resource_id_n(void)
 }
 
 /**
- * @testcase           utc_battery_monitor_get_usage_for_resource_id_p
+ * @testcase           utc_battery_monitor_get_power_usage_by_app_per_resource_p
  * @since_tizen                5.5
- * @description                Positive test case of battery_monitor_get_usage_for_resource_id()
+ * @description                Positive test case of battery_monitor_get_power_usage_by_app_per_resource()
  */
-int utc_battery_monitor_get_usage_for_resource_id_p(void)
+int utc_battery_monitor_get_power_usage_by_app_per_resource_p(void)
 {
        int error_code = 0;
-       int battery_usage = 0;
-
-       error_code = battery_monitor_create(&data_handle);
-       if (!is_battery_supported)
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
-       else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
 
-       error_code = battery_monitor_get_usage_for_resource_id(data_handle, BATTERY_MONITOR_RESOURCE_ID_CPU, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app_per_resource(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, s_t, e_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else if (error_code == BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
 
@@ -225,51 +288,45 @@ int utc_battery_monitor_get_usage_for_resource_id_p(void)
 }
 
 /**
- * @testcase           utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p
+ * @testcase           utc_battery_monitor_get_power_usage_by_app_per_resource_n
  * @since_tizen                5.5
- * @description                Positive test case of battery_monitor_get_usage_by_app_id_for_all_resource_id()
+ * @description                Negative test case of battery_monitor_get_power_usage_by_app_per_resource()
  */
-int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_p(void)
+int utc_battery_monitor_get_power_usage_by_app_per_resource_n(void)
 {
        int error_code = 0;
 
-       error_code = battery_monitor_get_usage_by_app_id_for_all_resource_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_1DAY, &data_handle);
+       error_code = battery_monitor_get_power_usage_by_app_per_resource(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, s_t, e_t, NULL);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_by_app_id_for_all_resource_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_1WEEK, &data_handle);
+       error_code = battery_monitor_get_power_usage_by_app_per_resource(NULL, BATTERY_MONITOR_RESOURCE_ID_CPU, s_t, e_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
-
-       return 0;
-}
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-/**
- * @testcase           utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n
- * @since_tizen                5.5
- * @description                Negative test case of battery_monitor_get_usage_by_app_id_for_all_resource_id()
- */
-int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n(void)
-{
-       int error_code = 0;
+       error_code = battery_monitor_get_power_usage_by_app_per_resource(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, e_t, s_t, &power_usage);
+       if (!is_battery_supported)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_by_app_id_for_all_resource_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_1DAY, NULL);
+       error_code = battery_monitor_get_power_usage_by_app_per_resource(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, -1, -1, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_by_app_id_for_all_resource_id(NULL, BATTERY_MONITOR_DURATION_TYPE_1DAY, &data_handle);
+       error_code = battery_monitor_get_power_usage_by_app_per_resource(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, s_t, -1, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_by_app_id_for_all_resource_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_MAX, &data_handle);
+       error_code = battery_monitor_get_power_usage_by_app_per_resource(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_MAX, s_t, e_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
@@ -279,23 +336,19 @@ int utc_battery_monitor_get_usage_by_app_id_for_all_resource_id_n(void)
 }
 
 /**
- * @testcase           utc_battery_monitor_get_usage_by_app_id_for_resource_id_p
+ * @testcase           utc_battery_monitor_get_power_usage_by_app_p
  * @since_tizen                5.5
- * @description                Positive test case of battery_monitor_get_usage_by_app_id_for_resource_id()
+ * @description                Positive test case of battery_monitor_get_power_usage_by_app()
  */
-int utc_battery_monitor_get_usage_by_app_id_for_resource_id_p(void)
+int utc_battery_monitor_get_power_usage_by_app_p(void)
 {
        int error_code = 0;
 
-       error_code = battery_monitor_get_usage_by_app_id_for_resource_id(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, BATTERY_MONITOR_DURATION_TYPE_1DAY, &battery_usage);
-       if (!is_battery_supported)
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
-       else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
-
-       error_code = battery_monitor_get_usage_by_app_id_for_resource_id(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, BATTERY_MONITOR_DURATION_TYPE_1WEEK, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app(TEST_APP_ID, s_t, e_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else if (error_code == BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
 
@@ -303,131 +356,103 @@ int utc_battery_monitor_get_usage_by_app_id_for_resource_id_p(void)
 }
 
 /**
- * @testcase           utc_battery_monitor_get_usage_by_app_id_for_resource_id_n
+ * @testcase           utc_battery_monitor_get_power_usage_by_app_n
  * @since_tizen                5.5
- * @description                Negative test case of battery_monitor_get_usage_by_app_id_for_resource_id()
+ * @description                Negative test case of battery_monitor_get_power_usage_by_app()
  */
-int utc_battery_monitor_get_usage_by_app_id_for_resource_id_n(void)
+int utc_battery_monitor_get_power_usage_by_app_n(void)
 {
        int error_code = 0;
 
-       error_code = battery_monitor_get_usage_by_app_id_for_resource_id(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, BATTERY_MONITOR_DURATION_TYPE_1DAY, NULL);
+       error_code = battery_monitor_get_power_usage_by_app(TEST_APP_ID, s_t, e_t, NULL);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_by_app_id_for_resource_id(NULL, BATTERY_MONITOR_RESOURCE_ID_CPU, BATTERY_MONITOR_DURATION_TYPE_1DAY, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app(NULL, s_t, e_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_usage_by_app_id_for_resource_id(TEST_APP_ID, BATTERY_MONITOR_RESOURCE_ID_CPU, BATTERY_MONITOR_DURATION_TYPE_MAX, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app(TEST_APP_ID, e_t, s_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       return 0;
-}
-
-/**
- * @testcase           utc_battery_monitor_get_total_usage_by_app_id_p
- * @since_tizen                5.5
- * @description                Positive test case of battery_monitor_get_total_usage_by_app_id()
- */
-int utc_battery_monitor_get_total_usage_by_app_id_p(void)
-{
-       int error_code = 0;
-
-       error_code = battery_monitor_get_total_usage_by_app_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_1DAY, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app(TEST_APP_ID, -1, -1, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_total_usage_by_app_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_1WEEK, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_app(TEST_APP_ID, s_t, -1, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
 
 /**
- * @testcase           utc_battery_monitor_get_total_usage_by_app_id_n
+ * @testcase           utc_battery_monitor_get_power_usage_by_resource_p
  * @since_tizen                5.5
- * @description                Negative test case of battery_monitor_get_total_usage_by_app_id()
+ * @description                Positive test case of battery_monitor_get_power_usage_by_resource()
  */
-int utc_battery_monitor_get_total_usage_by_app_id_n(void)
+int utc_battery_monitor_get_power_usage_by_resource_p(void)
 {
        int error_code = 0;
+       int resource_id = BATTERY_MONITOR_RESOURCE_ID_CPU;
 
-       error_code = battery_monitor_get_total_usage_by_app_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_1DAY, NULL);
-       if (!is_battery_supported)
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
-       else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
-
-       error_code = battery_monitor_get_total_usage_by_app_id(NULL, BATTERY_MONITOR_DURATION_TYPE_1DAY, &battery_usage);
-       if (!is_battery_supported)
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
-       else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
-
-       error_code = battery_monitor_get_total_usage_by_app_id(TEST_APP_ID, BATTERY_MONITOR_DURATION_TYPE_MAX, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_resource(resource_id, s_t, e_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else if (error_code == BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_RECORD_NOT_FOUND);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
 
        return 0;
 }
 
 /**
- * @testcase           utc_battery_monitor_get_total_usage_by_resource_id_p
+ * @testcase           utc_battery_monitor_get_power_usage_by_resource_n
  * @since_tizen                5.5
- * @description                Positive test case of battery_monitor_get_total_usage_by_resource_id()
+ * @description                Negative test case of battery_monitor_get_power_usage_by_resource()
  */
-int utc_battery_monitor_get_total_usage_by_resource_id_p(void)
+int utc_battery_monitor_get_power_usage_by_resource_n(void)
 {
        int error_code = 0;
        int resource_id = BATTERY_MONITOR_RESOURCE_ID_CPU;
 
-       error_code = battery_monitor_get_total_usage_by_resource_id(resource_id, BATTERY_MONITOR_DURATION_TYPE_1DAY, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_resource(resource_id, s_t, e_t, NULL);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_total_usage_by_resource_id(resource_id, BATTERY_MONITOR_DURATION_TYPE_1WEEK, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_resource(resource_id, e_t, s_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
-               assert_eq(error_code, BATTERY_MONITOR_ERROR_NONE);
-
-       return 0;
-}
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-/**
- * @testcase           utc_battery_monitor_get_total_usage_by_resource_id_n
- * @since_tizen                5.5
- * @description                Negative test case of battery_monitor_get_total_usage_by_resource_id()
- */
-int utc_battery_monitor_get_total_usage_by_resource_id_n(void)
-{
-       int error_code = 0;
-       int resource_id = BATTERY_MONITOR_RESOURCE_ID_CPU;
+       error_code = battery_monitor_get_power_usage_by_resource(resource_id, s_t, -1, &power_usage);
+       if (!is_battery_supported)
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
+       else
+               assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_total_usage_by_resource_id(resource_id, BATTERY_MONITOR_DURATION_TYPE_1DAY, NULL);
+       error_code = battery_monitor_get_power_usage_by_resource(resource_id, -1, -1, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else
                assert_eq(error_code, BATTERY_MONITOR_ERROR_INVALID_PARAMETER);
 
-       error_code = battery_monitor_get_total_usage_by_resource_id(resource_id, BATTERY_MONITOR_DURATION_TYPE_MAX, &battery_usage);
+       error_code = battery_monitor_get_power_usage_by_resource(BATTERY_MONITOR_RESOURCE_ID_MAX, s_t, e_t, &power_usage);
        if (!is_battery_supported)
                assert_eq(error_code, BATTERY_MONITOR_ERROR_NOT_SUPPORTED);
        else