From e8b35c779e7d7bba86172d00612fe08abee6c920 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 11 Jul 2017 16:02:59 +0900 Subject: [PATCH] evas: Add a test case with a custom font The font is **ugly** and was created with birdfont. Its license shall be anything EFL requires (public domain in the ttf file). --- src/Makefile_Evas.am | 1 + src/tests/evas/evas_test_filters.c | 2 +- src/tests/evas/evas_test_mask.c | 2 +- src/tests/evas/evas_test_object_smart.c | 2 +- src/tests/evas/evas_test_text.c | 31 +++++++++++++++++++++++- src/tests/evas/evas_test_textblock.c | 2 +- src/tests/evas/{ => fonts}/TestFont.eet | Bin src/tests/evas/fonts/evas_test_font.ttf | Bin 0 -> 16744 bytes 8 files changed, 35 insertions(+), 5 deletions(-) rename src/tests/evas/{ => fonts}/TestFont.eet (100%) create mode 100644 src/tests/evas/fonts/evas_test_font.ttf diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index fc477e8351..d3b3bcbb92 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -2391,6 +2391,7 @@ endif EXTRA_DIST2 += \ tests/evas/TestFont.eet \ +tests/evas/fonts/evas_test_font.ttf \ tests/evas/images/HM7Y9233-50.tgv \ tests/evas/images/HM7Y9233.jpg \ tests/evas/images/Light-50.png \ diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c index f6d4ccd77a..07e2928092 100644 --- a/src/tests/evas/evas_test_filters.c +++ b/src/tests/evas/evas_test_filters.c @@ -18,7 +18,7 @@ #include "evas_suite.h" #define TEST_FONT_NAME "DejaVuSans,UnDotum" -#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet" +#define TEST_FONT_SOURCE TESTS_SRC_DIR "/fonts/TestFont.eet" #define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas" #define START_FILTER_TEST() \ diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c index 35d665e847..1f160444e4 100644 --- a/src/tests/evas/evas_test_mask.c +++ b/src/tests/evas/evas_test_mask.c @@ -11,7 +11,7 @@ #include "evas_tests_helpers.h" #define TEST_FONT_NAME "DejaVuSans,UnDotum" -#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet" +#define TEST_FONT_SOURCE TESTS_SRC_DIR "/fonts/TestFont.eet" #define START_MASK_TEST(w, h) \ Ecore_Evas *ee; Evas *e; \ diff --git a/src/tests/evas/evas_test_object_smart.c b/src/tests/evas/evas_test_object_smart.c index 23a43b7ac3..dbf88e0a7a 100644 --- a/src/tests/evas/evas_test_object_smart.c +++ b/src/tests/evas/evas_test_object_smart.c @@ -15,7 +15,7 @@ #include "evas_suite.h" #include "evas_tests_helpers.h" -#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet" +#define TEST_FONT_SOURCE TESTS_SRC_DIR "/fonts/TestFont.eet" #define TEST_TEXTBLOCK_FONT "font=DejaVuSans font_source=" TEST_FONT_SOURCE #define TEST_TEXTBLOCK_FONT_SIZE "14" #define TEST_TEXT_FONT "DejaVuSans,UnDotum" diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c index 951e4c2039..f8508ec289 100644 --- a/src/tests/evas/evas_test_text.c +++ b/src/tests/evas/evas_test_text.c @@ -11,8 +11,10 @@ #include "evas_suite.h" #include "evas_tests_helpers.h" +#define TEST_FONT_DIR TESTS_SRC_DIR "/fonts/" #define TEST_FONT_NAME "DejaVuSans,UnDotum" -#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet" +#define TEST_FONT_SOURCE TEST_FONT_DIR "TestFont.eet" +#define TEST_FONT_TTF_NAME "Evas Test Font" #define START_TEXT_TEST() \ Evas *evas; \ @@ -654,6 +656,32 @@ START_TEST(evas_text_render) } END_TEST +START_TEST(evas_text_font_load) +{ + Ecore_Evas *ee = ecore_evas_buffer_new(500, 500); + Evas *evas = ecore_evas_get(ee); + const char *font, *match; + Eina_List *list, *li; + int found = 0; + + evas_font_path_global_append(TEST_FONT_DIR); + match = eina_stringshare_printf("%s:style=Regular", TEST_FONT_TTF_NAME); + list = evas_font_available_list(evas); + EINA_LIST_FOREACH(list, li, font) + if (eina_streq(font, match)) + { + found = 1; + break; + } + evas_font_available_list_free(evas, list); + eina_stringshare_del(match); + + ck_assert_int_eq(found, 1); + + ecore_evas_free(ee); +} +END_TEST + void evas_test_text(TCase *tc) { tcase_add_test(tc, evas_text_simple); @@ -668,4 +696,5 @@ void evas_test_text(TCase *tc) tcase_add_test(tc, evas_text_unrelated); tcase_add_test(tc, evas_text_render); + tcase_add_test(tc, evas_text_font_load); } diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index 196ef2fb2a..827cda8569 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -23,7 +23,7 @@ EAPI int _evas_textblock_format_offset_get(const Evas_Object_Textblock_Node_Format *n); /* end of functions defined in evas_object_textblock.c */ -#define TEST_FONT "font=DejaVuSans,UnDotum,malayalam font_source=" TESTS_SRC_DIR "/TestFont.eet" +#define TEST_FONT "font=DejaVuSans,UnDotum,malayalam font_source=" TESTS_SRC_DIR "/fonts/TestFont.eet" static const char *style_buf = "DEFAULT='" TEST_FONT " font_size=10 color=#000 text_class=entry'" diff --git a/src/tests/evas/TestFont.eet b/src/tests/evas/fonts/TestFont.eet similarity index 100% rename from src/tests/evas/TestFont.eet rename to src/tests/evas/fonts/TestFont.eet diff --git a/src/tests/evas/fonts/evas_test_font.ttf b/src/tests/evas/fonts/evas_test_font.ttf new file mode 100644 index 0000000000000000000000000000000000000000..5409502de02ab26efc5bf03e1badc1cd5da793f7 GIT binary patch literal 16744 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 HXG;GIj-+9R literal 0 HcmV?d00001