tests: move image_zoomable into efl_ui_suite

ref T6815

Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D7807

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index cf246a68b9a93019e6f9970d6b466a73607a7172..4b4cdd05a6400e55573d120ad59ad70c23450119 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1671,6 +1671,7 @@ tests_elementary_efl_ui_suite_SOURCES = \
        tests/elementary/efl_ui_suite.c \
        tests/elementary/elm_test_init.c \
        tests/elementary/efl_ui_test_atspi.c \
+       tests/elementary/efl_ui_test_image_zoomable.c \
        tests/elementary/efl_ui_test_grid.c
 
 tests_elementary_efl_ui_suite_CPPFLAGS = \

diff --git a/src/tests/elementary/efl_ui_suite.c b/src/tests/elementary/efl_ui_suite.c
index 9f4fbda98b61777ae8ce408386dba1753cd98b32..1fc0b49c6b7fdd7ade66805de29b9a35bddd337b 100644 (file)
--- a/src/tests/elementary/efl_ui_suite.c
+++ b/src/tests/elementary/efl_ui_suite.c
@@ -14,6 +14,7 @@ static const Efl_Test_Case etc[] = {
   //{ "elm_widget_focus", elm_test_widget_focus},
   { "efl_ui_atspi", efl_ui_test_atspi},
   { "efl_ui_grid", efl_ui_test_grid},
+  { "efl_ui_image_zoomable", efl_ui_test_image_zoomable},
   { NULL, NULL }
 };
 

diff --git a/src/tests/elementary/efl_ui_suite.h b/src/tests/elementary/efl_ui_suite.h
index 720bc1a067702eeb6e1ffc40c3c83b92d790e04b..0fabdcfd474944758dc8391494866c03123168b9 100644 (file)
--- a/src/tests/elementary/efl_ui_suite.h
+++ b/src/tests/elementary/efl_ui_suite.h
@@ -18,6 +18,7 @@
 #include <Eo.h>
 void efl_ui_test_grid(TCase *tc);
 void efl_ui_test_atspi(TCase *tc);
+void efl_ui_test_image_zoomable(TCase *tc);
 
 Eo *win_add();
 Eo *win_add_focused();

diff --git a/src/tests/elementary/efl_ui_test_image_zoomable.c b/src/tests/elementary/efl_ui_test_image_zoomable.c
new file mode 100644 (file)
index 0000000..cbb16ad
--- /dev/null
+++ b/src/tests/elementary/efl_ui_test_image_zoomable.c
@@ -0,0 +1,37 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+#define EFL_NOLEGACY_API_SUPPORT
+
+#include <Efl_Ui.h>
+#include "efl_ui_suite.h"
+
+
+EFL_START_TEST(efl_ui_test_image_zoomable_icon)
+{
+   Evas_Object *win, *img_zoomable;
+   Eina_Bool ok;
+   const char *icon_name;
+
+   win = win_add(NULL, "photocam", EFL_UI_WIN_BASIC);
+
+   img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win);
+   efl_gfx_entity_visible_set(img_zoomable, EINA_TRUE);
+
+   ok = efl_ui_image_icon_set(img_zoomable, "folder");
+   ck_assert(ok);
+   icon_name = efl_ui_image_icon_get(img_zoomable);
+   ck_assert_str_eq(icon_name, "folder");
+
+   ok = efl_ui_image_icon_set(img_zoomable, "None");
+   ck_assert(ok == 0);
+   icon_name = efl_ui_image_icon_get(img_zoomable);
+   ck_assert(icon_name == NULL);
+
+}
+EFL_END_TEST
+
+void efl_ui_test_image_zoomable(TCase *tc)
+{
+   tcase_add_test(tc, efl_ui_test_image_zoomable_icon);
+}

diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index 36a09488cfdcb9f9c4b85e5ae9a2aeeb2156ef61..b2bf4ecc12cefec3e4fc6d030905e8dff90d5d48 100644 (file)
--- a/src/tests/elementary/elm_test_photocam.c
+++ b/src/tests/elementary/elm_test_photocam.c
@@ -41,33 +41,8 @@ EFL_START_TEST(elm_atspi_role_get)
 }
 EFL_END_TEST
 
-EFL_START_TEST(efl_ui_image_zoomable_icon)
-{
-   Evas_Object *win, *img_zoomable;
-   Eina_Bool ok;
-   const char *icon_name;
-
-   win = win_add(NULL, "photocam", ELM_WIN_BASIC);
-
-   img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win);
-   evas_object_show(img_zoomable);
-
-   ok = efl_ui_image_icon_set(img_zoomable, "folder");
-   ck_assert(ok);
-   icon_name = efl_ui_image_icon_get(img_zoomable);
-   ck_assert_str_eq(icon_name, "folder");
-
-   ok = efl_ui_image_icon_set(img_zoomable, "None");
-   ck_assert(ok == 0);
-   icon_name = efl_ui_image_icon_get(img_zoomable);
-   ck_assert(icon_name == NULL);
-
-}
-EFL_END_TEST
-
 void elm_test_photocam(TCase *tc)
 {
    tcase_add_test(tc, elm_photocam_legacy_type_check);
    tcase_add_test(tc, elm_atspi_role_get);
-   tcase_add_test(tc, efl_ui_image_zoomable_icon);
 }

diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index b1bf27e97e92d0199e18307eea4271fdebe93e53..4821f3bbe36d1d54abc0f45e9cf0aba4d427fbd7 100644 (file)
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -122,6 +122,7 @@ efl_ui_suite_src = [
   'elm_test_init.c',
   'efl_ui_test_atspi.c',
   'efl_ui_test_grid.c',
+  'efl_ui_test_image_zoomable.c',
 ]
 
 efl_ui_suite = executable('efl_ui_suite',