diff options
author | Inkyun Kil <inkyun.kil@samsung.com> | 2019-05-21 11:48:15 +0900 |
---|---|---|
committer | Inkyun Kil <inkyun.kil@samsung.com> | 2019-05-27 15:15:44 +0900 |
commit | 171db9786ca4159a6bfdf4d1ab1c0d3c6c271f99 (patch) | |
tree | 5089b74bb31e08c8f70c53f8aaa4dea3df31723a | |
parent | 9879e6990be7cd48bcbcbc6b16117be033385c44 (diff) | |
download | alarm-manager-171db9786ca4159a6bfdf4d1ab1c0d3c6c271f99.tar.gz alarm-manager-171db9786ca4159a6bfdf4d1ab1c0d3c6c271f99.tar.bz2 alarm-manager-171db9786ca4159a6bfdf4d1ab1c0d3c6c271f99.zip |
Fix warning and add codes for GCOV
Change-Id: I9be01e028dbfdb794990216f2d3c6fa3a73a77a3
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
-rwxr-xr-x | packaging/alarm-manager.spec | 60 | ||||
-rw-r--r-- | server/alarm-manager-registry.c | 4 | ||||
-rw-r--r-- | server/alarm-manager-schedule.c | 10 | ||||
-rwxr-xr-x | server/alarm-manager.c | 160 | ||||
-rwxr-xr-x | unittest/CMakeLists.txt | 3 | ||||
-rwxr-xr-x | unittest/mock/alarm_dbus.h | 77 | ||||
-rw-r--r-- | unittest/mock/mock.cc | 8 |
7 files changed, 215 insertions, 107 deletions
diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec index b9fa3c3..b702839 100755 --- a/packaging/alarm-manager.spec +++ b/packaging/alarm-manager.spec @@ -38,6 +38,11 @@ BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(cynara-session) BuildRequires: pkgconfig(cynara-creds-gdbus) +%if 0%{?gcov:1} +BuildRequires: lcov +BuildRequires: zip +%endif + %define gtests 1 %if 0%{?gtests:1} @@ -102,6 +107,30 @@ Requires: libalarm = %{version}-%{release} %description -n alarm-config-service-restricted A configuration file package for restricting service applications +################################################# +# unittests +################################################# +%package unittests +Summary: GTest for alarm manager library +Group: Development/Libraries +Requires: %{name} + +%description unittests +GTest for alarm-manager library + + +################################################# +# gcov +################################################# +%if 0%{?gcov:1} +%package gcov +Summary: Alarm library (gcov) +Group: Application Framework/Testing + +%description gcov +Alarm library gcov objects +%endif + %prep %setup -q @@ -131,10 +160,13 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -D_APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG:BOOL=${_APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG} \ -DALARM_CONF_DIR=%{_datadir}/alarm-manager \ -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \ - -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} make %{?jobs:-j%jobs} +%if 0%{?gcov:1} +mkdir -p gcov-obj +find . -name '*.gcno' -exec cp '{}' gcov-obj ';' +%endif %install rm -rf %{buildroot} @@ -156,8 +188,19 @@ install -m 0644 %SOURCE4 %{buildroot}%{_tmpfilesdir}/alarm-manager.conf mkdir -p %{buildroot}%{_libdir}/udev/rules.d install -m 0644 %SOURCE5 %{buildroot}%{_libdir}/udev/rules.d +%if 0%{?gcov:1} +mkdir -p %{buildroot}%{_datadir}/gcov/obj +install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj +%endif + %check (cd unittest && LD_LIBRARY_PATH=../lib ctest -V) +%if 0%{?gcov:1} +lcov -c --ignore-errors graph --no-external -q -d . -o alarm-manager.info +genhtml alarm-manager.info -o alarm-manager.out +zip -r alarm-manager.zip alarm-manager.out +install -m 0644 alarm-manager.zip %{buildroot}%{_datadir}/gcov/ +%endif %post -p /sbin/ldconfig @@ -198,10 +241,6 @@ fi %if 0%{?appfw_feature_alarm_manager_module_log} %attr(0755,root,root) %{TZ_SYS_ETC}/dump.d/module.d/alarmmgr_log_dump.sh %endif -%if 0%{?gtests:1} - %{_bindir}/gtest* -%endif - %files -n libalarm %manifest alarm-lib.manifest @@ -221,3 +260,14 @@ fi %files -n alarm-config-service-restricted %{_datadir}/alarm-manager/alarm-config-service-restricted + +%files unittests +%{_bindir}/gtest* + +################################################# +# gcov +################################################# +%if 0%{?gcov:1} +%files gcov +%{_datadir}/gcov/* +%endif diff --git a/server/alarm-manager-registry.c b/server/alarm-manager-registry.c index 3d4b53f..0e80c80 100644 --- a/server/alarm-manager-registry.c +++ b/server/alarm-manager-registry.c @@ -227,7 +227,7 @@ void _load_alarms_from_registry() MAX_BUNDLE_NAME_LEN - 1); noti_len = sqlite3_column_int(stmt, col_idx++); noti_len = noti_len ? noti_len : strlen(null_str); - noti = calloc(1, noti_len + 1); + noti = (char *)calloc(1, noti_len + 1); strncpy(noti, (const char *)sqlite3_column_text(stmt, col_idx++), noti_len); start->year = sqlite3_column_int(stmt, col_idx++); @@ -238,7 +238,7 @@ void _load_alarms_from_registry() start->sec = sqlite3_column_int(stmt, col_idx++); alarm_info->msec = sqlite3_column_int(stmt, col_idx++); mode->u_interval.day_of_week = sqlite3_column_int(stmt, col_idx++); - mode->repeat = sqlite3_column_int(stmt, col_idx++); + mode->repeat = (alarm_repeat_mode_t)sqlite3_column_int(stmt, col_idx++); alarm_info->alarm_type = sqlite3_column_int(stmt, col_idx++); alarm_info->reserved_info = sqlite3_column_int(stmt, col_idx++); strncpy(dst_service_name, (const char *)sqlite3_column_text(stmt, col_idx++), diff --git a/server/alarm-manager-schedule.c b/server/alarm-manager-schedule.c index 54af016..e19d535 100644 --- a/server/alarm-manager-schedule.c +++ b/server/alarm-manager-schedule.c @@ -72,7 +72,7 @@ bool _add_to_scheduled_alarm_list(__alarm_info_t *__alarm_info) __scheduled_alarm_t *alarm = NULL; __scheduled_alarm_t *entry = NULL; - alarm = g_malloc(sizeof(__scheduled_alarm_t)); + alarm = (__scheduled_alarm_t *)g_malloc(sizeof(__scheduled_alarm_t)); if (alarm == NULL) return false; @@ -92,7 +92,7 @@ bool _add_to_scheduled_alarm_list(__alarm_info_t *__alarm_info) } else { for (iter = g_scheduled_alarm_list; iter != NULL; iter = g_slist_next(iter)) { count++; - entry = iter->data; + entry = (__scheduled_alarm_t *)iter->data; if (entry->__alarm_info->app_service_name && strcmp(WAKEUP_ALARM_APP_ID, entry->__alarm_info->app_service_name)) { prior = true; @@ -119,7 +119,7 @@ bool _remove_from_scheduled_alarm_list(uid_t uid, alarm_id_t alarm_id) __scheduled_alarm_t *alarm = NULL; for (iter = g_scheduled_alarm_list; iter != NULL; iter = g_slist_next(iter)) { - alarm = iter->data; + alarm = (__scheduled_alarm_t *)iter->data; if (alarm->uid == uid && alarm->alarm_id == alarm_id) { g_scheduled_alarm_list = g_slist_remove(g_scheduled_alarm_list, iter->data); free(alarm); @@ -512,7 +512,7 @@ static bool __find_next_alarm_to_be_scheduled(time_t *min_due_time) for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; due_time = entry->due_time; double interval = 0; @@ -553,7 +553,7 @@ bool _alarm_schedule() ALARM_MGR_EXCEPTION_PRINT("[alarm-server][schedule]: There is no alarm to be scheduled."); } else { for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; due_time = entry->due_time; if (due_time == min_time) diff --git a/server/alarm-manager.c b/server/alarm-manager.c index 14dbdf0..d735dd4 100755 --- a/server/alarm-manager.c +++ b/server/alarm-manager.c @@ -134,7 +134,7 @@ static int __is_ui_app(const char *appid, uid_t uid); static long __get_proper_interval(long interval, int alarm_type); static void __alarm_add_to_list(__alarm_info_t *__alarm_info); static void __alarm_generate_alarm_id(__alarm_info_t *__alarm_info, alarm_id_t *alarm_id); -static __alarm_info_t *__alarm_update_in_list(int uid, alarm_id_t alarm_id, +static __alarm_info_t *__alarm_update_in_list(uid_t uid, alarm_id_t alarm_id, alarm_info_t *alarm_info, int update_flag, int *error_code); static bool __alarm_remove_from_list(uid_t uid, alarm_id_t alarm_id, int *error_code); @@ -163,7 +163,7 @@ static bool __initialize_noti(); static bool __initialize_dbus(); static bool __initialize_db(); -void _release_alarm_info_t(); +void _release_alarm_info_t(__alarm_info_t *entry); void on_bus_name_owner_changed(GDBusConnection *connection, const gchar *sender_name, const gchar *object_path, const gchar *interface_name, const gchar *signal_name, GVariant *parameters, gpointer user_data); bool __get_caller_unique_name(int pid, char *unique_name, int size, bool *is_app, uid_t uid); @@ -268,8 +268,8 @@ static bool __get_cached_unique_name(int pid, char *unique_name, int size, bool gboolean __hash_table_remove_cb(gpointer key, gpointer value, gpointer user_data) { - char *target_name = user_data; - appid_cache_t *data = value; + char *target_name = (char *)user_data; + appid_cache_t *data = (appid_cache_t *)value; if (target_name && data && strcmp(target_name, data->unique_name) == 0) { ALARM_MGR_LOG_PRINT("Remove cached data of [%s]", target_name); return true; @@ -279,14 +279,14 @@ gboolean __hash_table_remove_cb(gpointer key, gpointer value, gpointer user_data void __hashtable_foreach_cb(gpointer key, gpointer value, gpointer user_data) { - appid_cache_t *data = value; + appid_cache_t *data = (appid_cache_t *)value; if (data) ALARM_MGR_LOG_PRINT("# %s(%d) - %d", data->unique_name, data->pid, data->is_app); } void __free_cached_value(gpointer data) { - appid_cache_t *value = data; + appid_cache_t *value = (appid_cache_t *)data; if (value) { if (value->unique_name) @@ -467,7 +467,18 @@ int __set_time(time_t _time) bool __alarm_clean_list() { - g_slist_free_full(alarm_context.alarms, _release_alarm_info_t); + __alarm_info_t *entry = NULL; + GSList *iter = NULL; + + for (iter = alarm_context.alarms; iter != NULL; + iter = g_slist_next(iter)) { + entry = (__alarm_info_t *)iter->data; + _release_alarm_info_t(entry); + } + + g_slist_free(alarm_context.alarms); + alarm_context.alarms = NULL; + return true; } @@ -485,7 +496,7 @@ static void __alarm_generate_alarm_id(__alarm_info_t *__alarm_info, alarm_id_t * for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; if (entry->alarm_id == __alarm_info->alarm_id) { __alarm_info->alarm_id++; unique_id = false; @@ -511,7 +522,7 @@ static void __alarm_add_to_list(__alarm_info_t *__alarm_info) /* alarm list */ for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; ALARM_MGR_LOG_PRINT("[alarm-server]: alarm_id(%d).", entry->alarm_id); } @@ -547,7 +558,7 @@ static bool __check_bundle_for_update(const gchar *b_data, uid_t uid) return ret; } -static __alarm_info_t *__alarm_update_in_list(int uid, alarm_id_t alarm_id, +static __alarm_info_t *__alarm_update_in_list(uid_t uid, alarm_id_t alarm_id, alarm_info_t *alarm_info, int update_flag, int *error_code) { bool found = false; @@ -557,7 +568,7 @@ static __alarm_info_t *__alarm_update_in_list(int uid, alarm_id_t alarm_id, for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id) { found = true; @@ -628,7 +639,7 @@ static bool __alarm_remove_from_list(uid_t uid, alarm_id_t alarm_id, ALARM_MGR_LOG_PRINT("[alarm-server]: before del : alarm id(%d)", alarm_id); for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id) { alarm_info = &entry->alarm_info; @@ -769,7 +780,7 @@ gboolean __update_relative_alarms(gpointer user_data) } for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; alarm_info_t *alarm_info = &(entry->alarm_info); if (alarm_info->alarm_type & ALARM_TYPE_RELATIVE) _update_alarms(entry); @@ -800,7 +811,7 @@ static bool __alarm_update_due_time_of_all_items_in_list(double diff_time) tzset(); for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; alarm_info_t *alarm_info = &(entry->alarm_info); if (alarm_info->alarm_type & ALARM_TYPE_RELATIVE) { entry->due_time += diff_time; @@ -839,7 +850,7 @@ static bool __alarm_update_due_time_of_all_items_in_list(double diff_time) time(¤t_time); for (iter = alarm_context.alarms; iter != NULL; iter = g_slist_next(iter)) { - entry = iter->data; + entry = (__alarm_info_t *)iter->data; due_time = entry->due_time; double interval = 0; @@ -1163,7 +1174,7 @@ static char *__create_new_noti_data(char *noti_data, pid_t pid, uid_t uid) if (datalen < 0) goto end; - data = malloc(datalen); + data = (guchar *)malloc(datalen); if (data == NULL) goto end; @@ -1430,7 +1441,7 @@ static bool __can_skip_expired_cb(alarm_id_t alarm_id) alarm_info_t *alarm = NULL; for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t *)gs_iter->data; if (entry->alarm_id == alarm_id) { alarm = &(entry->alarm_info); time_t ts = 0; @@ -1501,7 +1512,7 @@ static gboolean __send_noti_to_session_bus(char *service_name, gv_data = NULL; if (len > 0) - gv_data = malloc(len); + gv_data = (uint8_t *)malloc(len); if (!gv_data) { g_variant_unref(gv); @@ -1512,7 +1523,7 @@ static gboolean __send_noti_to_session_bus(char *service_name, g_variant_store(gv, gv_data); g_variant_unref(gv); - data = malloc(len + 4); + data = (uint8_t *)malloc(len + 4); if (!data) { close(fd); free(gv_data); @@ -1573,7 +1584,7 @@ static void __alarm_send_noti_to_application(const char *app_service_name, } } -static int __get_caller_uid(const char *name) +static uid_t __get_caller_uid(const char *name) { guint uid; GVariant *ret; @@ -1605,7 +1616,7 @@ static int __get_caller_uid(const char *name) return uid; } -static int __get_caller_pid(const char *name) +static pid_t __get_caller_pid(const char *name) { guint pid; GVariant *ret; @@ -1877,9 +1888,12 @@ static void __alarm_expired() alarm_id_t alarm_id = -1; int app_pid = 0; __alarm_info_t *__alarm_info = NULL; + GSList *iter = NULL; + __scheduled_alarm_t *alarm = NULL; char alarm_id_val[32]; int b_len = 0; bundle *b = NULL; + bundle *kb; char *appid = NULL; uid_t target_uid; #ifdef _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG @@ -1909,11 +1923,8 @@ static void __alarm_expired() goto done; } - GSList *iter = NULL; - __scheduled_alarm_t *alarm = NULL; - for (iter = g_scheduled_alarm_list; iter != NULL; iter = g_slist_next(iter)) { - alarm = iter->data; + alarm = (__scheduled_alarm_t *)iter->data; alarm_id = alarm->alarm_id; __alarm_info = alarm->__alarm_info; app_pid = __alarm_info->pid; @@ -2057,7 +2068,7 @@ static void __alarm_expired() goto done; } - expire_info = malloc(sizeof(__expired_alarm_t)); + expire_info = (__expired_alarm_t *)malloc(sizeof(__expired_alarm_t)); if (G_UNLIKELY(NULL == expire_info)) { ALARM_MGR_ASSERT_PRINT("[alarm-server]:Malloc failed!Can't notify alarm expiry info\n"); goto done; @@ -2072,7 +2083,6 @@ static void __alarm_expired() SECURE_LOGD("before aul_launch appid(%s) alarm_id_str(%s)", appid, alarm_id_str); - bundle *kb; kb = bundle_create(); bundle_add_str(kb, "__ALARM_MGR_ID", alarm_id_str); @@ -2232,7 +2242,7 @@ static int __on_app_enable_cb(uid_t target_uid, int req_id, if (key && strncmp(key, "end", 3) == 0 && val && strncmp(val, "ok", 2) == 0) { SECURE_LOGD("Enable appid(%s)", appid); for (gs_iter = g_disabled_alarm_list; gs_iter != NULL; ) { - entry = gs_iter->data; + entry = (__alarm_info_t *)gs_iter->data; gs_iter = g_slist_next(gs_iter); if (strncmp(appid, entry->app_unique_name, strlen(appid)) == 0) { @@ -2271,7 +2281,7 @@ static int __on_app_disable_cb(uid_t target_uid, int req_id, if (key && strncmp(key, "end", 3) == 0 && val && strncmp(val, "ok", 2) == 0) { SECURE_LOGD("Disable appid(%s)", appid); for (gs_iter = alarm_context.alarms; gs_iter != NULL; ) { - entry = gs_iter->data; + entry = (__alarm_info_t *)gs_iter->data; gs_iter = g_slist_next(gs_iter); if (strncmp(appid, entry->app_unique_name, strlen(appid)) == 0) { @@ -2307,7 +2317,7 @@ static int __on_app_uninstalled(uid_t target_uid, int req_id, const char *pkg_ty if (strncmp(key, "end", 3) == 0 && strncmp(val, "ok", 2) == 0) { for (gs_iter = alarm_context.alarms; gs_iter != NULL;) { - entry = gs_iter->data; + entry = (__alarm_info_t *)gs_iter->data; const char *caller_pkgid = entry->caller_pkgid; const char *callee_pkgid = entry->callee_pkgid; @@ -2646,7 +2656,7 @@ static long __get_proper_interval(long interval, int alarm_type) long maxInterval = 60; for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t *)gs_iter->data; if (entry->alarm_info.alarm_type & ALARM_TYPE_PERIOD) { if (entry->alarm_info.mode.u_interval.interval <= interval && entry->alarm_info.mode.u_interval.interval > maxInterval) @@ -2667,7 +2677,7 @@ gboolean __alarm_expired_directly(gpointer user_data) return false; int time_sec = (int)(intptr_t)user_data; - __scheduled_alarm_t *alarm = g_scheduled_alarm_list->data; + __scheduled_alarm_t *alarm = (__scheduled_alarm_t *)g_scheduled_alarm_list->data; __alarm_info_t *alarm_info = alarm->__alarm_info; /* Expire alarms with duetime equal to newtime by force */ @@ -2820,7 +2830,7 @@ static int __check_modifiable(uid_t uid, pid_t pid, int alarm_id) } for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t *)gs_iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id && strcmp(caller_pkgid, entry->caller_pkgid) == 0) { ALARM_MGR_LOG_PRINT("Found alarm of app (uid:%d, pid:%d, caller_pkgid:%s) ", uid, pid, caller_pkgid); @@ -3010,6 +3020,7 @@ gboolean alarm_manager_alarm_set_timezone(AlarmManager *pObject, GDBusMethodInvo int retval = 0; int return_code = ALARMMGR_RESULT_SUCCESS; struct stat statbuf; + bundle *b = NULL; #ifdef _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; @@ -3052,7 +3063,6 @@ gboolean alarm_manager_alarm_set_timezone(AlarmManager *pObject, GDBusMethodInvo __rtc_set(); vconf_set_int(VCONFKEY_SYSTEM_TIME_CHANGED, 0); - bundle *b = NULL; b = bundle_create(); bundle_add_str(b, EVT_KEY_TIME_CHANGED, EVT_VAL_TIME_CHANGED_TRUE); eventsystem_send_system_event(SYS_EVENT_TIME_CHANGED, b); @@ -3097,8 +3107,8 @@ gboolean alarm_manager_alarm_create_appsvc(AlarmManager *pObject, GDBusMethodInv char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - int uid; - int pid; + uid_t uid; + pid_t pid; int result; bundle *b; const char *callee_appid; @@ -3159,7 +3169,7 @@ gboolean alarm_manager_alarm_create_appsvc(AlarmManager *pObject, GDBusMethodInv alarm_info.end.day = end_day; alarm_info.mode.u_interval.day_of_week = mode_day_of_week; - alarm_info.mode.repeat = mode_repeat; + alarm_info.mode.repeat = (alarm_repeat_mode_t)mode_repeat; alarm_info.alarm_type = alarm_type; alarm_info.reserved_info = reserved_info; @@ -3214,8 +3224,8 @@ gboolean alarm_manager_alarm_create_noti(AlarmManager *pObject, GDBusMethodInvoc char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3249,7 +3259,7 @@ gboolean alarm_manager_alarm_create_noti(AlarmManager *pObject, GDBusMethodInvoc alarm_info.end.day = end_day; alarm_info.mode.u_interval.day_of_week = mode_day_of_week; - alarm_info.mode.repeat = mode_repeat; + alarm_info.mode.repeat = (alarm_repeat_mode_t)mode_repeat; alarm_info.alarm_type = alarm_type; alarm_info.reserved_info = reserved_info; @@ -3302,8 +3312,8 @@ gboolean alarm_manager_alarm_create(AlarmManager *obj, GDBusMethodInvocation *in char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); char *_reserved_service_name = NULL; char *_reserved_service_name_mod = NULL; @@ -3330,7 +3340,7 @@ gboolean alarm_manager_alarm_create(AlarmManager *obj, GDBusMethodInvocation *in alarm_info.end.day = end_day; alarm_info.mode.u_interval.day_of_week = mode_day_of_week; - alarm_info.mode.repeat = mode_repeat; + alarm_info.mode.repeat = (alarm_repeat_mode_t)mode_repeat; alarm_info.alarm_type = alarm_type; alarm_info.reserved_info = reserved_info; @@ -3340,7 +3350,7 @@ gboolean alarm_manager_alarm_create(AlarmManager *obj, GDBusMethodInvocation *in if (strcmp(reserved_service_name_mod, "null") == 0) _reserved_service_name_mod = NULL; - if (!__alarm_create(&alarm_info, &alarm_id, uid, pid, 0, 0, 0, app_service_name, app_service_name_mod, + if (!__alarm_create(&alarm_info, &alarm_id, uid, pid, QUANTUMIZE, 0, 0, app_service_name, app_service_name_mod, _reserved_service_name, _reserved_service_name_mod, &return_code)) { ALARM_MGR_EXCEPTION_PRINT("Unable to create alarm! return_code[%d]", return_code); #ifdef _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG @@ -3384,8 +3394,8 @@ gboolean alarm_manager_alarm_create_periodic(AlarmManager *obj, GDBusMethodInvoc char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3431,7 +3441,7 @@ gboolean alarm_manager_alarm_create_periodic(AlarmManager *obj, GDBusMethodInvoc alarm_info.mode.u_interval.interval = __get_proper_interval(interval * 60, alarm_info.alarm_type); } - if (!__alarm_create(&alarm_info, &alarm_id, uid, pid, method, interval * 60, is_ref, + if (!__alarm_create(&alarm_info, &alarm_id, uid, pid, (periodic_method_e)method, interval * 60, is_ref, app_service_name, app_service_name_mod, NULL, NULL, &return_code)) { ALARM_MGR_EXCEPTION_PRINT("Unable to create alarm! return_code[%d]", return_code); @@ -3464,8 +3474,8 @@ gboolean alarm_manager_alarm_delete(AlarmManager *obj, GDBusMethodInvocation *in char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3516,8 +3526,8 @@ gboolean alarm_manager_alarm_delete_all(AlarmManager *obj, GDBusMethodInvocation #ifdef _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3542,7 +3552,7 @@ gboolean alarm_manager_alarm_delete_all(AlarmManager *obj, GDBusMethodInvocation for (gs_iter = alarm_context.alarms; gs_iter != NULL;) { bool is_found = false; - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; const char *tmp_appname = entry->app_unique_name; SECURE_LOGD("Try to remove app_name[%s], alarm_id[%d]\n", tmp_appname, entry->alarm_id); if (tmp_appname && strncmp(app_name, tmp_appname, strlen(tmp_appname)) == 0) { @@ -3600,8 +3610,8 @@ gboolean alarm_manager_alarm_update(AlarmManager *pObj, GDBusMethodInvocation *i char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3630,7 +3640,7 @@ gboolean alarm_manager_alarm_update(AlarmManager *pObj, GDBusMethodInvocation *i alarm_info.end.day = end_day; alarm_info.mode.u_interval.interval = mode_interval; - alarm_info.mode.repeat = mode_repeat; + alarm_info.mode.repeat = (alarm_repeat_mode_t)mode_repeat; alarm_info.alarm_type = alarm_type; alarm_info.reserved_info = reserved_info; @@ -3666,8 +3676,8 @@ gboolean alarm_manager_alarm_get_number_of_ids(AlarmManager *pObject, GDBusMetho __alarm_info_t *entry = NULL; int num_of_ids = 0; int return_code = ALARMMGR_RESULT_SUCCESS; - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3687,7 +3697,7 @@ gboolean alarm_manager_alarm_get_number_of_ids(AlarmManager *pObject, GDBusMetho SECURE_LOGD("Called by process (uid:%d, pid:%d, unique_name:%s)", uid, pid, app_name); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; SECURE_LOGD("app_name=%s, app_unique_name=%s", app_name, entry->app_unique_name); if (entry->uid == uid && strncmp(app_name, entry->app_unique_name, strlen(app_name)) == 0) { @@ -3712,8 +3722,8 @@ gboolean alarm_manager_alarm_get_list_of_ids(AlarmManager *pObject, GDBusMethodI GVariantBuilder *builder = NULL; int num_of_ids = 0; int return_code = ALARMMGR_RESULT_SUCCESS; - int uid; - int pid; + uid_t uid; + pid_t pid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3740,7 +3750,7 @@ gboolean alarm_manager_alarm_get_list_of_ids(AlarmManager *pObject, GDBusMethodI builder = g_variant_builder_new(G_VARIANT_TYPE("ai")); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (entry->uid == uid && strncmp(app_name, (entry->app_unique_name), strlen(app_name)) == 0) { g_variant_builder_add(builder, "i", entry->alarm_id); @@ -3767,7 +3777,7 @@ gboolean alarm_manager_alarm_get_appsvc_info(AlarmManager *pObject, GDBusMethodI __alarm_info_t *entry = NULL; int return_code = ALARMMGR_RESULT_SUCCESS; gchar *b_data = NULL; - int uid; + uid_t uid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3780,7 +3790,7 @@ gboolean alarm_manager_alarm_get_appsvc_info(AlarmManager *pObject, GDBusMethodI SECURE_LOGD("called for uid(%d), alarm_id(%d)\n", uid, alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id) { found = true; b_data = g_strdup(entry->bundle); @@ -3811,7 +3821,7 @@ gboolean alarm_manager_alarm_get_noti_info(AlarmManager *pObject, GDBusMethodInv __alarm_info_t *entry = NULL; int return_code = ALARMMGR_RESULT_SUCCESS; gchar *noti_data = NULL; - int uid; + uid_t uid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3824,7 +3834,7 @@ gboolean alarm_manager_alarm_get_noti_info(AlarmManager *pObject, GDBusMethodInv SECURE_LOGD("called for uid(%d), alarm_id(%d)\n", uid, alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id) { found = true; noti_data = strdup(entry->noti); @@ -3854,7 +3864,7 @@ gboolean alarm_manager_alarm_get_info(AlarmManager *pObject, GDBusMethodInvocati __alarm_info_t *entry = NULL; alarm_info_t *alarm_info = NULL; int return_code = ALARMMGR_RESULT_SUCCESS; - int uid; + uid_t uid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3866,7 +3876,7 @@ gboolean alarm_manager_alarm_get_info(AlarmManager *pObject, GDBusMethodInvocati SECURE_LOGD("called for uid(%d), alarm_id(%d)\n", uid, alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id) { alarm_info = &(entry->alarm_info); break; @@ -3895,7 +3905,7 @@ gboolean alarm_manager_alarm_get_next_duetime(AlarmManager *pObject, GDBusMethod __alarm_info_t *find_item = NULL; int return_code = ALARMMGR_RESULT_SUCCESS; time_t duetime = 0; - int uid; + uid_t uid; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -3907,7 +3917,7 @@ gboolean alarm_manager_alarm_get_next_duetime(AlarmManager *pObject, GDBusMethod SECURE_LOGD("called for alarm_id(%d)\n", alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id) { find_item = entry; break; @@ -3956,7 +3966,8 @@ gboolean alarm_manager_alarm_get_all_info(AlarmManager *pObject, GDBusMethodInvo GSList *gs_iter = NULL; __alarm_info_t *entry = NULL; char *error_message = NULL; - int uid; + uid_t uid; + int index = 0; const char *name = g_dbus_method_invocation_get_sender(invoc); uid = __get_caller_uid(name); @@ -4001,9 +4012,8 @@ gboolean alarm_manager_alarm_get_all_info(AlarmManager *pObject, GDBusMethodInvo } /* Get information of all alarms and save those into the DB. */ - int index = 0; for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (uid >= REGULAR_UID_MIN && entry->uid != uid) continue; ++index; @@ -4058,7 +4068,7 @@ gboolean alarm_manager_alarm_set_global(AlarmManager *pObject, GDBusMethodInvoca alarm_info_t *alarm_info = NULL; int retval = 0; int return_code = ALARMMGR_RESULT_SUCCESS; - int uid; + uid_t uid; const char *name = g_dbus_method_invocation_get_sender(invoc); char *callee_pkgid; @@ -4071,7 +4081,7 @@ gboolean alarm_manager_alarm_set_global(AlarmManager *pObject, GDBusMethodInvoca SECURE_LOGD("called for uid(%d), alarm_id(%d)\n", uid, alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (entry->uid == uid && entry->alarm_id == alarm_id) { alarm_info = &(entry->alarm_info); break; @@ -4126,7 +4136,7 @@ gboolean alarm_manager_alarm_get_global(AlarmManager *pObject, GDBusMethodInvoca SECURE_LOGD("called for alarm_id(%d)\n", alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { - entry = gs_iter->data; + entry = (__alarm_info_t*)gs_iter->data; if (entry->alarm_id == alarm_id) { find_item = entry; break; diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 9ad9c6b..8e7cad9 100755 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -1,6 +1,7 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/common) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mock) ENABLE_TESTING() @@ -23,7 +24,7 @@ INCLUDE_DIRECTORIES(${svr_pkgs_INCLUDE_DIRS}) LINK_DIRECTORIES(${svr_pkgs_LIBRARY_DIRS}) ADD_EXECUTABLE(${GTEST_TEST} ${GTEST_TEST_SRCS}) -TARGET_LINK_LIBRARIES(${GTEST_TEST} ${gtest_pkgs_LIBRARIES} ${LIBRARY} ${svr_pkgs_LIBRARIES} rt alarm) +TARGET_LINK_LIBRARIES(${GTEST_TEST} ${gtest_pkgs_LIBRARIES} ${LIBRARY} ${svr_pkgs_LIBRARIES} alarm rt) ADD_TEST(${GTEST_TEST} ${GTEST_TEST}) diff --git a/unittest/mock/alarm_dbus.h b/unittest/mock/alarm_dbus.h index fbfdd09..5af8b26 100755 --- a/unittest/mock/alarm_dbus.h +++ b/unittest/mock/alarm_dbus.h @@ -20,11 +20,13 @@ #include "alarm-mgr-stub.h" -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_info_sync, AlarmManager*, gint, gint*, gint*, gint*, gint*, gint*, gint*, gint*, gint*, gint*, gint*, gint*, gint*, gint*, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_info_sync, + AlarmManager*, gint, gint*, gint*, gint*, gint*, gint*, gint*, gint*, + gint*, gint*, gint*, gint*, gint*, gint*, gint*, GCancellable*, GError**); DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_create_appsvc_sync, - AlarmManager*, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, - gint, gint, gint, const char*, gint*, gint*, GCancellable*, GError**); + AlarmManager*, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, + gint, gint, gint, gint, const char*, gint*, gint*, GCancellable*, GError**); DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_appsvc_info_sync, AlarmManager*, gint, gchar**, gint*, GCancellable*, GError**); @@ -33,33 +35,70 @@ DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_create_noti_sync, AlarmManager*, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, const char*, gint*, gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_noti_info_sync, AlarmManager*, gint, gchar**, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_noti_info_sync, + AlarmManager*, gint, gchar**, gint*, GCancellable*, GError**); + +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_rtc_time_sync, + AlarmManager*, gint, gint, gint, gint, gint, gint, gint*, GCancellable*, + GError**); + +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_delete_sync, + AlarmManager*, gint, gint*, GCancellable*, GError**); + +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_delete_all_sync, + AlarmManager*, gint*, GCancellable*, GError**); + +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_number_of_ids_sync, + AlarmManager*, gint*, gint*, GCancellable*, GError**); + +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_list_of_ids_sync, + AlarmManager*, gint, GVariant**, gint*, gint*, GCancellable*, GError**); + +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_next_duetime_sync, + AlarmManager*, gint, gint*, gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_rtc_time_sync, AlarmManager*, gint, gint, gint, gint, gint, gint, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_create_periodic_sync, + AlarmManager*, const gchar*, const gchar*, gint, gint, gint, gint*, + gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_delete_sync, AlarmManager*, gint, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_time_sync, + AlarmManager*, gint, gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_delete_all_sync, AlarmManager*, gint*, GCancellable*, GError**); +DECLARE_FAKE_VOID_FUNC(alarm_manager_call_alarm_set_time, AlarmManager*, gint, + GCancellable*, GAsyncReadyCallback, gpointer); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_number_of_ids_sync, AlarmManager*, gint*, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_timezone_sync, + AlarmManager*, const char*, gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_list_of_ids_sync, AlarmManager*, gint, GVariant**, gint*, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, + alarm_manager_call_alarm_set_time_with_propagation_delay_sync, + AlarmManager*, guint, guint, guint, guint, gint*, GCancellable*, + GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_next_duetime_sync, AlarmManager*, gint, gint*, gint*, GCancellable*, GError**); +DECLARE_FAKE_VOID_FUNC(alarm_manager_call_alarm_set_time_with_propagation_delay, + AlarmManager*, guint, guint, guint, guint, GCancellable*, + GAsyncReadyCallback, gpointer); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_create_periodic_sync, AlarmManager*, const gchar*, const gchar*, gint, gint, gint, gint*, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_update_sync, + AlarmManager*, gint, gint, gint, gint, gint, gint, gint, gint, gint, + gint, gint, gint, gint, gint, gint, gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_time_sync, AlarmManager*, gint, gint*, GCancellable*, GError**); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_global_sync, + AlarmManager*, gint, gboolean, gint*, GCancellable*, GError**); -DECLARE_FAKE_VOID_FUNC(alarm_manager_call_alarm_set_time, AlarmManager*, gint, GCancellable*, GAsyncReadyCallback, gpointer); +DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_global_sync, + AlarmManager*, gint, gboolean*, gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_timezone_sync, AlarmManager*, const char*, gint*, GCancellable*, GError**); +//glib +DECLARE_FAKE_VALUE_FUNC(GVariant*, g_dbus_connection_call_sync, GDBusConnection*, + const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, + const GVariantType*, GDBusCallFlags, gint, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_time_with_propagation_delay_sync, AlarmManager*, guint, guint, guint, guint, gint*, GCancellable*, GError**); -DECLARE_FAKE_VOID_FUNC(alarm_manager_call_alarm_set_time_with_propagation_delay, AlarmManager*, guint, guint, guint, guint, GCancellable*, GAsyncReadyCallback, gpointer); +DECLARE_FAKE_VALUE_FUNC(const gchar*, g_dbus_method_invocation_get_sender, GDBusMethodInvocation*); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_update_sync, AlarmManager*, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint*, GCancellable*, GError**); +DECLARE_FAKE_VOID_FUNC3_VARARG(g_variant_get, GVariant*, const gchar*, ...); +DECLARE_FAKE_VALUE_FUNC3_VARARG(gboolean, g_variant_iter_loop, GVariantIter*, const gchar*, ...); +DECLARE_FAKE_VOID_FUNC(g_variant_iter_free, GVariantIter*); +DECLARE_FAKE_VOID_FUNC(g_variant_unref, GVariant*); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_global_sync, AlarmManager*, gint, gboolean, gint*, GCancellable*, GError**); -DECLARE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_global_sync, AlarmManager*, gint, gboolean*, gint*, GCancellable*, GError**); diff --git a/unittest/mock/mock.cc b/unittest/mock/mock.cc index 0fdd80d..0a3efd6 100644 --- a/unittest/mock/mock.cc +++ b/unittest/mock/mock.cc @@ -77,6 +77,14 @@ DEFINE_FAKE_VOID_FUNC(alarm_manager_call_alarm_set_time_with_propagation_delay, DEFINE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_update_sync, AlarmManager*, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint, gint*, GCancellable*, GError**); DEFINE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_set_global_sync, AlarmManager*, gint, gboolean, gint*, GCancellable*, GError**); DEFINE_FAKE_VALUE_FUNC(gboolean, alarm_manager_call_alarm_get_global_sync, AlarmManager*, gint, gboolean*, gint*, GCancellable*, GError**); +DEFINE_FAKE_VALUE_FUNC(GVariant*, g_dbus_connection_call_sync, GDBusConnection*, + const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, + const GVariantType*, GDBusCallFlags, gint, GCancellable*, GError**); +DEFINE_FAKE_VALUE_FUNC(const gchar*, g_dbus_method_invocation_get_sender, GDBusMethodInvocation*); +DEFINE_FAKE_VOID_FUNC3_VARARG(g_variant_get, GVariant*, const gchar*, ...); +DEFINE_FAKE_VALUE_FUNC3_VARARG(gboolean, g_variant_iter_loop, GVariantIter*, const gchar*, ...); +DEFINE_FAKE_VOID_FUNC(g_variant_iter_free, GVariantIter*); +DEFINE_FAKE_VOID_FUNC(g_variant_unref, GVariant*); /* aul.h */ DEFINE_FAKE_VALUE_FUNC(int, aul_app_get_appid_bypid, int, char*, int); |