Merge unittest files and revise unit test 93/238693/8 accepted/tizen/unified/20200803.122016 submit/tizen/20200720.094354 submit/tizen/20200729.102255
authorJinWang An <jinwang.an@samsung.com>
Thu, 16 Jul 2020 17:34:17 +0000 (02:34 +0900)
committerJinWang An <jinwang.an@samsung.com>
Fri, 17 Jul 2020 18:02:08 +0000 (03:02 +0900)
 - change name of variable.
 - modify res files path
 - change from TEST to TEST_F which doesn't need class
 - remove sst_tests.h

Change-Id: Ib3bfa9bd405ad290615db61acd92b2a09ea68626
Signed-off-by: JinWang An <jinwang.an@samsung.com>
14 files changed:
packaging/capi-system-system-settings.spec
tests/CMakeLists.txt
tests/mocks/libc.c
tests/mocks/vconf.cpp
tests/res/ringtone_sdk.mp3 [moved from tests/res/ringtone/ringtone_sdk.mp3 with 100% similarity]
tests/sst_gtest_api.cpp
tests/sst_gtest_font.cpp
tests/sst_gtest_interface.cpp
tests/sst_gtest_misc.cpp
tests/sst_gtest_screen.cpp
tests/sst_gtest_sound.cpp
tests/sst_gtest_time_N_locale.cpp
tests/sst_gtest_vconf.cpp
tests/sst_tests.h [deleted file]

index b1c53ae..598ce02 100644 (file)
@@ -130,14 +130,7 @@ tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj
 
 %check
 bash tests/scripts/vconf_golden_master.sh
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-api
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-vconf
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-font
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-interface
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-sound
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-screen
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-time-n-locale
-LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-gtest-misc
+LD_LIBRARY_PATH=.:tests:libutil LD_PRELOAD=tests/libsys-settings-mock.so tests/sst-unit-test
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -b . -d . -o %{name}.info
 genhtml %{name}.info -o out --legend --show-details
@@ -146,16 +139,8 @@ genhtml %{name}.info -o out --legend --show-details
 %post -p /sbin/ldconfig
 %post util-lib -p /sbin/ldconfig
 %post unittests
-bash %{sys_setting_test_dir}/ringtone/ringtone_files.sh create
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-api
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-vconf
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-font
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-interface
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-sound
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-screen
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-time-n-locale
-XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-gtest-misc
-
+bash %{sys_setting_test_dir}/ringtone_files.sh create
+XDG_RUNTIME_DIR=/run %{sys_setting_test_dir}/sst-unit-test
 
 %postun -p /sbin/ldconfig
 %postun util-lib -p /sbin/ldconfig
index 4db67a0..c3cd93e 100644 (file)
@@ -2,24 +2,13 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
 SET(SST_SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 SET(SST_UTIL_DIR ${CMAKE_SOURCE_DIR}/libutil)
-SET(SRC "sst_gtest_main.cpp")
 
 ADD_DEFINITIONS("-DSST_TEST")
 ADD_DEFINITIONS("-DN_THREADS=${N_THREADS}")
 ADD_DEFINITIONS(-DSYS_SETTINGS_TEST_DIR=\"${TEST_INSTALL_DIR}\")
-ADD_DEFINITIONS(-DSYS_SETTINGS_TEST_RINGTONE_DIR=\"${TEST_INSTALL_DIR}/ringtone\")
 
-FILE(GLOB TEST_RES RECURSE res/*)
-FOREACH(RES_ITEM ${TEST_RES})
-   IF( IS_DIRECTORY "${RES_ITEM}" )
-      LIST( APPEND RES_DIRS "${RES_ITEM}" )
-   ELSE()
-      LIST( APPEND RES_FILES "${RES_ITEM}" )
-   ENDIF()
-ENDFOREACH()
-INSTALL(DIRECTORY ${RES_DIRS} DESTINATION ${TEST_INSTALL_DIR})
-INSTALL(FILES ${RES_FILES} DESTINATION ${TEST_INSTALL_DIR})
-INSTALL(FILES scripts/ringtone_files.sh DESTINATION ${TEST_INSTALL_DIR}/ringtone)
+INSTALL(DIRECTORY res/ DESTINATION ${TEST_INSTALL_DIR})
+INSTALL(FILES scripts/ringtone_files.sh DESTINATION ${TEST_INSTALL_DIR})
 
 pkg_check_modules(gtest_pkgs REQUIRED gmock)
 INCLUDE_DIRECTORIES(${gtest_pkgs_INCLUDE_DIRS})
@@ -30,74 +19,11 @@ SET(MOCK_LIB "sys-settings-mock")
 FILE(GLOB MOCK_SRCS mocks/*.c mocks/*.cpp)
 ADD_LIBRARY(${MOCK_LIB} SHARED ${MOCK_SRCS})
 
-SET(SST_API_GTEST "sst-gtest-api")
-FILE(GLOB SST_API_GTEST_SRC
+SET(SSTT_GTEST "sst-unit-test")
+FILE(GLOB SSTT_GTEST_SRC
        ${SST_SRC_DIR}/*.c
        ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_api.cpp)
-ADD_EXECUTABLE(${SST_API_GTEST} ${SRC} ${SST_API_GTEST_SRC})
-TARGET_LINK_LIBRARIES(${SST_API_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_API_GTEST} DESTINATION ${TEST_INSTALL_DIR})
-
-SET(SST_VCONF_GTEST "sst-gtest-vconf")
-FILE(GLOB SST_VCONF_GTEST_SRCS
-       ${SST_SRC_DIR}/*.c
-       ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_vconf.cpp)
-ADD_EXECUTABLE(${SST_VCONF_GTEST} ${SRC} ${SST_VCONF_GTEST_SRCS})
-TARGET_LINK_LIBRARIES(${SST_VCONF_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_VCONF_GTEST} DESTINATION ${TEST_INSTALL_DIR})
-
-SET(SST_FONT_GTEST "sst-gtest-font")
-FILE(GLOB SST_FONT_GTEST_SRCS
-       ${SST_SRC_DIR}/*.c
-       ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_font.cpp)
-ADD_EXECUTABLE(${SST_FONT_GTEST} ${SRC} ${SST_FONT_GTEST_SRCS})
-TARGET_LINK_LIBRARIES(${SST_FONT_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_FONT_GTEST} DESTINATION ${TEST_INSTALL_DIR})
-
-SET(SST_INTERFACE_GTEST "sst-gtest-interface")
-FILE(GLOB SST_INTERFACE_GTEST_SRCS
-       ${SST_SRC_DIR}/*.c
-       ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_interface.cpp)
-ADD_EXECUTABLE(${SST_INTERFACE_GTEST} ${SRC} ${SST_INTERFACE_GTEST_SRCS})
-TARGET_LINK_LIBRARIES(${SST_INTERFACE_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_INTERFACE_GTEST} DESTINATION ${TEST_INSTALL_DIR})
-
-SET(SST_SOUND_GTEST "sst-gtest-sound")
-FILE(GLOB SST_SOUND_GTEST_SRCS
-       ${SST_SRC_DIR}/*.c
-       ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_sound.cpp)
-ADD_EXECUTABLE(${SST_SOUND_GTEST} ${SRC} ${SST_SOUND_GTEST_SRCS})
-TARGET_LINK_LIBRARIES(${SST_SOUND_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_SOUND_GTEST} DESTINATION ${TEST_INSTALL_DIR})
-
-SET(SST_SCREEN_GTEST "sst-gtest-screen")
-FILE(GLOB SST_SCREEN_GTEST_SRCS
-       ${SST_SRC_DIR}/*.c
-       ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_screen.cpp)
-ADD_EXECUTABLE(${SST_SCREEN_GTEST} ${SRC} ${SST_SCREEN_GTEST_SRCS})
-TARGET_LINK_LIBRARIES(${SST_SCREEN_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_SCREEN_GTEST} DESTINATION ${TEST_INSTALL_DIR})
-
-SET(SST_TIME_N_LOCALE_GTEST "sst-gtest-time-n-locale")
-FILE(GLOB SST_TIME_N_LOCALE_GTEST_SRCS
-       ${SST_SRC_DIR}/*.c
-       ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_time_N_locale.cpp)
-ADD_EXECUTABLE(${SST_TIME_N_LOCALE_GTEST} ${SRC} ${SST_TIME_N_LOCALE_GTEST_SRCS})
-TARGET_LINK_LIBRARIES(${SST_TIME_N_LOCALE_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_TIME_N_LOCALE_GTEST} DESTINATION ${TEST_INSTALL_DIR})
-
-SET(SST_MISC_GTEST "sst-gtest-misc")
-FILE(GLOB SST_MISC_GTEST_SRCS
-       ${SST_SRC_DIR}/*.c
-       ${SST_SRC_DIR}/standard_excl/*.c
-       sst_gtest_misc.cpp)
-ADD_EXECUTABLE(${SST_MISC_GTEST} ${SRC} ${SST_MISC_GTEST_SRCS})
-TARGET_LINK_LIBRARIES(${SST_MISC_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
-INSTALL(TARGETS ${SST_MISC_GTEST} DESTINATION ${TEST_INSTALL_DIR})
+       *.cpp)
+ADD_EXECUTABLE(${SSTT_GTEST} ${SRC} ${SSTT_GTEST_SRC})
+TARGET_LINK_LIBRARIES(${SSTT_GTEST} ${gtest_pkgs_LIBRARIES} ${pkgs_LIBRARIES} dl)
+INSTALL(TARGETS ${SSTT_GTEST} DESTINATION ${TEST_INSTALL_DIR})
index f619d3b..4f02b8b 100644 (file)
 
 API int access(const char *pathname, int mode)
 {
-       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_RINGTONE_DIR"/ringtone_sdk.mp3"))
+       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_DIR"/ringtone_sdk.mp3"))
                return 0;
-       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_RINGTONE_DIR"/Over the horizon.mp3"))
+       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_DIR"/Over the horizon.mp3"))
                return 0;
-       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_RINGTONE_DIR"/big_buck_bunny.mp3"))
+       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_DIR"/big_buck_bunny.mp3"))
                return 0;
-       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_RINGTONE_DIR"/daliTestVideo.mp3"))
+       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_DIR"/daliTestVideo.mp3"))
                return 0;
-       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_RINGTONE_DIR"/sound_5.mp3"))
+       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_DIR"/sound_5.mp3"))
                return 0;
-       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_RINGTONE_DIR"/tct-content-tizen-tests_video.mp3"))
+       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_DIR"/tct-content-tizen-tests_video.mp3"))
                return 0;
        if (0 == strcmp(pathname, "/opt/usr/data/settings/Alerts/General notification_sdk.wav"))
                return 0;
index a2442da..20022c7 100644 (file)
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -160,104 +161,6 @@ static int _sqlite_connect()
        return VCONF_OK;
 }
 
-#if 0
-/************************************************
- * keynode handling APIs                        *
- ************************************************/
-API char *vconf_keynode_get_name(keynode_t *keynode)
-{
-       return NULL;
-}
-
-API int vconf_keynode_get_type(keynode_t *keynode)
-{
-       return 0;
-}
-
-API int vconf_keynode_get_int(keynode_t *keynode)
-{
-       return 0;
-}
-
-API double vconf_keynode_get_dbl(keynode_t *keynode)
-{
-       return 0;
-}
-
-API int vconf_keynode_get_bool(keynode_t *keynode)
-{
-       return 0;
-}
-
-API char *vconf_keynode_get_str(keynode_t *keynode)
-{
-       return NULL;
-}
-
-/************************************************
- * keylist handling APIs
- ************************************************/
-keylist_t *vconf_keylist_new(void)
-{
-       return NULL;
-}
-
-API int vconf_keylist_rewind(keylist_t *keylist)
-{
-       return 0;
-}
-
-API int vconf_keylist_free(keylist_t *keylist)
-{
-       return 0;
-}
-
-API int vconf_keylist_lookup(keylist_t *keylist, const char *keyname,
-               keynode_t **return_node)
-{
-       return 0;
-}
-
-API keynode_t* vconf_keylist_nextnode(keylist_t *keylist)
-{
-       return NULL;
-}
-
-API int vconf_keylist_add_int(keylist_t *keylist, const char *keyname,
-               const int value)
-{
-       return 0;
-}
-
-API int vconf_keylist_add_bool(keylist_t *keylist, const char *keyname,
-               const int value)
-{
-       return 0;
-}
-
-API int vconf_keylist_add_dbl(keylist_t *keylist, const char *keyname,
-               const double value)
-{
-       return 0;
-}
-
-API int vconf_keylist_add_str(keylist_t *keylist, const char *keyname,
-               const char *value)
-{
-       return 0;
-}
-
-API int vconf_keylist_add_null(keylist_t *keylist, const char *keyname)
-{
-       return 0;
-}
-
-API int vconf_keylist_del(keylist_t *keylist, const char *keyname)
-{
-       return 0;
-}
-
-#endif
 /************************************************
  * setting APIs                                 *
  ************************************************/
@@ -275,7 +178,7 @@ static int _vconf_set_str(const char *in_key, const char *strval)
                return VCONF_ERROR;
        }
 
-#if 1 /* journal mode */
+       /* journal mode */
        {
                DBG("key[%s] value[%s]", in_key, strval);
                snprintf(sql, MAX_BUF_LEN, "PRAGMA JOURNAL_MODE=MEMORY");
@@ -288,57 +191,8 @@ static int _vconf_set_str(const char *in_key, const char *strval)
                        return VCONF_ERROR;
                }
        }
-#endif
-
-#if 0 /* select key */
-       {
-               sqlite3_stmt *stmt = NULL;
-               snprintf(sql, MAX_BUF_LEN, "SELECT layer, key, value, type read_privilege, write_privilege FROM vconf WHERE key = ? and layer = 'system'");
-
-               rc = sqlite3_prepare(db, sql, -1, &stmt, 0);
-               if (rc != SQLITE_OK) {
-                       ERR("sqlite3_prepare() Fail(%s)", sqlite3_errmsg(db));
-                       sqlite3_finalize(stmt);
-                       _sqlite_close();
-                       return VCONF_ERROR;
-               }
 
-               sqlite3_bind_text(stmt, 1, in_key, strlen(in_key), SQLITE_STATIC);
-               rc = sqlite3_step(stmt);
-               if (rc != SQLITE_ROW) {
-                       ERR("sqlite3_step() Fail(%s)", sqlite3_errmsg(db));
-                       sqlite3_finalize(stmt);
-                       _sqlite_close();
-                       return VCONF_ERROR;
-               }
-
-               DBG("vconf get: layer[%s] key[%s], value[%s]",
-                               sqlite3_column_text(stmt, 0),
-                               sqlite3_column_text(stmt, 1),
-                               sqlite3_column_text(stmt, 2));
-
-               sqlite3_finalize(stmt);
-       }
-#endif
-
-#if 0 /* insert key */
-       {
-               DBG("key[%s] value[%s]", in_key, strval);
-               snprintf(sql, MAX_BUF_LEN, "INSERT OR REPLACE INTO vconf ( layer, key, value ) "
-                               "VALUES ( \"%s\", \"%s\", \'%s\');", "system", in_key, strval);
-
-               rc = sqlite3_exec(db, sql, 0, 0, &err_msg);
-               if (rc != SQLITE_OK) {
-                       ERR("sqlite3_exec() Fail(%d) sqlerrcode[%d] sqlexterrcode[%d] sqlmessage[%s]", rc, sqlite3_errcode(db), sqlite3_extended_errcode(db), err_msg);
-                       sqlite3_free(err_msg);
-                       _sqlite_close();
-
-                       return VCONF_ERROR;
-               }
-       }
-#endif
-
-#if 1 /* insert key with parameter */
+       /* insert key with parameter */
        do {
                DBG("key[%s] value[%s]", in_key, strval);
                snprintf(sql, MAX_BUF_LEN, "INSERT OR REPLACE INTO vconf ( layer, key, value ) "
@@ -368,7 +222,6 @@ static int _vconf_set_str(const char *in_key, const char *strval)
                        break;
                }
        } while (0);
-#endif
        sqlite3_finalize(stmt);
        _sqlite_close();
 
@@ -378,13 +231,6 @@ static int _vconf_set_str(const char *in_key, const char *strval)
                return VCONF_ERROR;
 }
 
-#if 0
-API int vconf_set(keylist_t *keylist)
-{
-       return 0;
-}
-#endif
-
 API int vconf_set_int(const char *in_key, const int intval)
 {
        int rc;
@@ -423,27 +269,6 @@ API int vconf_set_bool(const char *in_key, const int boolval)
        return VCONF_OK;
 }
 
-#if 0
-API int vconf_set_dbl(const char *in_key, const double dblval)
-{
-       int rc;
-       char buf[MAX_BUF_LEN + 1];
-       snprintf(buf, MAX_BUF_LEN, "%lf", dblval);
-
-       rc = _vconf_set_str(in_key, buf);
-       if (rc != VCONF_OK) {
-               ERR("_vconf_set_str() Fail");
-               return VCONF_ERROR;
-       }
-
-       UnionValue uValue;
-       uValue.d = dblval;
-       checkNotifyCallBack(in_key, VCONF_TYPE_DOUBLE, &uValue);
-
-       return VCONF_OK;
-}
-#endif
-
 API int vconf_set_str(const char *in_key, const char *strval)
 {
        int rc;
@@ -461,13 +286,6 @@ API int vconf_set_str(const char *in_key, const char *strval)
        return VCONF_OK;
 }
 
-#if 0
-API int vconf_get(keylist_t *keylist, const char *in_parentDIR, get_option_t option)
-{
-       return 0;
-}
-#endif
-
 API char *vconf_get_str(const char *in_key)
 {
        int rc;
@@ -569,37 +387,6 @@ API int vconf_get_bool(const char *in_key, int *boolval)
        return VCONF_OK;
 }
 
-#if 0
-API int vconf_get_dbl(const char *in_key, double *dblval)
-{
-       char *value = vconf_get_str(in_key);
-       char *ptr;
-
-       if (value == NULL)
-               return VCONF_ERROR;
-
-       *dblval = strtod(value, &ptr);;
-
-       free(value);
-       return VCONF_OK;
-}
-
-API int vconf_unset(const char *in_key)
-{
-       return 0;
-}
-
-API int vconf_sync_key(const char *in_key)
-{
-       return 0;
-}
-
-API int vconf_unset_recursive(const char *in_dir)
-{
-       return 0;
-}
-#endif
-
 API int vconf_notify_key_changed(const char *in_key, vconf_callback_fn cb,
                void *user_data)
 {
@@ -607,12 +394,6 @@ API int vconf_notify_key_changed(const char *in_key, vconf_callback_fn cb,
        str = in_key;
        notifyCallBackMap.insert(make_pair(str, make_pair((void*)cb, user_data)));
 
-#if 0 /* map debug */
-       NotifyMap::iterator  itr;
-       for (itr = notifyCallBackMap.begin(); itr != notifyCallBackMap.end(); itr++) {
-               DBG("map Key[%s]", itr->first.c_str());
-       }
-#endif
        return VCONF_OK;
 }
 
@@ -625,13 +406,6 @@ API int vconf_ignore_key_changed(const char *in_key, vconf_callback_fn cb)
        return VCONF_OK;
 }
 
-#if 0
-API int vconf_get_ext_errno(void)
-{
-       return 0;
-}
-#endif
-
 #ifdef __cplusplus
 }
 #endif
index c41b2d8..c8103c2 100644 (file)
@@ -18,8 +18,9 @@
 #include <glib.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+
+extern "C" {
 #include "sst.h"
 int system_settings_subscribe_changes(system_settings_key_e key,
                system_settings_changed_cb callback,
@@ -29,7 +30,7 @@ int system_settings_unsubscribe_changes(system_settings_key_e key,
 }
 
 
-class SstApiTest : public ::testing::Test {
+class SstApiCBTest : public ::testing::Test {
 protected:
        void SetUp() override
        {
@@ -44,7 +45,10 @@ protected:
 
        static gboolean checkCallbackIdle(gpointer data)
        {
-               int ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, true);
+               bool *oldVal = (bool*)data;
+               int ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+               ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, !(*oldVal));
                EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
                return G_SOURCE_REMOVE;
@@ -53,23 +57,23 @@ protected:
        static void changedMultiCallback1(system_settings_key_e key, void *user_data)
        {
                INFO("changedMultiCallback1 called!");
-               result = 0x1;
-               if (0x11 == result)
+               resultCB |= 0x1;
+               if (0x11 == resultCB)
                        g_main_loop_quit(loop);
        }
 
        static void changedMultiCallback2(system_settings_key_e key, void *user_data)
        {
                INFO("changedMultiCallback2 called!");
-               result = result | 0x10;
-               if (0x11 == result)
+               resultCB |= 0x10;
+               if (0x11 == resultCB)
                        g_main_loop_quit(loop);
        }
 
        static void changedCallback(system_settings_key_e key, void *user_data)
        {
                INFO("Callback called!");
-               result = SYSTEM_SETTINGS_ERROR_NONE;
+               resultCB = SYSTEM_SETTINGS_ERROR_NONE;
                g_main_loop_quit(loop);
        }
 
@@ -85,178 +89,169 @@ protected:
        {
                int ringtone_num = 0;
                int cur_cnt = 0;
-               result = system_settings_foreach_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &cur_cnt);
+               int ret = system_settings_foreach_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &cur_cnt);
 
                for (int i = 0; i < ringtoneFilesCnt; i++) {
-                       result = system_settings_add_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
-                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+                       ret = system_settings_add_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
+                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
                }
-               result = system_settings_foreach_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &ringtone_num);
-               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+               ret = system_settings_foreach_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &ringtone_num);
+               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
                for (int i = ringtoneFilesCnt - 1; i >= 0; i--) {
-                       result = system_settings_delete_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
-                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+                       ret = system_settings_delete_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
+                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
                }
                EXPECT_EQ(ringtone_num - cur_cnt, ringtoneFilesCnt);
                g_main_loop_quit(loop);
                return G_SOURCE_REMOVE;
        }
 
-       static int result;
+       static int resultCB;
        static GMainLoop *loop;
        static const char *ringtoneFiles[];
        static int ringtoneFilesCnt;
 };
 
-const char *SstApiTest::ringtoneFiles[] = {
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/Over the horizon.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/big_buck_bunny.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/daliTestVideo.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/sound_5.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/tct-content-tizen-tests_video.mp3"
+const char *SstApiCBTest::ringtoneFiles[] = {
+       SYS_SETTINGS_TEST_DIR"/Over the horizon.mp3",
+       SYS_SETTINGS_TEST_DIR"/big_buck_bunny.mp3",
+       SYS_SETTINGS_TEST_DIR"/daliTestVideo.mp3",
+       SYS_SETTINGS_TEST_DIR"/sound_5.mp3",
+       SYS_SETTINGS_TEST_DIR"/tct-content-tizen-tests_video.mp3"
 };
-int SstApiTest::ringtoneFilesCnt = sizeof(ringtoneFiles)/sizeof(const char*);
-GMainLoop *SstApiTest::loop = NULL;
-int SstApiTest::result = 0;
+int SstApiCBTest::ringtoneFilesCnt = sizeof(ringtoneFiles)/sizeof(const char*);
+GMainLoop *SstApiCBTest::loop = NULL;
+int SstApiCBTest::resultCB = 0;
 
-TEST_F(SstApiTest, getValueInt)
+TEST(SstApiTest, getValueInt)
 {
        int val;
-       result = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstApiTest, setValueInt)
+TEST(SstApiTest, setValueInt)
 {
-       int bkVal;
+       int oldVal;
        int getVal;
        int setVal = 60;
-       result = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_EQ(setVal, getVal);
-       result = system_settings_set_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = system_settings_set_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstApiTest, getValueBool)
+TEST(SstApiTest, getValueBool)
 {
        bool val;
-       result = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstApiTest, setValueBool)
+TEST(SstApiTest, setValueBool)
 {
-       bool bkVal;
+       bool oldVal;
        bool getVal;
        bool setVal = false;
-       result = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_EQ(setVal, getVal);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstApiTest, getValueString)
+TEST(SstApiTest, getValueString)
 {
        char *val;
-       result = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstApiTest, setValueString)
+TEST(SstApiTest, setValueString)
 {
-       char *bkVal;
+       char *oldVal;
        char *getVal;
        const char *setVal = "ko_KR";
-       result = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
        free(getVal);
-       result = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       free(bkVal);
+       ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       free(oldVal);
 }
 
-TEST_F(SstApiTest, setUnsetChangedCallback)
+TEST_F(SstApiCBTest, setUnsetChangedCallback)
 {
-       bool bkVal;
-       result = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, false);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedCallback, NULL);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = -1;
-       g_idle_add(checkCallbackIdle, NULL);
+       bool oldVal;
+       int ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedCallback, NULL);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       resultCB = -1;
+       g_idle_add(checkCallbackIdle, &oldVal);
        g_main_loop_run(loop);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, resultCB);
+       ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstApiTest, addDeleteForeachValueString)
+TEST_F(SstApiCBTest, addDeleteForeachValueString)
 {
        g_idle_add(checkRingtoneIdle, NULL);
        g_main_loop_run(loop);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
 }
 
-TEST_F(SstApiTest, addDeleteChangedCallback)
+TEST_F(SstApiCBTest, addDeleteChangedCallback)
 {
-       bool bkVal;
-       result = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, false);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_add_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback1, NULL);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_add_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback2, NULL);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = -1;
-       g_idle_add(checkCallbackIdle, NULL);
+       bool oldVal;
+       int ret = system_settings_add_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback1, NULL);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_add_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback2, NULL);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       resultCB = 0;
+       g_idle_add(checkCallbackIdle, &oldVal);
        g_main_loop_run(loop);
-       EXPECT_EQ(0x11, result);
-       result = system_settings_remove_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback1);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_remove_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback2);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       EXPECT_EQ(0x11, resultCB);
+       ret = system_settings_remove_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback1);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_remove_changed_cb(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback2);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstApiTest, subUnsubscribeCallback)
+TEST_F(SstApiCBTest, subUnsubscribeCallback)
 {
-       system_settings_cb_id id;
-       bool bkVal;
-       result = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, false);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_subscribe_changes(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedCallback, NULL, &id);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = -1;
-       g_idle_add(checkCallbackIdle, NULL);
+       bool oldVal;
+       system_settings_cb_id cb[2];
+       int ret = system_settings_subscribe_changes(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback1, NULL, &cb[0]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_subscribe_changes(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, changedMultiCallback2, NULL, &cb[1]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       resultCB = 0;
+       g_idle_add(checkCallbackIdle, &oldVal);
        g_main_loop_run(loop);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_unsubscribe_changes(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, id);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       EXPECT_EQ(0x11, resultCB);
+       ret = system_settings_unsubscribe_changes(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, cb[0]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_unsubscribe_changes(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, cb[1]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
index 9993d6e..2ba5ba2 100644 (file)
  * limitations under the License.
  */
 
-#include "sst_tests.h"
-
 #include <string.h>
 #include <glib.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+
+extern "C" {
 #include "sst.h"
 #include "sst_font.h"
 #include "sst_vconf.h"
 #include "sst_interface.h"
 }
 
-class SstFontTest : public ::testing::Test {
-protected:
-       static int result;
-};
-
-int SstFontTest::result = 0;
-
-TEST_F(SstFontTest, getDefaultfont)
+TEST(SstFontTest, getDefaultfont)
 {
        char *val;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_TYPE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       result = sst_font_get_default_type(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_TYPE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       ret = sst_font_get_default_type(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstFontTest, setFontType)
+TEST(SstFontTest, setFontType)
 {
        char *getVal = NULL;
        const char *eVal = "WrongFontName";
        const char *setVal = "BreezeSans";
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_TYPE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_TYPE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_font_set_type(iface, eVal);
-       EXPECT_NE(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_font_set_type(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_str(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_font_set_type(iface, eVal);
+       EXPECT_NE(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_font_set_type(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_str(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
 
        free(getVal);
 }
 
-TEST_F(SstFontTest, setFontSize)
+TEST(SstFontTest, setFontSize)
 {
        int fontSize[] = {
                SYSTEM_SETTINGS_FONT_SIZE_SMALL,
@@ -78,25 +72,26 @@ TEST_F(SstFontTest, setFontSize)
        };
        int fsCnt = sizeof(fontSize) / sizeof(fontSize[0]);
        int getVal;
-       int bkVal;
+       int oldVal;
        int setVal;
        sst_interface *iface;
 
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_SIZE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_int(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_SIZE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_int(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
        for (int i = 0; i < fsCnt; i++) {
                setVal = fontSize[i];
-               result = sst_font_set_size(iface, setVal);
-               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-               result = sst_vconf_get_int(iface, &getVal);
-               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+               ret = sst_font_set_size(iface, setVal);
+               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+               ret = sst_vconf_get_int(iface, &getVal);
+               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
                EXPECT_EQ(setVal, getVal);
        }
 
-       result = sst_font_set_size(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_font_set_size(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
index 84c759c..cddaa34 100644 (file)
 #include <glib.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+
+extern "C" {
 #include "sst_interface.h"
 #include "sst.h"
 }
-class SstInterfaceTest : public ::testing::Test {
-protected:;
-       static const int deprecatedKey;
-       static int result;
-};
 
-int SstInterfaceTest::result = 0;
-const int SstInterfaceTest::deprecatedKey = (int)SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED + 1;
+#define SST_DEPRECATED_KEY ((int)SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED + 1)
 
-TEST_F(SstInterfaceTest, getInterfaceOk)
+TEST(SstInterfaceTest, getInterfaceOk)
 {
        sst_interface *iface;
-       for (int key = (int)SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE;
-               key < (int)SYSTEM_SETTINGS_KEY_MAX; key++) {
-               if (key == deprecatedKey) {
+       int key = (int)SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE;
+       for ( ; key < (int)SYSTEM_SETTINGS_KEY_MAX; key++) {
+               if (key == SST_DEPRECATED_KEY) {
                        continue;
                }
-               result = sst_get_interface((system_settings_key_e)key, &iface);
-               EXPECT_TRUE((SYSTEM_SETTINGS_ERROR_NONE == result) || (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == result));
+               int ret = sst_get_interface((system_settings_key_e)key, &iface);
+               EXPECT_TRUE((SYSTEM_SETTINGS_ERROR_NONE == ret) || (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret));
        }
 }
 
-TEST_F(SstInterfaceTest, getInterfaceError)
+TEST(SstInterfaceTest, getInterfaceError)
 {
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_MAX, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_MAX, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
 
-       result = sst_get_interface((system_settings_key_e)deprecatedKey, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, result);
+       ret = sst_get_interface((system_settings_key_e)SST_DEPRECATED_KEY, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
 }
index c723690..dc1e02f 100644 (file)
  * limitations under the License.
  */
 
-#include "sst_tests.h"
-
 #include <string.h>
 #include <glib.h>
+#include <vconf.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+
+extern "C" {
 #include "sst.h"
 #include "sst_interface.h"
 #include "sst_misc.h"
-#include <vconf.h>
 }
 
-class SstMisc : public ::testing::Test {
-protected:
-       static int result;
-};
-
-int SstMisc::result = 0;
-
-TEST_F(SstMisc, fileExists)
+TEST(SstMisc, fileExists)
 {
-       bool ret = sst_misc_file_exists(SYS_SETTINGS_TEST_RINGTONE_DIR"/tct-content-tizen-tests_video.mp3");
+       bool ret = sst_misc_file_exists(SYS_SETTINGS_TEST_DIR"/tct-content-tizen-tests_video.mp3");
        EXPECT_EQ(true, ret);
 
        ret = sst_misc_file_exists("file.not_exist");
        EXPECT_EQ(false, ret);
 }
 
-TEST_F(SstMisc, getWifiQSNoti)
+TEST(SstMisc, getWifiQSNoti)
 {
        bool val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_NETWORK_WIFI_NOTIFICATION, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_NETWORK_WIFI_NOTIFICATION, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_misc_get_wifi_QS_noti(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_misc_get_wifi_QS_noti(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstMisc, getAdsID)
+TEST(SstMisc, getAdsID)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_ADS_ID, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_ADS_ID, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_misc_get_ads_id(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_misc_get_ads_id(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstMisc, setAdsID)
+TEST(SstMisc, setAdsID)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        const char *setVal = "00000215-0156-0133-0034-000000000102";
 
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_ADS_ID, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_ADS_ID, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_misc_get_ads_id(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_misc_get_ads_id(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
        vconf_set_int(VCONFKEY_SETAPPL_AD_ID_OPT_OUT, 0);
-       result = sst_misc_set_ads_id(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_misc_set_ads_id(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_misc_get_ads_id(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_misc_get_ads_id(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
 
-       result = sst_misc_set_ads_id(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_misc_set_ads_id(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        vconf_set_int(VCONFKEY_SETAPPL_AD_ID_OPT_OUT, 1);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
-TEST_F(SstMisc, getUltraDataSaveState)
+TEST(SstMisc, getUltraDataSaveState)
 {
        int val;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_misc_get_uds_state(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_misc_get_uds_state(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
index e48f8c1..4dbec6d 100644 (file)
  * limitations under the License.
  */
 
-#include "sst_tests.h"
-
 #include <string.h>
 #include <glib.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+
+extern "C" {
 #include "sst.h"
 #include "sst_vconf.h"
 #include "sst_interface.h"
 #include "sst_screen.h"
 }
 
-class SstScreenTest : public ::testing::Test {
-protected:
-       static int result;
-       static const char *bgPath;
-};
-
-int SstScreenTest::result = 0;
-const char *SstScreenTest::bgPath = SYS_SETTINGS_TEST_DIR"/bg_test.png";
+static const char *sstBgPath = SYS_SETTINGS_TEST_DIR"/bg_test.png";
 
-TEST_F(SstScreenTest, getHomeWallPaper)
+TEST(SstScreenTest, getHomeWallPaper)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_TYPE, &iface);
-       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == result)
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_FONT_TYPE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
                return;
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_vconf_get_str(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_vconf_get_str(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstScreenTest, setHomeWallPaper)
+TEST(SstScreenTest, setHomeWallPaper)
 {
        char *getVal = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-
-       result = sst_screen_set_home_wallpaper(iface, bgPath);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_str(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       EXPECT_STREQ(bgPath, getVal);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+
+       ret = sst_screen_set_home_wallpaper(iface, sstBgPath);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_str(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       EXPECT_STREQ(sstBgPath, getVal);
        free(getVal);
 }
 
-TEST_F(SstScreenTest, setLockWallPaper)
+TEST(SstScreenTest, setLockWallPaper)
 {
        char *getVal = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-
-       result = sst_screen_set_lock_wallpaper(iface, bgPath);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_str(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       EXPECT_STREQ(bgPath, getVal);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+
+       ret = sst_screen_set_lock_wallpaper(iface, sstBgPath);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_str(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       EXPECT_STREQ(sstBgPath, getVal);
        free(getVal);
 
 }
 
-TEST_F(SstScreenTest, getLockScreen)
+TEST(SstScreenTest, getLockScreen)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCKSCREEN_APP, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCKSCREEN_APP, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_screen_get_lockscreen(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_get_lockscreen(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstScreenTest, setLockScreen)
+TEST(SstScreenTest, setLockScreen)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        const char *setVal = "org.tizen.voice-control-panel";
 
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCKSCREEN_APP, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCKSCREEN_APP, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_screen_get_lockscreen(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_get_lockscreen(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_screen_set_lockscreen(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_set_lockscreen(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_screen_get_lockscreen(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_get_lockscreen(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
-TEST_F(SstScreenTest, setBackLightTime)
+TEST(SstScreenTest, setBackLightTime)
 {
-       int bkVal;
+       int oldVal;
        int getVal;
-       int setVal =  300;
-       int eMinVal = -5;
-       int eMaxVal = 601;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_vconf_get_int(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_vconf_get_int(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_screen_set_backlight_time(iface, eMinVal);
-       EXPECT_NE(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_set_backlight_time(iface, -5);
+       EXPECT_NE(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_screen_set_backlight_time(iface, eMaxVal);
-       EXPECT_NE(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_set_backlight_time(iface, 601);
+       EXPECT_NE(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_screen_set_backlight_time(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_set_backlight_time(iface, 300);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_vconf_get_int(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       EXPECT_EQ(getVal, setVal);
+       ret = sst_vconf_get_int(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       EXPECT_EQ(getVal, 300);
 
-       result = sst_screen_set_backlight_time(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_screen_set_backlight_time(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
index 3dba6f3..85b708a 100644 (file)
  * limitations under the License.
  */
 
-#include "sst_tests.h"
-
 #include <string.h>
 #include <glib.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+extern "C" {
 #include "sst.h"
 #include "sst_sound.h"
 #include "sst_vconf.h"
@@ -53,78 +51,78 @@ protected:
        {
                int ringtone_num = 0;
                int cur_cnt = 0;
-               result = sst_sound_get_call_ringtone_list(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &cur_cnt);
+               int ret = sst_sound_get_call_ringtone_list(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &cur_cnt);
 
                for (int i = 0; i < ringtoneFilesCnt; i++) {
-                       result = sst_sound_add_call_ringtone(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
-                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+                       ret = sst_sound_add_call_ringtone(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
+                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
                }
-               result = sst_sound_get_call_ringtone_list(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &ringtone_num);
-               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+               ret = sst_sound_get_call_ringtone_list(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneListCallback, &ringtone_num);
+               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
                for (int i = ringtoneFilesCnt - 1; i >= 0; i--) {
-                       result = sst_sound_del_call_ringtone(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
-                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+                       ret = sst_sound_del_call_ringtone(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, ringtoneFiles[i]);
+                       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
                }
                EXPECT_EQ(ringtone_num - cur_cnt, ringtoneFilesCnt);
                g_main_loop_quit(loop);
                return G_SOURCE_REMOVE;
        }
-       static int result;
        static GMainLoop *loop;
        static const char *ringtonePath;
        static int ringtoneFilesCnt;
        static const char *ringtoneFiles[];
 };
 
-const char *SstSoundTest::ringtonePath = SYS_SETTINGS_TEST_RINGTONE_DIR "/ringtone_sdk.mp3";
+const char *SstSoundTest::ringtonePath = SYS_SETTINGS_TEST_DIR "/ringtone_sdk.mp3";
 const char *SstSoundTest::ringtoneFiles[] = {
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/Over the horizon.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/sound_5.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/big_buck_bunny.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/daliTestVideo.mp3",
-       SYS_SETTINGS_TEST_RINGTONE_DIR"/tct-content-tizen-tests_video.mp3"
+       SYS_SETTINGS_TEST_DIR"/Over the horizon.mp3",
+       SYS_SETTINGS_TEST_DIR"/sound_5.mp3",
+       SYS_SETTINGS_TEST_DIR"/big_buck_bunny.mp3",
+       SYS_SETTINGS_TEST_DIR"/daliTestVideo.mp3",
+       SYS_SETTINGS_TEST_DIR"/tct-content-tizen-tests_video.mp3"
 };
 int SstSoundTest::ringtoneFilesCnt = sizeof(ringtoneFiles)/sizeof(const char*);
 GMainLoop *SstSoundTest::loop = NULL;
-int SstSoundTest::result = 0;
 
 TEST_F(SstSoundTest, getCallRingtone)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_call_ringtone(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_call_ringtone(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
 TEST_F(SstSoundTest, setCallRingtone)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_call_ringtone(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_call_ringtone(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_set_call_ringtone(iface, ringtonePath);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_call_ringtone(iface, ringtonePath);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_call_ringtone(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_call_ringtone(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(ringtonePath, getVal);
 
-       result = sst_sound_set_call_ringtone(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_call_ringtone(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
@@ -132,7 +130,6 @@ TEST_F(SstSoundTest, addDelGetRingtone)
 {
        g_idle_add(checkRingtoneIdle, NULL);
        g_main_loop_run(loop);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
 }
 
 
@@ -140,64 +137,67 @@ TEST_F(SstSoundTest, getEmailAlert)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_email_alert(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_email_alert(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
 TEST_F(SstSoundTest, setEmailAlert)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_email_alert(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_email_alert(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_set_email_alert(iface, ringtonePath);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_email_alert(iface, ringtonePath);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_email_alert(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_email_alert(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(ringtonePath, getVal);
 
-       result = sst_sound_set_email_alert(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_email_alert(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
 TEST_F(SstSoundTest, setNotification)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION, &iface);
-       SST_TEST_CHECK_NOT_SUPPORTED(result);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION, &iface);
+       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == ret)
+               return;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_vconf_get_str(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_vconf_get_str(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_set_notification(iface, ringtonePath);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_notification(iface, ringtonePath);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_vconf_get_str(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_vconf_get_str(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(ringtonePath, getVal);
 
-       result = sst_sound_set_notification(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_notification(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
@@ -205,31 +205,32 @@ TEST_F(SstSoundTest, getSlientMode)
 {
        bool val = false;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_silent_mode(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_silent_mode(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
 TEST_F(SstSoundTest, setSlientMode)
 {
-       bool bkVal = false;
-       bool getVal = false;
+       bool getVal;
+       bool setVal;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_silent_mode(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_get_silent_mode(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       setVal = !getVal;
 
-       result = sst_sound_set_silent_mode(iface, true);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_silent_mode(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_sound_get_silent_mode(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       EXPECT_EQ(getVal, true);
+       ret = sst_sound_get_silent_mode(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       EXPECT_EQ(getVal, setVal);
 
-       result = sst_sound_set_silent_mode(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_sound_set_silent_mode(iface, !getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
index cb5d723..87aa6b7 100644 (file)
 #include <glib.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+
+extern "C" {
 #include "sst.h"
 #include "sst_interface.h"
 #include "sst_time_N_locale.h"
 }
 
-class SstTimeNLocaleTest : public ::testing::Test {
-protected:
-       static int result;
-};
-
-int SstTimeNLocaleTest::result = 0;
-
-TEST_F(SstTimeNLocaleTest, getCountry)
+TEST(SstTimeNLocaleTest, getCountry)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_country(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_country(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstTimeNLocaleTest, setCountry)
+TEST(SstTimeNLocaleTest, setCountry)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        const char *setVal = "ko_KR";
 
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_country(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_country(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_set_country(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_set_country(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_country(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_country(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
 
-       result = sst_locale_set_country(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_set_country(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
-TEST_F(SstTimeNLocaleTest, getLanguage)
+TEST(SstTimeNLocaleTest, getLanguage)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_language(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_language(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstTimeNLocaleTest, setLanguage)
+TEST(SstTimeNLocaleTest, setLanguage)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        const char *setVal = "ko_KR";
 
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_language(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_language(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_set_language(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_set_language(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_language(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_language(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
-TEST_F(SstTimeNLocaleTest, getTimeformat24Hour)
+TEST(SstTimeNLocaleTest, getTimeformat24Hour)
 {
        bool val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_timeformat_24hour(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_timeformat_24hour(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstTimeNLocaleTest, setTimeformat24Hour)
+TEST(SstTimeNLocaleTest, setTimeformat24Hour)
 {
-       bool bkVal;
        bool getVal;
        bool setVal;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_timeformat_24hour(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       setVal = !bkVal;
+       ret = sst_locale_get_timeformat_24hour(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       setVal = !getVal;
 
-       result = sst_locale_set_timeformat_24hour(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_set_timeformat_24hour(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_timeformat_24hour(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_timeformat_24hour(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_EQ(getVal, setVal);
 
-       result = sst_locale_set_timeformat_24hour(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_set_timeformat_24hour(iface, !getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstTimeNLocaleTest, getTimeZone)
+TEST(SstTimeNLocaleTest, getTimeZone)
 {
        char *val = NULL;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_timezone(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_timezone(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstTimeNLocaleTest, setTimeZone)
+TEST(SstTimeNLocaleTest, setTimeZone)
 {
-       char *bkVal = NULL;
+       char *oldVal = NULL;
        char *getVal = NULL;
        const char *setVal = "Asia/Seoul";
 
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_timezone(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_timezone(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_set_timezone(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_set_timezone(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_locale_get_timezone(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_get_timezone(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
 
-       result = sst_locale_set_timezone(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_locale_set_timezone(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       free(bkVal);
+       free(oldVal);
        free(getVal);
 }
 
-TEST_F(SstTimeNLocaleTest, getTimeChanged)
+TEST(SstTimeNLocaleTest, getTimeChanged)
 {
        int val;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       result = sst_time_get_changed(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_time_get_changed(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
index c4bce06..67c80ae 100644 (file)
 #include <glib.h>
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "system_settings.h"
+
+extern "C" {
 #include "sst.h"
 #include "sst_vconf.h"
 #include "sst_interface.h"
 }
 
-class SstVconfTest : public ::testing::Test {
+class SstVconfCBTest : public ::testing::Test {
 protected:
        void SetUp() override
        {
@@ -40,10 +41,10 @@ protected:
 
        static gboolean checkCallbackIdle(gpointer data)
        {
-               sst_interface *iface;
-               result = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
-               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-               int ret = sst_vconf_set_bool(iface, true);
+               bool *oldVal = (bool*)data;
+               int ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+               EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+               ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, !(*oldVal));
                EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
                return G_SOURCE_REMOVE;
@@ -52,197 +53,185 @@ protected:
        static void changedMultiCallback1(system_settings_key_e key, void *user_data)
        {
                INFO("changedMultiCallback1 called!");
-               result = 0x1;
-               if (0x11 == result)
+               resultCB |= 0x1;
+               if (0x11 == resultCB)
                        g_main_loop_quit(loop);
        }
 
        static void changedMultiCallback2(system_settings_key_e key, void *user_data)
        {
                INFO("changedMultiCallback2 called!");
-               result = result | 0x10;
-               if (0x11 == result)
+               resultCB |= 0x10;
+               if (0x11 == resultCB)
                        g_main_loop_quit(loop);
        }
 
        static void changedCallback(system_settings_key_e key, void *user_data)
        {
                INFO("Callback called!");
-               result = SYSTEM_SETTINGS_ERROR_NONE;
+               resultCB = SYSTEM_SETTINGS_ERROR_NONE;
                g_main_loop_quit(loop);
        }
 
-       static int result;
+       static int resultCB;
        static GMainLoop *loop;
        static const char *ringtoneFiles[];
 };
 
-GMainLoop *SstVconfTest::loop = NULL;
-int SstVconfTest::result = 0;
+GMainLoop *SstVconfCBTest::loop = NULL;
+int SstVconfCBTest::resultCB = 0;
 
-TEST_F(SstVconfTest, getValueInt)
+TEST(SstVconfTest, getValueInt)
 {
        int val;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_int(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_int(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstVconfTest, setValueInt)
+TEST(SstVconfTest, setValueInt)
 {
-       int bkVal;
+       int oldVal;
        int getVal;
        int setVal = 60;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_int(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-
-       result = sst_vconf_set_int(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_int(iface, &getVal);;
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_int(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+
+       ret = sst_vconf_set_int(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_int(iface, &getVal);;
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_EQ(setVal, getVal);
-       result = sst_vconf_set_int(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_vconf_set_int(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstVconfTest, getValueBool)
+TEST(SstVconfTest, getValueBool)
 {
        bool val;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_bool(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_bool(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstVconfTest, setValueBool)
+TEST(SstVconfTest, setValueBool)
 {
-       bool bkVal;
        bool getVal;
-       bool setVal = false;
+       bool setVal;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_bool(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_bool(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_bool(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_bool(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       setVal = !getVal;
+       ret = sst_vconf_set_bool(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_bool(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_EQ(setVal, getVal);
-       result = sst_vconf_set_bool(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       ret = sst_vconf_set_bool(iface, !getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstVconfTest, getValueString)
+TEST(SstVconfTest, getValueString)
 {
        char *val;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_str(iface, &val);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_str(iface, &val);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        free(val);
 }
 
-TEST_F(SstVconfTest, setValueString)
+TEST(SstVconfTest, setValueString)
 {
-       char *bkVal;
+       char *oldVal;
        char *getVal;
        const char *setVal = "ko_KR";
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-
-       result = sst_vconf_get_str(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_str(iface, setVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_str(iface, &getVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+
+       ret = sst_vconf_get_str(iface, &oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_set_str(iface, setVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_get_str(iface, &getVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
        EXPECT_STREQ(setVal, getVal);
        free(getVal);
-       result = sst_vconf_set_str(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       free(bkVal);
+       ret = sst_vconf_set_str(iface, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       free(oldVal);
 }
 
-TEST_F(SstVconfTest, setUnsetChangedCallback)
+TEST_F(SstVconfCBTest, setUnsetChangedCallback)
 {
-       bool bkVal;
+       bool oldVal;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_bool(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_bool(iface, false);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_cb(iface, changedCallback, NULL);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = -1;
-       g_idle_add(checkCallbackIdle, NULL);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_set_cb(iface, changedCallback, NULL);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       resultCB = -1;
+       g_idle_add(checkCallbackIdle, &oldVal);
        g_main_loop_run(loop);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_unset_cb(iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_bool(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, resultCB);
+       ret = sst_vconf_unset_cb(iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstVconfTest, addDeleteChangedCallback)
+TEST_F(SstVconfCBTest, addDeleteChangedCallback)
 {
-       bool bkVal;
+       bool oldVal;
        sst_interface *iface;
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_bool(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_bool(iface, false);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_add_multi_cb(iface, changedMultiCallback1, NULL);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_add_multi_cb(iface, changedMultiCallback2, NULL);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = -1;
-       g_idle_add(checkCallbackIdle, NULL);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_add_multi_cb(iface, changedMultiCallback1, NULL);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_add_multi_cb(iface, changedMultiCallback2, NULL);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       resultCB = 0;
+       g_idle_add(checkCallbackIdle, &oldVal);
        g_main_loop_run(loop);
-       EXPECT_EQ(0x11, result);
-       result = sst_vconf_del_multi_cb(iface, changedMultiCallback1);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_del_multi_cb(iface, changedMultiCallback2);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_bool(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       EXPECT_EQ(0x11, resultCB);
+       ret = sst_vconf_del_multi_cb(iface, changedMultiCallback1);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_del_multi_cb(iface, changedMultiCallback2);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
 
-TEST_F(SstVconfTest, subscribeUnsubscribe)
+TEST_F(SstVconfCBTest, subscribeUnsubscribe)
 {
-       bool bkVal;
+       bool oldVal;
        sst_interface *iface;
        system_settings_cb_id cb[2];
-       result = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_get_bool(iface, &bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_bool(iface, false);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_subscribe(iface, changedMultiCallback1, NULL, &cb[0]);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_subscribe(iface, changedMultiCallback2, NULL, &cb[1]);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = -1;
-       g_idle_add(checkCallbackIdle, NULL);
+       int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &iface);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_subscribe(iface, changedMultiCallback1, NULL, &cb[0]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_subscribe(iface, changedMultiCallback2, NULL, &cb[1]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       resultCB = 0;
+       g_idle_add(checkCallbackIdle, &oldVal);
        g_main_loop_run(loop);
-       EXPECT_EQ(0x11, result);
-       result = sst_vconf_unsubscribe(iface, cb[0]);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_unsubscribe(iface, cb[1]);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
-       result = sst_vconf_set_bool(iface, bkVal);
-       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, result);
+       EXPECT_EQ(0x11, resultCB);
+       ret = sst_vconf_unsubscribe(iface, cb[0]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = sst_vconf_unsubscribe(iface, cb[1]);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
+       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, oldVal);
+       EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 }
diff --git a/tests/sst_tests.h b/tests/sst_tests.h
deleted file mode 100644 (file)
index 1b9375f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#define SST_TEST_CHECK_NOT_SUPPORTED(result) do { \
-       if (SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED == result) \
-               return; \
-       } while(0)