Remove calling EFL image validation API

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

diff --git a/libutil/sstu.c b/libutil/sstu.c
index 633178e87ac5d387e75a4eb84f5848a6ceb40531..b767fa619d7aaa6613ab9cb2fc5b432a0f32c34b 100644 (file)
--- a/libutil/sstu.c
+++ b/libutil/sstu.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <vconf.h>
 #include <fontconfig/fontconfig.h>
-#include <Ecore_Evas.h>
 #include <efl_extension.h>
 #include "system_settings.h"
 #include "sst.h"
@@ -95,35 +94,6 @@ static char* _get_main_font_family(char *alias)
        return ret;
 }
 
-API bool sstu_is_valid_image(const char *path)
-{
-       void *ee;
-       void *evas;
-
-       if (0 == ecore_evas_init()) {
-               ERR("ecore_evas_init() Fail");
-               return false;
-       }
-
-       ee = ecore_evas_buffer_new(100, 100);
-       evas = ecore_evas_get(ee);
-
-       void *img = evas_object_image_add(evas);
-       evas_object_image_file_set(img, path, NULL);
-       int ret = evas_object_image_load_error_get(img);
-
-       bool result = false;
-       if (ret == 0) {
-               result = true;
-       } else {
-               ERR("Invalid(%s)", path);
-               result = false;
-       }
-       ecore_evas_free(ee);
-       ecore_evas_shutdown();
-       return result;
-}
-
 API void sstu_font_config_set_notification()
 {
 }

diff --git a/src/sst_utils_wrapper.c b/src/sst_utils_wrapper.c
index f86ca502fad623a1c77c779b62c5110f4ba52ece..e0539e922c845fd543a3b3fc34d6bea7df5d55a4 100644 (file)
--- a/src/sst_utils_wrapper.c
+++ b/src/sst_utils_wrapper.c
@@ -103,24 +103,7 @@ char* sstu_get_default_font()
 
 bool sstu_is_valid_image(const char *path)
 {
-       static bool (*fn_impl)(const char*) = NULL;
-       if (fn_impl)
-               return fn_impl(path);
-
-       void *handle = _utils_load_lib();
-       if (NULL == handle) {
-               ERR("No Utils Library Handle");
-               return sst_misc_file_exists(path);
-       }
-
-       fn_impl = dlsym(handle, "sstu_is_valid_image");
-       char *error = dlerror();
-       if (error) {
-               ERR("dlsym(sstu_is_valid_image) Fail(%s)", error);
-               return false;
-       }
-
-       return fn_impl(path);
+    return sst_misc_file_exists(path);
 }
 void sstu_set_font_size()
 {

diff --git a/tests/mocks/libc.c b/tests/mocks/libc.c
index b1934408a7930b08004f427ac33729a46392206c..b57d91925c08ad2e589b336553484b4897b137c3 100644 (file)
--- a/tests/mocks/libc.c
+++ b/tests/mocks/libc.c
@@ -68,6 +68,8 @@ API int access(const char *pathname, int mode)
                return 0;
        if (0 == strcmp(pathname, "/opt/usr/data/settings/Ringtones/ringtone_sdk.mp3"))
                return 0;
+       if (0 == strcmp(pathname, SYS_SETTINGS_TEST_DIR"/bg_test.png"))
+               return 0;
 
        int (*org_fn)(const char *, int);
        org_fn = dlsym(RTLD_NEXT, "access");

diff --git a/tests/sst_gtest_normal_screen.cpp b/tests/sst_gtest_normal_screen.cpp
index 0c4b60272037e78122c45a74791444a359212577..48f964895a3ee95cdf6e72a4c3f63d559a73447c 100644 (file)
--- a/tests/sst_gtest_normal_screen.cpp
+++ b/tests/sst_gtest_normal_screen.cpp
@@ -51,7 +51,6 @@ TEST(SstScreenTest, setHomeWallPaper)
        int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, &iface);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       sstm_evas_object_image_load_error_setup(0);
        sstm_vconf_set_str_setup(VCONFKEY_BGSET, 0);
        ret = sst_screen_set_home_wallpaper(iface, sstBgPath);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
@@ -67,12 +66,10 @@ TEST(SstScreenTest, setHomeWallPaperERR)
        int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, &iface);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       sstm_evas_object_image_load_error_setup(0);
        sstm_vconf_set_str_setup(VCONFKEY_BGSET, -1);
        ret = sst_screen_set_home_wallpaper(iface, sstBgPath);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
 
-       sstm_evas_object_image_load_error_setup(-1);
        ret = sst_screen_set_home_wallpaper(iface, "test.png");
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret);
 }
@@ -85,7 +82,6 @@ TEST(SstScreenTest, setLockWallPaper)
        int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, &iface);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       sstm_evas_object_image_load_error_setup(0);
        sstm_vconf_set_str_setup(VCONFKEY_IDLE_LOCK_BGSET, 0);
        ret = sst_screen_set_lock_wallpaper(iface, sstBgPath);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
@@ -101,12 +97,10 @@ TEST(SstScreenTest, setLockWallPaperERR)
        int ret = sst_get_interface(SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, &iface);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret);
 
-       sstm_evas_object_image_load_error_setup(0);
        sstm_vconf_set_str_setup(VCONFKEY_IDLE_LOCK_BGSET, -1);
        ret = sst_screen_set_lock_wallpaper(iface, sstBgPath);
        EXPECT_EQ(SYSTEM_SETTINGS_ERROR_IO_ERROR, ret);
 
-       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);
 }