diff --git a/src/tests/evas/DejaVuSans.eet b/src/tests/evas/DejaVuSans.eet deleted file mode 100644 index de01dad916..0000000000 Binary files a/src/tests/evas/DejaVuSans.eet and /dev/null differ diff --git a/src/tests/evas/TestFont.eet b/src/tests/evas/TestFont.eet new file mode 100644 index 0000000000..7ee3486c78 Binary files /dev/null and b/src/tests/evas/TestFont.eet differ diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c index fe35d1b66e..a113e33a4d 100644 --- a/src/tests/evas/evas_test_text.c +++ b/src/tests/evas/evas_test_text.c @@ -9,8 +9,8 @@ #include "Evas.h" #include "evas_tests_helpers.h" -#define TEST_FONT_NAME "TEST_FONT" -#define TEST_FONT_SOURCE TESTS_SRC_DIR "./DejaVuSans.eet" +#define TEST_FONT_NAME "DejaVuSans,UnDotum" +#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet" #define START_TEXT_TEST() \ Evas *evas; \ diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index acbd31ab1a..ca6644daaf 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -23,12 +23,12 @@ 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=TEST_FONT fount_source" TESTS_SRC_DIR "./DejaVuSans.eet" +#define TEST_FONT "font=DejaVuSans font_source=" TESTS_SRC_DIR "/TestFont.eet" static const char *style_buf = "DEFAULT='" TEST_FONT " font_size=10 color=#000 text_class=entry'" "newline='br'" - "b='+ font=Sans:style=bold'"; + "b='+ font_weight=bold'"; #define START_TB_TEST() \ Evas *evas; \ @@ -1745,7 +1745,7 @@ START_TEST(evas_textblock_various) stt = evas_textblock_style_new(); evas_textblock_style_set(stt, - "DEFAULT='font=" TEST_FONT " font_size=10 align=left color=#000000 wrap=char'"); + "DEFAULT='" TEST_FONT " font_size=10 align=left color=#000000 wrap=char'"); evas_object_textblock_style_set(tb, stt); evas_textblock_style_free(stt);