Commit e4b51040 authored by Matthias Clasen's avatar Matthias Clasen

Move bookmarkfile tests to the test framework

parent b3de028a
...@@ -143,6 +143,9 @@ logging_LDADD = $(progs_ldadd) ...@@ -143,6 +143,9 @@ logging_LDADD = $(progs_ldadd)
TEST_PROGS += error TEST_PROGS += error
error_LDADD = $(progs_ldadd) error_LDADD = $(progs_ldadd)
TEST_PROGS += bookmarkfile
bookmarkfile_LDADD = $(progs_ldadd)
if OS_UNIX if OS_UNIX
# some testing of gtester funcitonality # some testing of gtester funcitonality
...@@ -166,3 +169,7 @@ dist_hook: ...@@ -166,3 +169,7 @@ dist_hook:
mkdir $(distdir)/markups; \ mkdir $(distdir)/markups; \
for f in $(srcdir)/markups/*; do \ for f in $(srcdir)/markups/*; do \
cp $$f $(distdir)/markups; done cp $$f $(distdir)/markups; done
mkdir $(distdir)/bookmarks; \
for f in $(srcdir)/bookmarks/* ; do \
cp $$f $(distdir)/bookmarks; done
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef SRCDIR
#define SRCDIR "."
#endif
#define TEST_URI_0 "file:///abc/defgh/ijklmnopqrstuvwxyz" #define TEST_URI_0 "file:///abc/defgh/ijklmnopqrstuvwxyz"
#define TEST_URI_1 "file:///test/uri/1" #define TEST_URI_1 "file:///test/uri/1"
#define TEST_URI_2 "file:///test/uri/2" #define TEST_URI_2 "file:///test/uri/2"
...@@ -24,7 +28,7 @@ test_load (GBookmarkFile *bookmark, ...@@ -24,7 +28,7 @@ test_load (GBookmarkFile *bookmark,
gboolean res; gboolean res;
res = g_bookmark_file_load_from_file (bookmark, filename, &error); res = g_bookmark_file_load_from_file (bookmark, filename, &error);
if (error) if (error && g_test_verbose ())
{ {
g_print ("Load error: %s\n", error->message); g_print ("Load error: %s\n", error->message);
g_error_free (error); g_error_free (error);
...@@ -33,35 +37,38 @@ test_load (GBookmarkFile *bookmark, ...@@ -33,35 +37,38 @@ test_load (GBookmarkFile *bookmark,
return res; return res;
} }
static gboolean static void
test_query (GBookmarkFile *bookmark) test_query (GBookmarkFile *bookmark)
{ {
gint size; gint size;
gchar **uris; gchar **uris;
gsize uris_len, i; gsize uris_len, i;
gboolean res = TRUE; gchar *mime;
GError *error;
size = g_bookmark_file_get_size (bookmark); size = g_bookmark_file_get_size (bookmark);
uris = g_bookmark_file_get_uris (bookmark, &uris_len); uris = g_bookmark_file_get_uris (bookmark, &uris_len);
if (uris_len != size)
{
g_print ("URI/size mismatch: URI count is %d (should be %d)\n", uris_len, size);
res = FALSE; g_assert_cmpint (uris_len, ==, size);
}
for (i = 0; i < uris_len; i++) for (i = 0; i < uris_len; i++)
if (!g_bookmark_file_has_item (bookmark, uris[i])) {
{ g_assert (g_bookmark_file_has_item (bookmark, uris[i]));
g_print ("URI/bookmark mismatch: bookmark for '%s' does not exist\n", uris[i]); error = NULL;
mime = g_bookmark_file_get_mime_type (bookmark, uris[i], &error);
res = FALSE; g_assert (mime != NULL);
} g_assert_no_error (error);
g_free (mime);
}
g_strfreev (uris); g_strfreev (uris);
return res; g_assert (!g_bookmark_file_has_item (bookmark, "file:///no/such/uri"));
error = NULL;
mime = g_bookmark_file_get_mime_type (bookmark, "file:///no/such/uri", &error);
g_assert (mime == NULL);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_error_free (error);
g_free (mime);
} }
static gboolean static gboolean
...@@ -70,12 +77,19 @@ test_modify (GBookmarkFile *bookmark) ...@@ -70,12 +77,19 @@ test_modify (GBookmarkFile *bookmark)
gchar *text; gchar *text;
guint count; guint count;
time_t stamp; time_t stamp;
time_t now;
GError *error = NULL; GError *error = NULL;
gchar **groups;
g_print ("\t=> check global title/description..."); gsize length;
gchar **apps;
gchar *icon;
gchar *mime;
if (g_test_verbose ())
g_print ("\t=> check global title/description...");
g_bookmark_file_set_title (bookmark, NULL, "a file"); g_bookmark_file_set_title (bookmark, NULL, "a file");
g_bookmark_file_set_description (bookmark, NULL, "a bookmark file"); g_bookmark_file_set_description (bookmark, NULL, "a bookmark file");
text = g_bookmark_file_get_title (bookmark, NULL, &error); text = g_bookmark_file_get_title (bookmark, NULL, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert_cmpstr (text, ==, "a file"); g_assert_cmpstr (text, ==, "a file");
...@@ -85,30 +99,76 @@ test_modify (GBookmarkFile *bookmark) ...@@ -85,30 +99,76 @@ test_modify (GBookmarkFile *bookmark)
g_assert_no_error (error); g_assert_no_error (error);
g_assert_cmpstr (text, ==, "a bookmark file"); g_assert_cmpstr (text, ==, "a bookmark file");
g_free (text); g_free (text);
g_print ("ok\n"); if (g_test_verbose ())
g_print ("ok\n");
g_print ("\t=> check bookmark title/description..."); if (g_test_verbose ())
g_print ("\t=> check bookmark title/description...");
g_bookmark_file_set_title (bookmark, TEST_URI_0, "a title"); g_bookmark_file_set_title (bookmark, TEST_URI_0, "a title");
g_bookmark_file_set_description (bookmark, TEST_URI_0, "a description"); g_bookmark_file_set_description (bookmark, TEST_URI_0, "a description");
g_bookmark_file_set_is_private (bookmark, TEST_URI_0, TRUE);
time (&now);
g_bookmark_file_set_added (bookmark, TEST_URI_0, now);
g_bookmark_file_set_modified (bookmark, TEST_URI_0, now);
g_bookmark_file_set_visited (bookmark, TEST_URI_0, now);
g_bookmark_file_set_icon (bookmark, TEST_URI_0, "testicon", "image/png");
text = g_bookmark_file_get_title (bookmark, TEST_URI_0, &error); text = g_bookmark_file_get_title (bookmark, TEST_URI_0, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert_cmpstr (text, ==, "a title"); g_assert_cmpstr (text, ==, "a title");
g_free (text); g_free (text);
g_print ("ok\n"); text = g_bookmark_file_get_description (bookmark, TEST_URI_0, &error);
g_assert_no_error (error);
g_assert_cmpstr (text, ==, "a description");
g_free (text);
g_assert (g_bookmark_file_get_is_private (bookmark, TEST_URI_0, &error));
g_assert_no_error (error);
stamp = g_bookmark_file_get_added (bookmark, TEST_URI_0, &error);
g_assert_no_error (error);
g_assert (stamp == now);
stamp = g_bookmark_file_get_modified (bookmark, TEST_URI_0, &error);
g_assert_no_error (error);
g_assert (stamp == now);
stamp = g_bookmark_file_get_visited (bookmark, TEST_URI_0, &error);
g_assert_no_error (error);
g_assert (stamp == now);
g_assert (g_bookmark_file_get_icon (bookmark, TEST_URI_0, &icon, &mime, &error));
g_assert_no_error (error);
g_assert_cmpstr (icon, ==, "testicon");
g_assert_cmpstr (mime, ==, "image/png");
g_free (icon);
g_free (mime);
if (g_test_verbose ())
g_print ("ok\n");
g_print ("\t=> check non existing bookmark..."); if (g_test_verbose ())
g_print ("\t=> check non existing bookmark...");
g_bookmark_file_get_description (bookmark, TEST_URI_1, &error); g_bookmark_file_get_description (bookmark, TEST_URI_1, &error);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND); g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_clear_error (&error); g_clear_error (&error);
g_print ("ok\n"); g_bookmark_file_get_is_private (bookmark, TEST_URI_1, &error);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_print ("\t=> check application..."); g_clear_error (&error);
g_bookmark_file_get_added (bookmark, TEST_URI_1, &error);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_clear_error (&error);
g_bookmark_file_get_modified (bookmark, TEST_URI_1, &error);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_clear_error (&error);
g_bookmark_file_get_visited (bookmark, TEST_URI_1, &error);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_clear_error (&error);
if (g_test_verbose ())
g_print ("ok\n");
if (g_test_verbose ())
g_print ("\t=> check application...");
g_bookmark_file_set_mime_type (bookmark, TEST_URI_0, TEST_MIME); g_bookmark_file_set_mime_type (bookmark, TEST_URI_0, TEST_MIME);
g_assert (!g_bookmark_file_has_application (bookmark, TEST_URI_0, TEST_APP_NAME, NULL));
g_bookmark_file_add_application (bookmark, TEST_URI_0, g_bookmark_file_add_application (bookmark, TEST_URI_0,
TEST_APP_NAME, TEST_APP_NAME,
TEST_APP_EXEC); TEST_APP_EXEC);
g_assert (g_bookmark_file_has_application (bookmark, TEST_URI_0, TEST_APP_NAME, NULL) == TRUE); g_assert (g_bookmark_file_has_application (bookmark, TEST_URI_0, TEST_APP_NAME, NULL));
g_bookmark_file_get_app_info (bookmark, TEST_URI_0, TEST_APP_NAME, g_bookmark_file_get_app_info (bookmark, TEST_URI_0, TEST_APP_NAME,
&text, &text,
&count, &count,
...@@ -118,7 +178,15 @@ test_modify (GBookmarkFile *bookmark) ...@@ -118,7 +178,15 @@ test_modify (GBookmarkFile *bookmark)
g_assert (count == 1); g_assert (count == 1);
g_assert (stamp == g_bookmark_file_get_modified (bookmark, TEST_URI_0, NULL)); g_assert (stamp == g_bookmark_file_get_modified (bookmark, TEST_URI_0, NULL));
g_free (text); g_free (text);
g_assert (g_bookmark_file_remove_application (bookmark, TEST_URI_0, TEST_APP_NAME, &error));
g_assert_no_error (error);
g_bookmark_file_add_application (bookmark, TEST_URI_0, TEST_APP_NAME, TEST_APP_EXEC);
apps = g_bookmark_file_get_applications (bookmark, TEST_URI_0, &length, &error);
g_assert_no_error (error);
g_assert_cmpint (length, ==, 1);
g_assert_cmpstr (apps[0], ==, TEST_APP_NAME);
g_strfreev (apps);
g_bookmark_file_get_app_info (bookmark, TEST_URI_0, "fail", g_bookmark_file_get_app_info (bookmark, TEST_URI_0, "fail",
&text, &text,
&count, &count,
...@@ -126,63 +194,105 @@ test_modify (GBookmarkFile *bookmark) ...@@ -126,63 +194,105 @@ test_modify (GBookmarkFile *bookmark)
&error); &error);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED); g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED);
g_clear_error (&error); g_clear_error (&error);
g_print ("ok\n");
g_print ("\t=> check groups..."); if (g_test_verbose ())
g_print ("ok\n");
if (g_test_verbose ())
g_print ("\t=> check groups...");
g_assert (!g_bookmark_file_has_group (bookmark, TEST_URI_1, "Test", NULL));
g_bookmark_file_add_group (bookmark, TEST_URI_1, "Test"); g_bookmark_file_add_group (bookmark, TEST_URI_1, "Test");
g_assert (g_bookmark_file_has_group (bookmark, TEST_URI_1, "Test", NULL) == TRUE); g_assert (g_bookmark_file_has_group (bookmark, TEST_URI_1, "Test", NULL));
g_assert (g_bookmark_file_has_group (bookmark, TEST_URI_1, "Fail", NULL) == FALSE); g_assert (!g_bookmark_file_has_group (bookmark, TEST_URI_1, "Fail", NULL));
g_print ("ok\n"); g_assert (g_bookmark_file_remove_group (bookmark, TEST_URI_1, "Test", &error));
g_assert_no_error (error);
groups = g_bookmark_file_get_groups (bookmark, TEST_URI_1, NULL, &error);
g_assert_cmpint (g_strv_length (groups), ==, 0);
g_strfreev (groups);
groups = g_new0 (gchar *, 3);
groups[0] = "Group1";
groups[1] = "Group2";
groups[2] = NULL;
g_bookmark_file_set_groups (bookmark, TEST_URI_1, (const gchar **)groups, 2);
g_free (groups);
groups = g_bookmark_file_get_groups (bookmark, TEST_URI_1, &length, &error);
g_assert_cmpint (length, ==, 2);
g_strfreev (groups);
g_assert_no_error (error);
g_print ("\t=> check remove..."); if (g_test_verbose ())
g_print ("ok\n");
if (g_test_verbose ())
g_print ("\t=> check remove...");
g_assert (g_bookmark_file_remove_item (bookmark, TEST_URI_1, &error) == TRUE); g_assert (g_bookmark_file_remove_item (bookmark, TEST_URI_1, &error) == TRUE);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (g_bookmark_file_remove_item (bookmark, TEST_URI_1, &error) == FALSE); g_assert (g_bookmark_file_remove_item (bookmark, TEST_URI_1, &error) == FALSE);
g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND); g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_clear_error (&error); g_clear_error (&error);
g_print ("ok\n"); if (g_test_verbose ())
g_print ("ok\n");
return TRUE; return TRUE;
} }
static gint static void
test_file (const gchar *filename) test_file (gconstpointer d)
{ {
const gchar *filename = d;
GBookmarkFile *bookmark_file; GBookmarkFile *bookmark_file;
gboolean success; gboolean success;
gchar *data;
g_return_val_if_fail (filename != NULL, 1); GError *error;
g_print ("checking GBookmarkFile...\n");
bookmark_file = g_bookmark_file_new (); bookmark_file = g_bookmark_file_new ();
g_assert (bookmark_file != NULL); g_assert (bookmark_file != NULL);
success = test_load (bookmark_file, filename); success = test_load (bookmark_file, filename);
if (success) if (success)
{ {
success = test_query (bookmark_file); test_query (bookmark_file);
success = test_modify (bookmark_file); test_modify (bookmark_file);
error = NULL;
data = g_bookmark_file_to_data (bookmark_file, NULL, &error);
g_assert_no_error (error);
/* FIXME do some checks on data */
g_free (data);
} }
g_bookmark_file_free (bookmark_file); g_bookmark_file_free (bookmark_file);
g_print ("ok\n"); g_assert (success == (strstr (filename, "fail") == NULL));
return (success == TRUE ? 0 : 1);
} }
int int
main (int argc, main (int argc, char *argv[])
char *argv[])
{ {
GDir *dir;
GError *error;
const gchar *name;
gchar *path;
g_test_init (&argc, &argv, NULL);
if (argc > 1) if (argc > 1)
return test_file (argv[1]);
else
{ {
fprintf (stderr, "Usage: bookmarkfile-test <bookmarkfile>\n"); test_file (argv[1]);
return 0;
}
return 1; error = NULL;
dir = g_dir_open (SRCDIR "/bookmarks", 0, &error);
g_assert_no_error (error);
while ((name = g_dir_read_name (dir)) != NULL)
{
path = g_strdup_printf ("/bookmarks/parse/%s", name);
g_test_add_data_func (path, g_build_filename (SRCDIR, "bookmarks", name, NULL), test_file);
g_free (path);
} }
g_dir_close (dir);
return g_test_run ();
} }
...@@ -112,9 +112,9 @@ test_programs = \ ...@@ -112,9 +112,9 @@ test_programs = \
unicode-caseconv \ unicode-caseconv \
unicode-encoding unicode-encoding
test_scripts = run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh test_scripts = run-collate-tests.sh run-assert-msg-test.sh
test_script_support_programs = unicode-collate bookmarkfile-test test_script_support_programs = unicode-collate
check_PROGRAMS = $(test_programs) $(test_script_support_programs) check_PROGRAMS = $(test_programs) $(test_script_support_programs)
...@@ -130,7 +130,6 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd) ...@@ -130,7 +130,6 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
atomic_test_LDADD = $(progs_ldadd) atomic_test_LDADD = $(progs_ldadd)
bit_test_LDADD = $(progs_ldadd) bit_test_LDADD = $(progs_ldadd)
bookmarkfile_test_LDADD = $(progs_ldadd)
child_test_LDADD = $(thread_ldadd) child_test_LDADD = $(thread_ldadd)
completion_test_LDADD = $(progs_ldadd) completion_test_LDADD = $(progs_ldadd)
date_test_LDADD = $(progs_ldadd) date_test_LDADD = $(progs_ldadd)
...@@ -182,9 +181,6 @@ dist-hook: $(BUILT_EXTRA_DIST) ...@@ -182,9 +181,6 @@ dist-hook: $(BUILT_EXTRA_DIST)
mkdir $(distdir)/collate; \ mkdir $(distdir)/collate; \
for f in $(srcdir)/collate/* ; do \ for f in $(srcdir)/collate/* ; do \
if test -f $$f; then cp $$f $(distdir)/collate; fi; done if test -f $$f; then cp $$f $(distdir)/collate; fi; done
mkdir $(distdir)/bookmarks; \
for f in $(srcdir)/bookmarks/* ; do \
cp $$f $(distdir)/bookmarks; done
DISTCLEANFILES = \ DISTCLEANFILES = \
iochannel-test-outfile \ iochannel-test-outfile \
......
#! /bin/sh
fail ()
{
echo "Test failed: $*"
exit 1
}
echo_v ()
{
if [ "$verbose" = "1" ]; then
echo "$*"
fi
}
error_out=/dev/null
if [ "$1" = "-v" ]; then
verbose=1
error_out=/dev/stderr
fi
for I in ${srcdir:-.}/bookmarks/fail-*.xbel; do
echo_v "Parsing $I, should fail"
./bookmarkfile-test $I > /dev/null 2> $error_out && fail "failed to generate error on $I"
if test "$?" != "1"; then
fail "unexpected error on $I"
fi
done
for I in ${srcdir:-.}/bookmarks/valid-*.xbel; do
echo_v "Parsing $I, should succeed"
./bookmarkfile-test $I > /dev/null 2> $error_out || fail "failed on $I"
done
echo_v "All tests passed."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment