From aeb197a08c4baea06c66470f53f50694e4af58d6 Mon Sep 17 00:00:00 2001 From: "jinwang.an" Date: Thu, 30 Nov 2017 15:27:01 +0900 Subject: [PATCH] Change initialization of efl to unit test. Change-Id: I300db8b703f1157bfa5556912ab897f9a7fc5175 Signed-off-by: jinwang.an --- src/system_setting_unittest.c | 15 +-------------- src/system_settings.c | 2 +- src/system_settings_json.c | 4 ++++ src/system_settings_ringtones.c | 2 ++ 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/system_setting_unittest.c b/src/system_setting_unittest.c index 8cfc832..214882c 100644 --- a/src/system_setting_unittest.c +++ b/src/system_setting_unittest.c @@ -1,31 +1,18 @@ -#include -#include -#include - -#include -#include - -#include -#include - #include #include -#include -#include extern void unittest_platform(); extern void unittest_api(); int main(int argc, char* argv[]) { - elm_init(1, NULL); + eina_init(); g_test_init(&argc, &argv, NULL); g_test_set_nonfatal_assertions(); unittest_platform(); unittest_api(); - elm_shutdown(); return g_test_run(); } diff --git a/src/system_settings.c b/src/system_settings.c index e8069d1..a1a35b0 100644 --- a/src/system_settings.c +++ b/src/system_settings.c @@ -2292,7 +2292,7 @@ static void utc_system_settings_set_value_string_n2(void) g_assert(ret != SYSTEM_SETTINGS_ERROR_NONE); ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, &wallpaper); - //assert_eq(ret, SYSTEM_SETTINGS_ERROR_NONE); + g_assert(ret == SYSTEM_SETTINGS_ERROR_NONE); free(wallpaper); return; } diff --git a/src/system_settings_json.c b/src/system_settings_json.c index 4ed88a5..6380c93 100644 --- a/src/system_settings_json.c +++ b/src/system_settings_json.c @@ -7,6 +7,7 @@ //#define VCONFKEY_SETAPPL_CALL_RINGTONE_USER_LIST +/* LCOV_EXCL_START */ static void ss_json_ringtone_save(JsonNode *root) { // write here @@ -22,6 +23,7 @@ static void ss_json_ringtone_save(JsonNode *root) #endif g_object_unref(generator); } +/* LCOV_EXCL_STOP */ JsonParser* ss_json_ringtone_open_file(char* path) @@ -146,6 +148,7 @@ bool ss_json_ringtone_contain(JsonNode *root, char* newfile) return ret; } +/* LCOV_EXCL_START */ void ss_json_ringtone_list(JsonNode *root) { int size = json_array_get_length(json_node_get_array(root)); @@ -158,5 +161,6 @@ void ss_json_ringtone_list(JsonNode *root) SETTING_TRACE("(%s) --- (%s) \n", name, path); } } +/* LCOV_EXCL_STOP */ diff --git a/src/system_settings_ringtones.c b/src/system_settings_ringtones.c index 7e69221..d0c1a0f 100644 --- a/src/system_settings_ringtones.c +++ b/src/system_settings_ringtones.c @@ -24,6 +24,7 @@ #include "system_settings_ringtones.h" #include "system_settings_json.h" +/* LCOV_EXCL_START */ /*remove ext name */ char *get_filename_from_fullname(const char *fullname) { @@ -39,6 +40,7 @@ char *get_filename_from_fullname(const char *fullname) return strdup((char*)tmp); } +/* LCOV_EXCL_STOP */ char *get_media_basename(const char *dir_path, const char *name) { -- 2.7.4