Change test files and modification vconf

Change-Id: I62e1651b9e2b7acc75a1f7793314559aa7d2c08b
Signed-off-by: JinWang An <jinwang.an@samsung.com>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 95aef25..4183ed9 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,14 +23,7 @@ FILE(GLOB MOCK_SRCS mocks/*.c mocks/*.cpp)
 ADD_LIBRARY(${MOCK_LIB} SHARED ${MOCK_SRCS})
 
 SET(SSTT_GTEST "sst-unit-test")
-SET(SSTT_GTEST_SRC     sst_gtest_api.cpp
-                                       sst_gtest_font.cpp
-                                       sst_gtest_misc.cpp
-                                       sst_gtest_screen.cpp
-                                       sst_gtest_sound.cpp
-                                       sst_gtest_time_N_locale.cpp
-                                       sst_gtest_interface.cpp
-                                       sst_gtest_vconf.cpp)
+FILE(GLOB SSTT_GTEST_SRC sst_gtest_normal_*.cpp)
 ADD_EXECUTABLE(${SSTT_GTEST} ${SSTT_COMMON_SRC} ${SSTT_GTEST_SRC})
 TARGET_LINK_LIBRARIES(${SSTT_GTEST} ${MOCK_LIB} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
 INSTALL(TARGETS ${SSTT_GTEST} DESTINATION ${TEST_INSTALL_DIR})

diff --git a/tests/mocks/sstt_mock.h b/tests/mocks/sstt_mock.h
index 9a098c1..0e8d50a 100644 (file)
--- a/tests/mocks/sstt_mock.h
+++ b/tests/mocks/sstt_mock.h
@@ -50,7 +50,6 @@ void sstm_vconf_get_str_setup(const char *key, const char *val, int ret);
 void sstm_vconf_set_int_setup(const char *key, int ret);
 void sstm_vconf_set_bool_setup(const char *key, int ret);
 void sstm_vconf_set_str_setup(const char *key, int ret);
-void sstm_vconf_clear_str(const char *key);
 void sstm_vconf_notify_key_changed_setup(bool enable);
 void sstm_vconf_ignore_key_changed_setup(bool enable);
 

diff --git a/tests/mocks/vconf.cpp b/tests/mocks/vconf.cpp
index d999d65..290cded 100644 (file)
--- a/tests/mocks/vconf.cpp
+++ b/tests/mocks/vconf.cpp
@@ -40,18 +40,15 @@ enum vconf_t {
 };
 
 typedef struct {
+       string val;
        int getRet;
        int setRet;
-} retData;
-
-typedef struct {
-       char *val;
-       retData ret;
 } strData;
 
 typedef struct {
        int val;
-       retData ret;
+       int getRet;
+       int setRet;
 } intData;
 
 typedef struct _keynode_t {
@@ -66,9 +63,9 @@ typedef struct _keynode_t {
 
 typedef void(*vconf_callback_fn) (keynode_t *node, void *user_data);
 
-std::map<string, strData> vconfStrMap;
-std::map<string, intData> vconfIntMap;
-std::map<string, intData> vconfBoolMap;
+static std::map<string, strData> vconfStrMap;
+static std::map<string, intData> vconfIntMap;
+static std::map<string, intData> vconfBoolMap;
 
 static bool sstm_vconf_notify_key_changed_enable = true;
 static bool sstm_vconf_ignore_key_changed_enable = true;
@@ -77,84 +74,70 @@ API void sstm_vconf_get_int_setup(const char *key, int val, int ret)
 {
        intData data = {
                .val = val,
-               .ret = {
-                       .getRet = ret,
-                       .setRet = 0
-               }
+               .getRet = ret,
+               .setRet = 0
        };
        vconfIntMap[key] = data;
-       DBG("get int setup key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].ret.getRet);
+       DBG("get int setup key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].getRet);
 }
 
 API void sstm_vconf_get_bool_setup(const char *key, bool val, int ret)
 {
        intData data = {
                .val = val,
-               .ret = {
-                       .getRet = ret,
-                       .setRet = 0
-               }
+               .getRet = ret,
+               .setRet = 0
        };
        vconfBoolMap[key] = data;
-       DBG("get bool setup key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].ret.getRet);
+       DBG("get bool setup key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].getRet);
 }
 
 API void sstm_vconf_get_str_setup(const char *key, const char *val, int ret)
 {
        strData data = {
-               .val = strdup(val),
-               .ret = {
-                       .getRet = ret,
-                       .setRet = 0
-               }
+               .val = val,
+               .getRet = ret,
+               .setRet = 0
        };
        vconfStrMap[key] = data;
-       DBG("get str setup key(%s) val(%s) ret(%d)", key, vconfStrMap[key].val, vconfStrMap[key].ret.getRet);
+       DBG("get str setup key(%s) val(%s) ret(%d)", key, vconfStrMap[key].val.c_str(), vconfStrMap[key].getRet);
 }
 
 API void sstm_vconf_set_int_setup(const char *key, int ret)
 {
        intData data = {
                .val = 0,
-               .ret = {
-                       .getRet = 0,
-                       .setRet = ret
-               }
+               .getRet = 0,
+               .setRet = ret
        };
        vconfIntMap[key] = data;
-       DBG("set int setup key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].ret.setRet);
+       DBG("set int setup key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].setRet);
 }
 
 API void sstm_vconf_set_bool_setup(const char *key, int ret)
 {
        intData data = {
                .val = 0,
-               .ret = {
-                       .getRet = 0,
-                       .setRet = ret
-               }
+               .getRet = 0,
+               .setRet = ret
        };
        vconfBoolMap[key] = data;
-       DBG("set bool setup key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].ret.setRet);
+       DBG("set bool setup key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].setRet);
 }
 
 API void sstm_vconf_set_str_setup(const char *key, int ret)
 {
        strData data = {
-               .val = NULL,
-               .ret = {
-                       .getRet = 0,
-                       .setRet = ret
-               }
+               .val = "",
+               .getRet = 0,
+               .setRet = ret
        };
        vconfStrMap[key] = data;
-       DBG("set str setup key(%s) val(%s) ret(%d)", key, vconfStrMap[key].val, vconfStrMap[key].ret.setRet);
+       DBG("set str setup key(%s) val(%s) ret(%d)", key, vconfStrMap[key].val.c_str(), vconfStrMap[key].setRet);
 }
 
 API void sstm_vconf_clear_str(const char *key)
 {
-       free(vconfStrMap[key].val);
-       vconfStrMap[key].val = NULL;
 }
 
 API void sstm_vconf_notify_key_changed_setup(bool enable)
@@ -185,7 +168,7 @@ void checkNotifyCallBack(const char *in_key, int type, void *val)
                        node.type = type;
                        switch (node.type) {
                        case VCONF_TYPE_STRING:
-                               node.value.s = strdup((char*)val);
+                               node.value.s = (char*)val;
                                break;
                        case VCONF_TYPE_INT:
                                node.value.i = *(int*)val;
@@ -198,8 +181,6 @@ void checkNotifyCallBack(const char *in_key, int type, void *val)
                                return;
                        }
                        cb(&node, user_data);
-                       if (VCONF_TYPE_STRING == node.type)
-                               free(node.value.s);
                }
        }
 }
@@ -208,33 +189,32 @@ void checkNotifyCallBack(const char *in_key, int type, void *val)
 API int vconf_set_int(const char *key, const int val)
 {
        vconfIntMap[key].val = val;
-       DBG("set int key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].ret.setRet);
+       DBG("set int key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].setRet);
        checkNotifyCallBack(key, VCONF_TYPE_INT, &vconfIntMap[key].val);
-       return vconfIntMap[key].ret.setRet;
+       return vconfIntMap[key].setRet;
 }
 
 API int vconf_set_bool(const char *key, const int val)
 {
        vconfBoolMap[key].val = val;
-       DBG("set bool key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].ret.setRet);
+       DBG("set bool key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].setRet);
        checkNotifyCallBack(key, VCONF_TYPE_BOOL, &vconfBoolMap[key].val);
-       return vconfBoolMap[key].ret.setRet;
+       return vconfBoolMap[key].setRet;
 }
 
 API int vconf_set_str(const char *key, const char *val)
 {
-       free(vconfStrMap[key].val);
-       vconfStrMap[key].val = strdup(val);
-       checkNotifyCallBack(key, VCONF_TYPE_STRING, vconfStrMap[key].val);
-       return vconfStrMap[key].ret.setRet;
+       vconfStrMap[key].val = val;
+       checkNotifyCallBack(key, VCONF_TYPE_STRING, (void*)vconfStrMap[key].val.c_str());
+       return vconfStrMap[key].setRet;
 }
 
 API char* vconf_get_str(const char *key)
 {
        RETV_IF(NULL == key, NULL);
-       DBG("get key(%s) val(%s) ret(%d)", key, vconfStrMap[key].val, vconfStrMap[key].ret.getRet);
-       if (VCONF_OK == vconfStrMap[key].ret.getRet)
-               return strdup(vconfStrMap[key].val);
+       DBG("get key(%s) val(%s) ret(%d)", key, vconfStrMap[key].val.c_str(), vconfStrMap[key].getRet);
+       if (VCONF_OK == vconfStrMap[key].getRet)
+               return strdup(vconfStrMap[key].val.c_str());
        else
                return NULL;
 }
@@ -244,9 +224,9 @@ API int vconf_get_int(const char *key, int *val)
        RETV_IF(NULL == key, VCONF_ERROR);
        RETV_IF(NULL == val, VCONF_ERROR);
 
-       DBG("get key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].ret.getRet);
+       DBG("get key(%s) val(%d) ret(%d)", key, vconfIntMap[key].val, vconfIntMap[key].getRet);
        *val = vconfIntMap[key].val;
-       return vconfIntMap[key].ret.getRet;
+       return vconfIntMap[key].getRet;
 }
 
 API int vconf_get_bool(const char *key, int *val)
@@ -254,9 +234,9 @@ API int vconf_get_bool(const char *key, int *val)
        RETV_IF(NULL == key, VCONF_ERROR);
        RETV_IF(NULL == val, VCONF_ERROR);
 
-       DBG("get bool key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].ret.getRet);
+       DBG("get bool key(%s) val(%d) ret(%d)", key, vconfBoolMap[key].val, vconfBoolMap[key].getRet);
        *val = vconfBoolMap[key].val;
-       return vconfBoolMap[key].ret.getRet;
+       return vconfBoolMap[key].getRet;
 }
 
 API int vconf_notify_key_changed(const char *in_key, vconf_callback_fn cb,

diff --git a/tests/sst_gtest_api.cpp b/tests/sst_gtest_normal_api.cpp
similarity index 98%
rename from tests/sst_gtest_api.cpp
rename to tests/sst_gtest_normal_api.cpp
index 445a33d..15244c6 100644 (file)
--- a/tests/sst_gtest_api.cpp
+++ b/tests/sst_gtest_normal_api.cpp
@@ -208,8 +208,6 @@ TEST(SstApiTest, getValueString)
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
        ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE_PKG_LIST, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST(SstApiTest, setValueString)
@@ -230,8 +228,6 @@ TEST(SstApiTest, setValueString)
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
        ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE_PKG_LIST, setVal);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST_F(SstApiCBTest, setUnsetChangedCallback)
@@ -275,8 +271,6 @@ TEST_F(SstApiCBTest, addDeleteForeachValueString)
        sstm_vconf_get_str_setup(VCONFKEY_SETAPPL_CALL_RINGTONE_USER_LIST, "[]", 0);
        g_idle_add(checkRingtoneIdle, NULL);
        g_main_loop_run(loop);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_USER_LIST);
 }
 
 TEST_F(SstApiCBTest, ForeachValueString)
@@ -287,7 +281,6 @@ TEST_F(SstApiCBTest, ForeachValueString)
        sstm_opendir_setup(false);
        int ret = system_settings_foreach_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, NULL);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_USER_LIST);
        sstm_opendir_setup(true);
 }
 

diff --git a/tests/sst_gtest_font.cpp b/tests/sst_gtest_normal_font.cpp
similarity index 97%
rename from tests/sst_gtest_font.cpp
rename to tests/sst_gtest_normal_font.cpp
index 9ea597d..7cb060b 100644 (file)
--- a/tests/sst_gtest_font.cpp
+++ b/tests/sst_gtest_normal_font.cpp
@@ -116,8 +116,6 @@ TEST(SstFontTest, setFontType)
        EXPECT_STREQ(setVal, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME);
 }
 
 TEST(SstFontTest, setFontSize)
@@ -150,6 +148,4 @@ TEST(SstFontTest, setFontSize)
                EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
                EXPECT_EQ(setVal, getVal);
        }
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME);
 }

diff --git a/tests/sst_gtest_interface.cpp b/tests/sst_gtest_normal_interface.cpp
similarity index 100%
rename from tests/sst_gtest_interface.cpp
rename to tests/sst_gtest_normal_interface.cpp

diff --git a/tests/sst_gtest_misc.cpp b/tests/sst_gtest_normal_misc.cpp
similarity index 94%
rename from tests/sst_gtest_misc.cpp
rename to tests/sst_gtest_normal_misc.cpp
index 8401e8a..245b575 100644 (file)
--- a/tests/sst_gtest_misc.cpp
+++ b/tests/sst_gtest_normal_misc.cpp
@@ -80,8 +80,6 @@ TEST(SstMisc, getAdsID)
        ret = sst_misc_get_ads_id(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_AD_ID);
 }
 
 TEST(SstMisc, getAdsIDERR)
@@ -96,8 +94,6 @@ TEST(SstMisc, getAdsIDERR)
 
        ret = sst_misc_get_ads_id(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_AD_ID);
 }
 
 TEST(SstMisc, setAdsID)
@@ -120,8 +116,6 @@ TEST(SstMisc, setAdsID)
        EXPECT_STREQ(setVal, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_AD_ID);
 }
 
 TEST(SstMisc, setAdsIDERR)
@@ -135,8 +129,6 @@ TEST(SstMisc, setAdsIDERR)
        sstm_vconf_set_str_setup(VCONFKEY_SETAPPL_AD_ID, -1);
        ret = sst_misc_set_ads_id(iface, setVal);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_AD_ID);
 }
 
 TEST(SstMisc, getUltraDataSaveState)
@@ -153,8 +145,6 @@ TEST(SstMisc, getUltraDataSaveState)
 
        ret = sst_misc_get_uds_state(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_UDSM_PKGID_LIST);
 }
 
 TEST(SstMisc, getUltraDataSaveStateERR)
@@ -186,6 +176,4 @@ TEST(SstMisc, getUltraDataSaveStateERR)
        sstm_vconf_get_int_setup(VCONFKEY_SETAPPL_UDSM, 0, -1);
        ret = sst_misc_get_uds_state(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_UDSM_PKGID_LIST);
 }

diff --git a/tests/sst_gtest_screen.cpp b/tests/sst_gtest_normal_screen.cpp
similarity index 95%
rename from tests/sst_gtest_screen.cpp
rename to tests/sst_gtest_normal_screen.cpp
index 730e904..0c4b602 100644 (file)
--- a/tests/sst_gtest_screen.cpp
+++ b/tests/sst_gtest_normal_screen.cpp
@@ -42,8 +42,6 @@ TEST(SstScreenTest, getHomeWallPaper)
        ret = sst_vconf_get_str(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_BGSET);
 }
 
 TEST(SstScreenTest, setHomeWallPaper)
@@ -61,8 +59,6 @@ TEST(SstScreenTest, setHomeWallPaper)
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(sstBgPath, getVal);
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_BGSET);
 }
 
 TEST(SstScreenTest, setHomeWallPaperERR)
@@ -97,8 +93,6 @@ TEST(SstScreenTest, setLockWallPaper)
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(sstBgPath, getVal);
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_IDLE_LOCK_BGSET);
 }
 
 TEST(SstScreenTest, setLockWallPaperERR)
@@ -115,8 +109,6 @@ TEST(SstScreenTest, setLockWallPaperERR)
        sstm_evas_object_image_load_error_setup(-1);
        ret = sst_screen_set_lock_wallpaper(iface, "test.png");
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_IDLE_LOCK_BGSET);
 }
 
 TEST(SstScreenTest, getLockScreen)
@@ -131,8 +123,6 @@ TEST(SstScreenTest, getLockScreen)
        ret = sst_screen_get_lockscreen(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR);
 }
 
 TEST(SstScreenTest, getLockScreenERR)
@@ -154,8 +144,6 @@ TEST(SstScreenTest, getLockScreenERR)
        sstm_vconf_get_int_setup(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, SETTING_SCREEN_LOCK_TYPE_PASSWORD, -1);
        ret = sst_screen_get_lockscreen(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR);
 }
 
 TEST(SstScreenTest, setLockScreen)
@@ -189,8 +177,6 @@ TEST(SstScreenTest, setLockScreen)
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_LOCKSCREEN_APP_PASSWORD_MODE, ret);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR);
 }
 
 TEST(SstScreenTest, setLockScreenERR)
@@ -233,8 +219,6 @@ TEST(SstScreenTest, setLockScreenERR)
        sstm_pkgmgrinfo_appinfo_get_appinfo_setup(-1);
        ret = sst_screen_set_lockscreen(iface, setVal);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR);
 }
 
 TEST(SstScreenTest, setBackLightTime)

diff --git a/tests/sst_gtest_sound.cpp b/tests/sst_gtest_normal_sound.cpp
similarity index 93%
rename from tests/sst_gtest_sound.cpp
rename to tests/sst_gtest_normal_sound.cpp
index 234975d..76c4e9a 100644 (file)
--- a/tests/sst_gtest_sound.cpp
+++ b/tests/sst_gtest_normal_sound.cpp
@@ -99,8 +99,6 @@ TEST_F(SstSoundTest, getCallRingtone)
        ret = sst_sound_get_call_ringtone(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, getCallRingtoneERR)
@@ -113,8 +111,6 @@ TEST_F(SstSoundTest, getCallRingtoneERR)
        sstm_vconf_get_str_setup(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, "error", -1);
        ret = sst_sound_get_call_ringtone(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, setCallRingtone)
@@ -138,8 +134,6 @@ TEST_F(SstSoundTest, setCallRingtone)
        EXPECT_STREQ(ringtonePath, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, setCallRingtoneERR)
@@ -152,8 +146,6 @@ TEST_F(SstSoundTest, setCallRingtoneERR)
        sstm_vconf_set_str_setup(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, -1);
        ret = sst_sound_set_call_ringtone(iface, ringtonePath);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, addDelGetRingtone)
@@ -162,8 +154,6 @@ TEST_F(SstSoundTest, addDelGetRingtone)
        sstm_vconf_get_str_setup(VCONFKEY_SETAPPL_CALL_RINGTONE_USER_LIST, "[]", 0);
        g_idle_add(checkRingtoneIdle, NULL);
        g_main_loop_run(loop);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
 }
 
 
@@ -186,9 +176,6 @@ TEST_F(SstSoundTest, getEmailAlert)
        ret = sst_sound_get_email_alert(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, getEmailAlertERR)
@@ -201,8 +188,6 @@ TEST_F(SstSoundTest, getEmailAlertERR)
        sstm_vconf_get_str_setup(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, ringtonePath, -1);
        ret = sst_sound_get_email_alert(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, setEmailAlert)
@@ -226,8 +211,6 @@ TEST_F(SstSoundTest, setEmailAlert)
        EXPECT_STREQ(ringtonePath, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, setEmailAlertERR)
@@ -245,8 +228,6 @@ TEST_F(SstSoundTest, setEmailAlertERR)
        ret = sst_sound_set_email_alert(iface, ringtonePath);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
        sstm_access_setup(true);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, setNotification)
@@ -270,8 +251,6 @@ TEST_F(SstSoundTest, setNotification)
        EXPECT_STREQ(ringtonePath, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, setNotificationERR)
@@ -289,8 +268,6 @@ TEST_F(SstSoundTest, setNotificationERR)
        ret = sst_sound_set_notification(iface, ringtonePath);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
        sstm_access_setup(true);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
 }
 
 TEST_F(SstSoundTest, getSlientMode)

diff --git a/tests/sst_gtest_time_N_locale.cpp b/tests/sst_gtest_normal_time_N_locale.cpp
similarity index 94%
rename from tests/sst_gtest_time_N_locale.cpp
rename to tests/sst_gtest_normal_time_N_locale.cpp
index 8dea20d..7405165 100644 (file)
--- a/tests/sst_gtest_time_N_locale.cpp
+++ b/tests/sst_gtest_normal_time_N_locale.cpp
@@ -39,8 +39,6 @@ TEST(SstTimeNLocaleTest, getCountry)
        ret = sst_locale_get_country(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST(SstTimeNLocaleTest, getCountryERR)
@@ -57,8 +55,6 @@ TEST(SstTimeNLocaleTest, getCountryERR)
        sstm_vconf_get_str_setup(VCONFKEY_REGIONFORMAT, "ko", -1);
        ret = sst_locale_get_country(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST(SstTimeNLocaleTest, setCountry)
@@ -80,8 +76,6 @@ TEST(SstTimeNLocaleTest, setCountry)
        EXPECT_STREQ(setVal, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST(SstTimeNLocaleTest, setCountryERR)
@@ -94,8 +88,6 @@ TEST(SstTimeNLocaleTest, setCountryERR)
        sstm_vconf_set_str_setup(VCONFKEY_REGIONFORMAT, -1);
        ret = sst_locale_set_country(iface, setVal);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST(SstTimeNLocaleTest, getLanguage)
@@ -110,8 +102,6 @@ TEST(SstTimeNLocaleTest, getLanguage)
        ret = sst_locale_get_language(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_LANGSET);
 }
 
 TEST(SstTimeNLocaleTest, getLanguageERR)
@@ -128,8 +118,6 @@ TEST(SstTimeNLocaleTest, getLanguageERR)
        sstm_vconf_get_str_setup(VCONFKEY_LANGSET, "ko", -1);
        ret = sst_locale_get_language(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_LANGSET);
 }
 
 TEST(SstTimeNLocaleTest, setLanguage)
@@ -151,8 +139,6 @@ TEST(SstTimeNLocaleTest, setLanguage)
        EXPECT_STREQ(setVal, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_LANGSET);
 }
 
 TEST(SstTimeNLocaleTest, setLanguageERR)
@@ -166,8 +152,6 @@ TEST(SstTimeNLocaleTest, setLanguageERR)
        sstm_vconf_set_str_setup(VCONFKEY_LANGSET, -1);
        ret = sst_locale_set_language(iface, setVal);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_LANGSET);
 }
 
 TEST(SstTimeNLocaleTest, getTimeformat24Hour)
@@ -276,8 +260,6 @@ TEST(SstTimeNLocaleTest, setTimeZone)
        EXPECT_STREQ(setVal, getVal);
 
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_TIMEZONE_ID);
 }
 
 TEST(SstTimeNLocaleTest, setTimeZoneERR)
@@ -302,7 +284,6 @@ TEST(SstTimeNLocaleTest, setTimeZoneERR)
        ret = sst_locale_set_timezone(iface, setVal);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
        sstm_access_setup(true);
-       sstm_vconf_clear_str(VCONFKEY_SETAPPL_TIMEZONE_ID);
 }
 
 TEST(SstTimeNLocaleTest, getTimeChanged)

diff --git a/tests/sst_gtest_vconf.cpp b/tests/sst_gtest_normal_vconf.cpp
similarity index 98%
rename from tests/sst_gtest_vconf.cpp
rename to tests/sst_gtest_normal_vconf.cpp
index 56a8fb7..31294ef 100644 (file)
--- a/tests/sst_gtest_vconf.cpp
+++ b/tests/sst_gtest_normal_vconf.cpp
@@ -202,8 +202,6 @@ TEST(SstVconfTest, getValueString)
        ret = sst_vconf_get_str(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST(SstVconfTest, getValueStringERR)
@@ -216,8 +214,6 @@ TEST(SstVconfTest, getValueStringERR)
        sstm_vconf_get_str_setup(VCONFKEY_REGIONFORMAT, "ko", -1);
        ret = sst_vconf_get_str(iface, &val);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST(SstVconfTest, setValueString)
@@ -235,8 +231,6 @@ TEST(SstVconfTest, setValueString)
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
        free(getVal);
-
-       sstm_vconf_clear_str(VCONFKEY_REGIONFORMAT);
 }
 
 TEST_F(SstVconfCBTest, setUnsetChangedCallback)