From 891fbe5708951266b6092e5d8b2e221421eb6610 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 3 Jul 2007 15:07:00 +0000 Subject: [PATCH] - update mime test SVN revision: 30572 --- legacy/efreet/src/bin/data/Makefile.am | 2 ++ legacy/efreet/src/bin/data/entry | Bin 0 -> 647 bytes legacy/efreet/src/bin/data/entry.png | Bin 0 -> 647 bytes legacy/efreet/src/bin/ef_mime.c | 25 +++++++++++++++++++------ 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 legacy/efreet/src/bin/data/entry create mode 100644 legacy/efreet/src/bin/data/entry.png diff --git a/legacy/efreet/src/bin/data/Makefile.am b/legacy/efreet/src/bin/data/Makefile.am index 4e26db1d94..20731f982d 100644 --- a/legacy/efreet/src/bin/data/Makefile.am +++ b/legacy/efreet/src/bin/data/Makefile.am @@ -9,6 +9,8 @@ test.desktop \ test_type.desktop \ test.menu \ test_menu_slash_bad.menu \ +entry.png \ +entry \ preferences.menu EXTRA_DIST = $(test_DATA) diff --git a/legacy/efreet/src/bin/data/entry b/legacy/efreet/src/bin/data/entry new file mode 100644 index 0000000000000000000000000000000000000000..503d8e5ae500bd59ffec58d5770ec8c45b6291a5 GIT binary patch literal 647 zcmV;20(kw2P)sw;000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RQ1`7}nDqA@%Y5)KN6-h)v zRA}Dqn7@wNKoEz&wa0%DmJ9_K3DZLxkW%mQ94>IQ&^TFxga2HZ;Hb! z?!@J|B0;|FPa17AtCjZi%>34By9Vut6 zX_|(zEZOh(Y&IKav)M-h$g+$e2pEkHm$7l8T-1J+_*k!c)g!9kurfI0Ein^|;s>)b& z`@HJr^QvWeR%0rwUfCTzD`6L#Ld5A&8J3DfBm;G2YDSj^}1&x^(4(>c$z hSM@H`4(RW|*WbN#AC5tq<>UYW002ovPDHLkV1j9_FrWYc literal 0 HcmV?d00001 diff --git a/legacy/efreet/src/bin/data/entry.png b/legacy/efreet/src/bin/data/entry.png new file mode 100644 index 0000000000000000000000000000000000000000..503d8e5ae500bd59ffec58d5770ec8c45b6291a5 GIT binary patch literal 647 zcmV;20(kw2P)sw;000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RQ1`7}nDqA@%Y5)KN6-h)v zRA}Dqn7@wNKoEz&wa0%DmJ9_K3DZLxkW%mQ94>IQ&^TFxga2HZ;Hb! z?!@J|B0;|FPa17AtCjZi%>34By9Vut6 zX_|(zEZOh(Y&IKav)M-h$g+$e2pEkHm$7l8T-1J+_*k!c)g!9kurfI0Ein^|;s>)b& z`@HJr^QvWeR%0rwUfCTzD`6L#Ld5A&8J3DfBm;G2YDSj^}1&x^(4(>c$z hSM@H`4(RW|*WbN#AC5tq<>UYW002ovPDHLkV1j9_FrWYc literal 0 HcmV?d00001 diff --git a/legacy/efreet/src/bin/ef_mime.c b/legacy/efreet/src/bin/ef_mime.c index 5e87b37a5a..8575ff4201 100644 --- a/legacy/efreet/src/bin/ef_mime.c +++ b/legacy/efreet/src/bin/ef_mime.c @@ -11,9 +11,17 @@ ef_mime_cb_get(void) { const char *mime = NULL; int misses = 0, i = 0; - const char *files[] = {PACKAGE_DATA_DIR"/efreet/test/test_type.desktop", - PACKAGE_DATA_DIR"/efreet/test/test_type.desktop", - PACKAGE_DATA_DIR"/efreet/test/sub"}; + struct + { + char *file; + char *mime; + } files[] = { + {PACKAGE_DATA_DIR"/efreet/test/test_type.desktop", "application/x-desktop"}, + {PACKAGE_DATA_DIR"/efreet/test/entry.png", "image/png"}, + {PACKAGE_DATA_DIR"/efreet/test/entry", "image/png"}, + {PACKAGE_DATA_DIR"/efreet/test/sub", "inode/directory"}, + {NULL, NULL} + }; if (!efreet_mime_init()) @@ -22,12 +30,17 @@ ef_mime_cb_get(void) return 1; } - for (i = 0; i < (sizeof(files) / sizeof(const char *)); ++i) + for (i = 0; files[i].file != NULL; ++i) { - mime = efreet_mime_type_get(files[i]); + mime = efreet_mime_type_get(files[i].file); if (!mime) + { + printf("Got %s as null instead of %s\n", files[i].file, files[i].mime); + misses ++; + } + else if (strcmp(mime, files[i].mime)) { - printf("Missed %s\n", files[i]); + printf("Got %s as %s instead of %s\n", files[i].file, mime, files[i].mime); misses ++; } }