Move bookmarkfile tests to the test framework

23 files changed, 2 insertions, 605 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d5c102da..5eed30a0a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -112,9 +112,9 @@ test_programs =					\
 	unicode-caseconv			\
 	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)
 
@@ -130,7 +130,6 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 
 atomic_test_LDADD = $(progs_ldadd)
 bit_test_LDADD = $(progs_ldadd)
-bookmarkfile_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
 date_test_LDADD = $(progs_ldadd)
@@ -182,9 +181,6 @@ dist-hook: $(BUILT_EXTRA_DIST)
 	mkdir $(distdir)/collate;          			\
 	for f in $(srcdir)/collate/* ; do  			\
           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 =		\
 	iochannel-test-outfile 	\
diff --git a/tests/bookmarkfile-test.c b/tests/bookmarkfile-test.c
deleted file mode 100644
index 40e9a0581..000000000
--- a/tests/bookmarkfile-test.c
+++ /dev/null
@@ -1,188 +0,0 @@
-#undef G_DISABLE_ASSERT
-
-#include <glib.h>
-#include <time.h>
-#include <locale.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define TEST_URI_0 	"file:///abc/defgh/ijklmnopqrstuvwxyz"
-#define TEST_URI_1 	"file:///test/uri/1"
-#define TEST_URI_2 	"file:///test/uri/2"
-
-#define TEST_MIME 	"text/plain"
-
-#define TEST_APP_NAME 	"bookmarkfile-test"
-#define TEST_APP_EXEC 	"bookmarkfile-test %f"
-
-static gboolean
-test_load (GBookmarkFile *bookmark,
-           const gchar   *filename)
-{
-  GError *error = NULL;
-  gboolean res;
-  
-  res = g_bookmark_file_load_from_file (bookmark, filename, &error);
-  if (error)
-    {
-      g_print ("Load error: %s\n", error->message);
-      g_error_free (error);
-    }
-
-  return res;
-}
-
-static gboolean
-test_query (GBookmarkFile *bookmark)
-{
-  gint size;
-  gchar **uris;
-  gsize uris_len, i;
-  gboolean res = TRUE;
-
-  size = g_bookmark_file_get_size (bookmark);
-  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;
-    }
-
-  for (i = 0; i < uris_len; i++)
-    if (!g_bookmark_file_has_item (bookmark, uris[i]))
-      {
-        g_print ("URI/bookmark mismatch: bookmark for '%s' does not exist\n", uris[i]);
-
-	res = FALSE;
-      }
-
-  g_strfreev (uris);
-  
-  return res;
-}
-
-static gboolean
-test_modify (GBookmarkFile *bookmark)
-{
-  gchar *text;
-  guint count;
-  time_t stamp;
-  GError *error = NULL;
-  
-  g_print ("\t=> check global title/description...");
-  g_bookmark_file_set_title (bookmark, NULL, "a file");
-  g_bookmark_file_set_description (bookmark, NULL, "a bookmark file");
-  
-  text = g_bookmark_file_get_title (bookmark, NULL, &error);
-  g_assert_no_error (error);
-  g_assert_cmpstr (text, ==, "a file");
-  g_free (text);
-
-  text = g_bookmark_file_get_description (bookmark, NULL, &error);
-  g_assert_no_error (error);
-  g_assert_cmpstr (text, ==, "a bookmark file");
-  g_free (text);
-  g_print ("ok\n");
-
-  g_print ("\t=> check bookmark title/description...");
-  g_bookmark_file_set_title (bookmark, TEST_URI_0, "a title");
-  g_bookmark_file_set_description (bookmark, TEST_URI_0, "a description");
-
-  text = g_bookmark_file_get_title (bookmark, TEST_URI_0, &error);
-  g_assert_no_error (error);
-  g_assert_cmpstr (text, ==, "a title");
-  g_free (text);
-  g_print ("ok\n");
-
-  g_print ("\t=> check non existing bookmark...");
-  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_clear_error (&error);
-  g_print ("ok\n");
-  
-  g_print ("\t=> check application...");
-  g_bookmark_file_set_mime_type (bookmark, TEST_URI_0, TEST_MIME);
-  g_bookmark_file_add_application (bookmark, TEST_URI_0,
-				   TEST_APP_NAME,
-				   TEST_APP_EXEC);
-  g_assert (g_bookmark_file_has_application (bookmark, TEST_URI_0, TEST_APP_NAME, NULL) == TRUE);
-  g_bookmark_file_get_app_info (bookmark, TEST_URI_0, TEST_APP_NAME,
-		  		&text,
-				&count,
-				&stamp,
-				&error);
-  g_assert_no_error (error);
-  g_assert (count == 1);
-  g_assert (stamp == g_bookmark_file_get_modified (bookmark, TEST_URI_0, NULL));
-  g_free (text);
-  
-  g_bookmark_file_get_app_info (bookmark, TEST_URI_0, "fail",
-		  		&text,
-				&count,
-				&stamp,
-				&error);
-  g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED);
-  g_clear_error (&error);
-  g_print ("ok\n"); 
-
-  g_print ("\t=> check groups...");
-  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, "Fail", NULL) == FALSE);
-  g_print ("ok\n");
-
-  g_print ("\t=> check remove...");
-  g_assert (g_bookmark_file_remove_item (bookmark, TEST_URI_1, &error) == TRUE);
-  g_assert_no_error (error);
-  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_clear_error (&error);
-  g_print ("ok\n");
-  
-  return TRUE;
-}
-
-static gint
-test_file (const gchar *filename)
-{
-  GBookmarkFile *bookmark_file;
-  gboolean success;
-
-  g_return_val_if_fail (filename != NULL, 1);
-
-  g_print ("checking GBookmarkFile...\n");
-
-  bookmark_file = g_bookmark_file_new ();
-  g_assert (bookmark_file != NULL);
-
-  success = test_load (bookmark_file, filename);
-  
-  if (success)
-    {
-      success = test_query (bookmark_file);
-      success = test_modify (bookmark_file);
-    }
-
-  g_bookmark_file_free (bookmark_file);
-
-  g_print ("ok\n");
-
-  return (success == TRUE ? 0 : 1);
-}
-
-int
-main (int   argc,
-      char *argv[])
-{
-  if (argc > 1)
-    return test_file (argv[1]);
-  else
-    {
-      fprintf (stderr, "Usage: bookmarkfile-test <bookmarkfile>\n");
-
-      return 1;
-    }
-}
diff --git a/tests/bookmarks/fail-01.xbel b/tests/bookmarks/fail-01.xbel
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/bookmarks/fail-01.xbel
+++ /dev/null
diff --git a/tests/bookmarks/fail-02.xbel b/tests/bookmarks/fail-02.xbel
deleted file mode 100644
index 39f0094b3..000000000
--- a/tests/bookmarks/fail-02.xbel
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fail/> 
diff --git a/tests/bookmarks/fail-03.xbel b/tests/bookmarks/fail-03.xbel
deleted file mode 100644
index 563dd5408..000000000
--- a/tests/bookmarks/fail-03.xbel
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark>
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-04.xbel b/tests/bookmarks/fail-04.xbel
deleted file mode 100644
index 86f1e9012..000000000
--- a/tests/bookmarks/fail-04.xbel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" fail="attr">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-05.xbel b/tests/bookmarks/fail-05.xbel
deleted file mode 100644
index 355f172de..000000000
--- a/tests/bookmarks/fail-05.xbel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file & containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-06.xbel b/tests/bookmarks/fail-06.xbel
deleted file mode 100644
index d1e288bd0..000000000
--- a/tests/bookmarks/fail-06.xbel
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-07.xbel b/tests/bookmarks/fail-07.xbel
deleted file mode 100644
index 8e24c64cb..000000000
--- a/tests/bookmarks/fail-07.xbel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata>
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-08.xbel b/tests/bookmarks/fail-08.xbel
deleted file mode 100644
index d26f75276..000000000
--- a/tests/bookmarks/fail-08.xbel
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <bookmark:fail/>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-09.xbel b/tests/bookmarks/fail-09.xbel
deleted file mode 100644
index 5e1ce649a..000000000
--- a/tests/bookmarks/fail-09.xbel
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <bookmark:applications>
-          <bookmark:application/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-10.xbel b/tests/bookmarks/fail-10.xbel
deleted file mode 100644
index f4eef12c6..000000000
--- a/tests/bookmarks/fail-10.xbel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-11.xbel b/tests/bookmarks/fail-11.xbel
deleted file mode 100644
index 520693be0..000000000
--- a/tests/bookmarks/fail-11.xbel
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <title>&</title>
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-12.xbel b/tests/bookmarks/fail-12.xbel
deleted file mode 100644
index 9ba280e89..000000000
--- a/tests/bookmarks/fail-12.xbel
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-	<bookmark:icon type="image/png"/>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-13.xbel b/tests/bookmarks/fail-13.xbel
deleted file mode 100644
index cdd1affcb..000000000
--- a/tests/bookmarks/fail-13.xbel
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-	<fail/>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-14.xbel b/tests/bookmarks/fail-14.xbel
deleted file mode 100644
index 2161632f0..000000000
--- a/tests/bookmarks/fail-14.xbel
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-	<bookmark:groups>
-	  <fail>Test</fail>
-	</bookmark:groups>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-15.xbel b/tests/bookmarks/fail-15.xbel
deleted file mode 100644
index 9a2ac1299..000000000
--- a/tests/bookmarks/fail-15.xbel
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-	<bookmark:groups>
-	  <bookmark:group>Test</bookmark:group>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-16.xbel b/tests/bookmarks/fail-16.xbel
deleted file mode 100644
index 18f55b321..000000000
--- a/tests/bookmarks/fail-16.xbel
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-	<bookmark:groups>
-	  <bookmark:group>Test</group>
-	</bookmark:groups>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/fail-17.xbel b/tests/bookmarks/fail-17.xbel
deleted file mode 100644
index 9ad97bd60..000000000
--- a/tests/bookmarks/fail-17.xbel
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-      <invalid/>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/valid-01.xbel b/tests/bookmarks/valid-01.xbel
deleted file mode 100644
index 6ab98ba35..000000000
--- a/tests/bookmarks/valid-01.xbel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/valid-02.xbel b/tests/bookmarks/valid-02.xbel
deleted file mode 100644
index 85a84a077..000000000
--- a/tests/bookmarks/valid-02.xbel
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xbel version="1.0">
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime-type type="application/postscript"/>
-        <applications>
-          <application name="populate-recent" exec="populate-recent --info %u" timestamp="1128121528" count="1"/>
-        </applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/bookmarks/valid-03.xbel b/tests/bookmarks/valid-03.xbel
deleted file mode 100644
index 32f431dff..000000000
--- a/tests/bookmarks/valid-03.xbel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xbel
-  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
-         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0"
-      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
->
-  <title>Singleton</title>
-  <desc>A file containing a single bookmark element</desc>
-  <bookmark href="file:///home/zefram/Documents/milan-stuttgart.ps" added="20050930T23:05:28Z" modified="20050930T23:05:28Z" visited="20050930T23:05:28Z">
-    <info>
-      <metadata owner="http://freedesktop.org">
-        <mime:mime-type type="application/postscript"/>
-        <bookmark:applications>
-          <bookmark:application name="populate-recent" exec="populate-recent --info %u" modified="2005-09-30T23:05:28Z" count="1"/>
-        </bookmark:applications>
-      </metadata>
-    </info>
-  </bookmark>
-</xbel>
diff --git a/tests/run-bookmark-test.sh b/tests/run-bookmark-test.sh
deleted file mode 100755
index 3bed44d22..000000000
--- a/tests/run-bookmark-test.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /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."