- fix the package paths used in the test files. this makes 19/19 tests pass.
SVN revision: 34492
This commit is contained in:
parent
4cbf818700
commit
bc35dd6189
|
@ -16,7 +16,7 @@ ef_cb_desktop_parse(void)
|
||||||
Efreet_Desktop *desktop;
|
Efreet_Desktop *desktop;
|
||||||
int ret = 1;
|
int ret = 1;
|
||||||
|
|
||||||
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
|
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
|
||||||
if (!desktop)
|
if (!desktop)
|
||||||
{
|
{
|
||||||
printf("No desktop found.\n");
|
printf("No desktop found.\n");
|
||||||
|
@ -80,7 +80,7 @@ ef_cb_desktop_file_id(void)
|
||||||
Efreet_Desktop *desktop;
|
Efreet_Desktop *desktop;
|
||||||
int ret = 1;
|
int ret = 1;
|
||||||
|
|
||||||
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
|
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
|
||||||
if (desktop)
|
if (desktop)
|
||||||
{
|
{
|
||||||
const char *id;
|
const char *id;
|
||||||
|
@ -92,10 +92,10 @@ ef_cb_desktop_file_id(void)
|
||||||
char *prefix;
|
char *prefix;
|
||||||
char *expected;
|
char *expected;
|
||||||
} tests[] = {
|
} tests[] = {
|
||||||
{PACKAGE_DATA_DIR"/efreet/test/", 0, NULL, "test.desktop"},
|
{PACKAGE_DATA_DIR"/test/", 0, NULL, "test.desktop"},
|
||||||
{PACKAGE_DATA_DIR"/efreet/", 0, NULL, "test-test.desktop"},
|
{PACKAGE_DATA_DIR"/", 0, NULL, "test-test.desktop"},
|
||||||
{PACKAGE_DATA_DIR"/efreet/", 1, NULL, "test.desktop"},
|
{PACKAGE_DATA_DIR"/", 1, NULL, "test.desktop"},
|
||||||
{PACKAGE_DATA_DIR"/efreet/", 1, "prefix", "prefix-test.desktop"},
|
{PACKAGE_DATA_DIR"/", 1, "prefix", "prefix-test.desktop"},
|
||||||
{NULL, 0, NULL, NULL}
|
{NULL, 0, NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ ef_cb_desktop_save(void)
|
||||||
Efreet_Desktop *desktop;
|
Efreet_Desktop *desktop;
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
|
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
|
||||||
if (!desktop)
|
if (!desktop)
|
||||||
{
|
{
|
||||||
printf("Failed to get Desktop file\n");
|
printf("Failed to get Desktop file\n");
|
||||||
|
@ -371,7 +371,7 @@ ef_cb_desktop_type_parse(void)
|
||||||
my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
|
my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
|
||||||
(Efreet_Desktop_Type_Free_Cb)free);
|
(Efreet_Desktop_Type_Free_Cb)free);
|
||||||
|
|
||||||
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop");
|
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test_type.desktop");
|
||||||
if (!desktop)
|
if (!desktop)
|
||||||
{
|
{
|
||||||
printf("No desktop found.\n");
|
printf("No desktop found.\n");
|
||||||
|
|
|
@ -12,7 +12,7 @@ ef_cb_ini_parse(void)
|
||||||
|
|
||||||
putenv("LC_ALL=en_US");
|
putenv("LC_ALL=en_US");
|
||||||
|
|
||||||
ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test.ini");
|
ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/test.ini");
|
||||||
if (!ini)
|
if (!ini)
|
||||||
{
|
{
|
||||||
printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
|
printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
|
||||||
|
@ -115,7 +115,7 @@ ef_cb_ini_long_line(void)
|
||||||
{NULL, 0}
|
{NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/long.ini");
|
ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/long.ini");
|
||||||
if (!ini)
|
if (!ini)
|
||||||
{
|
{
|
||||||
printf("Ini failed to parse.\n");
|
printf("Ini failed to parse.\n");
|
||||||
|
|
|
@ -33,7 +33,7 @@ ef_cb_menu_get(void)
|
||||||
Efreet_Menu *menu;
|
Efreet_Menu *menu;
|
||||||
|
|
||||||
menu = efreet_menu_get();
|
menu = efreet_menu_get();
|
||||||
// menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
|
// menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
|
||||||
if (!menu)
|
if (!menu)
|
||||||
{
|
{
|
||||||
printf("efreet_menu_get() returned NULL\n");
|
printf("efreet_menu_get() returned NULL\n");
|
||||||
|
@ -51,7 +51,7 @@ ef_cb_menu_with_slashes(void)
|
||||||
{
|
{
|
||||||
Efreet_Menu *menu;
|
Efreet_Menu *menu;
|
||||||
|
|
||||||
menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_slash_bad.menu");
|
menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test_menu_slash_bad.menu");
|
||||||
if (menu)
|
if (menu)
|
||||||
{
|
{
|
||||||
printf("efreet_menu_get() didn't return NULL\n");
|
printf("efreet_menu_get() didn't return NULL\n");
|
||||||
|
@ -68,7 +68,7 @@ ef_cb_menu_save(void)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
// menu = efreet_menu_get();
|
// menu = efreet_menu_get();
|
||||||
menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
|
menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
|
||||||
if (!menu)
|
if (!menu)
|
||||||
{
|
{
|
||||||
printf("efreet_menu_get() returned NULL\n");
|
printf("efreet_menu_get() returned NULL\n");
|
||||||
|
@ -87,7 +87,7 @@ ef_cb_menu_edit(void)
|
||||||
Efreet_Desktop *desktop;
|
Efreet_Desktop *desktop;
|
||||||
|
|
||||||
// menu = efreet_menu_get();
|
// menu = efreet_menu_get();
|
||||||
menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu");
|
menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
|
||||||
if (!menu)
|
if (!menu)
|
||||||
{
|
{
|
||||||
printf("efreet_menu_get() returned NULL\n");
|
printf("efreet_menu_get() returned NULL\n");
|
||||||
|
@ -99,7 +99,7 @@ ef_cb_menu_edit(void)
|
||||||
printf("\n");
|
printf("\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
|
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
|
||||||
if (!desktop)
|
if (!desktop)
|
||||||
{
|
{
|
||||||
efreet_menu_free(menu);
|
efreet_menu_free(menu);
|
||||||
|
|
|
@ -17,10 +17,10 @@ ef_mime_cb_get(void)
|
||||||
char *file;
|
char *file;
|
||||||
char *mime;
|
char *mime;
|
||||||
} files[] = {
|
} files[] = {
|
||||||
{PACKAGE_DATA_DIR"/efreet/test/test_type.desktop", "application/x-desktop"},
|
{PACKAGE_DATA_DIR"/test/test_type.desktop", "application/x-desktop"},
|
||||||
{PACKAGE_DATA_DIR"/efreet/test/entry.png", "image/png"},
|
{PACKAGE_DATA_DIR"/test/entry.png", "image/png"},
|
||||||
{PACKAGE_DATA_DIR"/efreet/test/entry", "image/png"},
|
{PACKAGE_DATA_DIR"/test/entry", "image/png"},
|
||||||
{PACKAGE_DATA_DIR"/efreet/test/sub", "inode/directory"},
|
{PACKAGE_DATA_DIR"/test/sub", "inode/directory"},
|
||||||
{NULL, NULL}
|
{NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue