summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>2017-02-06 22:24:20 +0200
committerIvaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>2017-02-06 22:24:20 +0200
commit1a333cd8b17c94aa48fafb249d8309f51fc11cb2 (patch)
tree49efc4c1c3415e49f8fb3d53c754dda40a38ae05
parent51a0d2a35cce197352029c64bd8a2d56fa55fff1 (diff)
RE finished
fix some test remnants Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
-rw-r--r--src/bookmark_parser.c29
1 files changed, 19 insertions, 10 deletions
diff --git a/src/bookmark_parser.c b/src/bookmark_parser.c
index fbb5618..d22ad09 100644
--- a/src/bookmark_parser.c
+++ b/src/bookmark_parser.c
@@ -1,6 +1,5 @@
#include "osso_bookmark_parser.h"
-#include <libgnomevfs/gnome-vfs.h>
#include <gio/gio.h>
#include <glib/gprintf.h>
#include <gconf/gconf-client.h>
@@ -9,6 +8,8 @@
#include <string.h>
#include <libintl.h>
#include <ctype.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#ifdef BOOKMARK_PARSER_TEST
#define TEST(fun) __##fun
@@ -996,7 +997,7 @@ osso_bookmark_get_dir_node(const BookmarkItem *bm_item, GSList **folders)
}
GSList *
-osso_bookmark_get_folders_list(void)
+TEST(osso_bookmark_get_folders_list)(void)
{
GSList *folders;
BookmarkItem *bm_item;
@@ -2487,6 +2488,7 @@ out:
#ifdef BOOKMARK_PARSER_TEST
+#include <libgnomevfs/gnome-vfs.h>
#include <assert.h>
static void
@@ -2559,20 +2561,27 @@ int main()
return 1;
}
- /*__bookmark_import("/tmp/bookmarks.html", NULL, &bm1);
- bookmark_import("/tmp/bookmarks.html", NULL, &bm2);
-
- compare(bm1, bm2, FALSE);*/
+ /* export mozilla bookmarks to /tmp/bookmarks.html on device or qemu */
+ if (__bookmark_import("/tmp/bookmarks.html", NULL, &bm1) &&
+ bookmark_import("/tmp/bookmarks.html", NULL, &bm2))
+ {
+ compare(bm1, bm2, FALSE);
+ }
__get_root_bookmark(&bm1, MYBOOKMARKS);
get_root_bookmark(&bm2, MYBOOKMARKS);
compare(bm1, bm2, TRUE);
-/*
- GSList *l = osso_bookmark_get_folders_list();
-*/
- //__netscape_export_bookmarks("/tmp/export2.html", bm1->list, "PARENT_NAME");
+ /* too lazy to write compare func for those */
+#if 0
+ GSList *l1 = __osso_bookmark_get_folders_list();
+ GSList *l2 = osso_bookmark_get_folders_list();
+#endif
+
+ /* please, compare those 2 files by hand */
+ __netscape_export_bookmarks("/tmp/export1.html", bm1->list, "PARENT_NAME");
+ netscape_export_bookmarks("/tmp/export2.html", bm2->list, "PARENT_NAME");
return 0;
}