tracker r1656 - in branches/xesam-support: . src/libtracker-common src/libtracker-db tests tests/trackerd

From: pvanhoof svn gnome org
To: svn-commits-list gnome org
Subject: tracker r1656 - in branches/xesam-support: . src/libtracker-common src/libtracker-db tests tests/trackerd
Date: Thu, 12 Jun 2008 12:38:46 +0000 (UTC)
Author: pvanhoof
Date: Thu Jun 12 12:38:46 2008
New Revision: 1656
URL: http://svn.gnome.org/viewvc/tracker?rev=1656&view=rev

Log:
2008-06-12  Philip Van Hoof  <pvanhoof gnome org>

	* svn merge -r 1644:1651 ../indexer-split

	* tests/libtracker-common:
	* tests/libtracker-common/tracker-ontology-test.c:
	* tests/libtracker-common/Makefile.am:
	* src/libtracker-db/tracker-db-manager.c:
	* src/libtracker-common/tracker-ontology.c:

	svn merge -r 1651:1655 ../indexer-split

	* tests/trackerd/tracker-xesam-test.c:
	* tests/trackerd/Makefile.am:
	* tests/Makefile.am:
	* configure.ac:

	Added unit test infrastructure for Xesam



Added:
   branches/xesam-support/tests/
      - copied from r1655, /branches/indexer-split/tests/
   branches/xesam-support/tests/trackerd/
   branches/xesam-support/tests/trackerd/Makefile.am
   branches/xesam-support/tests/trackerd/tracker-xesam-test.c
Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/Makefile.am
   branches/xesam-support/configure.ac
   branches/xesam-support/src/libtracker-common/tracker-ontology.c
   branches/xesam-support/src/libtracker-db/tracker-db-manager.c
   branches/xesam-support/tests/Makefile.am

Modified: branches/xesam-support/Makefile.am
==============================================================================
--- branches/xesam-support/Makefile.am	(original)
+++ branches/xesam-support/Makefile.am	Thu Jun 12 12:38:46 2008
@@ -1,5 +1,10 @@
 SUBDIRS = data src filters thumbnailers docs po python
 
+if HAVE_UNIT_TESTS
+include $(top_srcdir)/Makefile.decl
+SUBDIRS += tests
+endif
+
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = trackerd.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)

Modified: branches/xesam-support/configure.ac
==============================================================================
--- branches/xesam-support/configure.ac	(original)
+++ branches/xesam-support/configure.ac	Thu Jun 12 12:38:46 2008
@@ -238,13 +238,18 @@
    glib_pkgconfig=
 fi
 
+have_xesam_glib=no
 if test "x$enable_unit_tests" = "xyes"; then
    if test "x$have_unit_tests" != "xyes"; then
       AC_MSG_ERROR([Couldn't find unit test compatible glib.])
+   else
+	PKG_CHECK_MODULES(XESAM_GLIB, xesam-glib, [have_xesam_glib=yes], [have_xesam_glib=no])
    fi
 fi
 
 AM_CONDITIONAL(HAVE_UNIT_TESTS, test "x$have_unit_tests" = "xyes")
+AM_CONDITIONAL(HAVE_XESAM_GLIB, test "x$have_xesam_glib" = "xyes")
+
 
 ####################################################################
 # External QDBM check
@@ -728,6 +733,9 @@
 	src/tracker-preferences/Makefile
 	src/tracker-preferences/tracker-preferences.desktop.in	
 	src/trackerd/Makefile
+	tests/Makefile
+	tests/libtracker-common/Makefile
+	tests/trackerd/Makefile
 	src/xdgmime/Makefile
 	po/Makefile.in
 	python/Makefile

Modified: branches/xesam-support/src/libtracker-common/tracker-ontology.c
==============================================================================
--- branches/xesam-support/src/libtracker-common/tracker-ontology.c	(original)
+++ branches/xesam-support/src/libtracker-common/tracker-ontology.c	Thu Jun 12 12:38:46 2008
@@ -77,7 +77,7 @@
 	gpointer *data;
 	gchar    *str_lower;
 
-	str_lower = g_utf8_strdown (str, -1);
+	str_lower = g_utf8_collate_key (str, -1);
 	data = g_hash_table_lookup (hash_table, str_lower);
 	g_free (str_lower);
 
@@ -175,7 +175,7 @@
 	name = tracker_service_get_name (service);
 
 	g_hash_table_insert (service_table, 
-			     g_utf8_strdown (name, -1), 
+			     g_utf8_collate_key (name, -1), 
 			     g_object_ref (service));
 	g_hash_table_insert (service_id_table, 
 			     g_strdup_printf ("%d", id), 
@@ -544,7 +544,7 @@
 	g_return_if_fail (tracker_field_get_name (field) != NULL);
 	
 	g_hash_table_insert (metadata_table, 
-			     g_utf8_strdown (tracker_field_get_name (field), -1),
+			     g_utf8_collate_key (tracker_field_get_name (field), -1),
 			     field);
 }
 

Modified: branches/xesam-support/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/xesam-support/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/xesam-support/src/libtracker-db/tracker-db-manager.c	Thu Jun 12 12:38:46 2008
@@ -79,7 +79,7 @@
           TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
           "file-meta.db",
-          "file-meta",
+	  "file-meta",
           NULL,
           512,                          
           TRACKER_DB_PAGE_SIZE_DEFAULT, 
@@ -88,7 +88,7 @@
           TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
           "file-contents.db",
-          "file-contents",
+	  "file-contents",
           NULL,
           1024,
           TRACKER_DB_PAGE_SIZE_DEFAULT,
@@ -97,7 +97,7 @@
           TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
           "email-meta.db",
-          "email-meta",
+	  "email-meta",
           NULL,
           512, 
           TRACKER_DB_PAGE_SIZE_DEFAULT,
@@ -106,7 +106,7 @@
           TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
           "email-contents.db",
-          "email-contents",
+	  "email-contents",
           NULL,
           512,
           TRACKER_DB_PAGE_SIZE_DEFAULT,
@@ -115,7 +115,7 @@
           TRACKER_DB_LOCATION_DATA_DIR,
 	  NULL,
           "xesam.db",
-          "xesam",
+	  "xesam",
           NULL,
           512,
           TRACKER_DB_PAGE_SIZE_DEFAULT,
@@ -134,6 +134,7 @@
 static gchar        *services_dir;
 static gchar        *sql_dir;
 static gpointer      db_type_enum_class_pointer;
+static TrackerDBInterface *attach_interface = NULL;
 
 static const gchar * 
 location_to_directory (TrackerDBLocation  location,
@@ -1720,11 +1721,22 @@
 		   path,
 		   db_type_to_string (type));
 
-	iface = tracker_db_interface_sqlite_new (path);
-	tracker_db_interface_set_procedure_table (iface, prepared_queries);
+	if (attach_all && attach_interface) {
+		iface = g_object_ref (attach_interface);
+	} else {
+		iface = tracker_db_interface_sqlite_new (path);
+		tracker_db_interface_set_procedure_table (iface, prepared_queries);
+
+		if (attach_all) {
+			attach_interface = g_object_ref (iface);
+		}
+
+		db_exec_no_reply (iface, "ANALYZE");
+	}
 
 	/* FIXME: Shouldn't we do this for common/cache dbs too? */
-	if (type != TRACKER_DB_COMMON &&
+	if (!attach_all &&
+	    type != TRACKER_DB_COMMON &&
 	    type != TRACKER_DB_CACHE) {
 		db_set_params (iface,
 			       dbs[type].cache_size,
@@ -1732,8 +1744,6 @@
 			       dbs[type].add_functions);
 	}
 
-	db_exec_no_reply (iface, "ANALYZE");
-
 	if (attach_all) {
 		g_message ("  Attaching to current DB connection");
 		db_exec_no_reply (iface, 
@@ -2283,6 +2293,10 @@
 	g_type_class_unref (db_type_enum_class_pointer);
 	db_type_enum_class_pointer = NULL;
 
+	if (attach_interface) {
+		g_object_unref (attach_interface);
+	}
+
         initialized = FALSE;
 }
 

Modified: branches/xesam-support/tests/Makefile.am
==============================================================================
--- /branches/indexer-split/tests/Makefile.am	(original)
+++ branches/xesam-support/tests/Makefile.am	Thu Jun 12 12:38:46 2008
@@ -1,3 +1,3 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = libtracker-common
\ No newline at end of file
+SUBDIRS = libtracker-common trackerd

Added: branches/xesam-support/tests/trackerd/Makefile.am
==============================================================================
--- (empty file)
+++ branches/xesam-support/tests/trackerd/Makefile.am	Thu Jun 12 12:38:46 2008
@@ -0,0 +1,32 @@
+include $(top_srcdir)/Makefile.decl
+
+noinst_PROGRAMS = $(TEST_PROGS)
+
+if HAVE_XESAM_GLIB
+TEST_PROGS += tracker-xesam
+else
+TEST_PROGS =
+endif
+
+INCLUDES = 			\
+	-g 			\
+	-DG_LOG_DOMAIN=\"Tracker\"					\
+	-I$(top_srcdir)/src						\
+	$(GMODULE_CFLAGS)						\
+	$(GTHREAD_CFLAGS)						\
+	$(GLIB2_CFLAGS)
+
+if HAVE_XESAM_GLIB
+INCLUDES += $(XESAM_GLIB_CFLAGS)
+
+tracker_xesam_SOURCES = \
+	tracker-xesam-test.c
+
+tracker_xesam_LDADD =							\
+	$(XESAM_GLIB_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(GMODULE_LIBS)							\
+	$(GTHREAD_LIBS)							\
+	$(GLIB2_LIBS)							
+endif
+

Added: branches/xesam-support/tests/trackerd/tracker-xesam-test.c
==============================================================================
--- (empty file)
+++ branches/xesam-support/tests/trackerd/tracker-xesam-test.c	Thu Jun 12 12:38:46 2008
@@ -0,0 +1,19 @@
+#include <glib.h>
+#include <glib/gtestutils.h>
+
+
+int
+main (int argc, char **argv) {
+
+        int result;
+
+	g_type_init ();
+	g_test_init (&argc, &argv, NULL);
+
+//	g_test_add_func ("/trackerd/tracker-services/get_id_for_service",  
+//                       test_get_id_for_service);
+
+        result = g_test_run ();
+        
+        return result;
+}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]