E CVS: libs/efreet dj2

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/efreet

Dir     : e17/libs/efreet/src/bin


Modified Files:
	ef_menu.c main.c 


Log Message:
- add test case for incorrect menu name. this currently works correctly.
- add test case for nested comments with tags inside. this test fails.

===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_menu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ef_menu.c	26 Mar 2007 16:33:00 -0000	1.4
+++ ef_menu.c	27 Apr 2007 19:48:54 -0000	1.5
@@ -45,6 +45,36 @@
 }
 
 int
+ef_cb_menu_with_slashes(void)
+{
+    Efreet_Menu *menu;
+
+    menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_slash_bad.menu");
+    if (menu)
+    {
+        printf("efreet_menu_get() didn't return NULL\n");
+        return 0;
+    }
+
+    return 1;
+}
+
+int
+ef_cb_menu_with_bad_comment(void)
+{
+    Efreet_Menu *menu;
+
+    menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_bad_comment.menu");
+    if (!menu)
+    {
+        printf("efreet_menu_get() returned NULL\n");
+        return 0;
+    }
+
+    return 1;
+}
+
+int
 ef_cb_menu_save(void)
 {
     Efreet_Menu *menu;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- main.c	26 Mar 2007 16:34:45 -0000	1.4
+++ main.c	27 Apr 2007 19:48:54 -0000	1.5
@@ -22,6 +22,8 @@
 int ef_cb_desktop_file_id(void);
 #endif
 int ef_cb_menu_get(void);
+int ef_cb_menu_with_slashes(void);
+int ef_cb_menu_with_bad_comment(void);
 int ef_cb_menu_save(void);
 #if 0
 int ef_cb_menu_edit(void);
@@ -56,6 +58,8 @@
     {"Desktop File ID", ef_cb_desktop_file_id},
 #endif
     {"Menu Parsing", ef_cb_menu_get},
+    {"Menu Incorrect Names", ef_cb_menu_with_slashes},
+    {"Menu Bad Comment", ef_cb_menu_with_bad_comment},
     {"Menu Save", ef_cb_menu_save},
 #if 0
     {"Menu Edit", ef_cb_menu_edit},