tracker r2031 - in branches/indexer-split: . tests/libtracker-db

[ifrade svn gnome org]

Author: ifrade
Date: Thu Aug  7 14:13:12 2008
New Revision: 2031
URL: http://svn.gnome.org/viewvc/tracker?rev=2031&view=rev

Log:
Fixing db unit tests

Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c
   branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c
   branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c

Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c	(original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c	Thu Aug  7 14:13:12 2008
@@ -81,22 +81,6 @@
 }
 
 static void
-test_always_same_iface_no_reindex () 
-{
-        TrackerDBInterface *common, *xesam;
-        
-        ensure_db_manager_is_reindex (FALSE);
- 
-        common = tracker_db_manager_get_db_interface (TRACKER_DB_COMMON);
-        xesam = tracker_db_manager_get_db_interface (TRACKER_DB_XESAM);
-
-        /* The pointer must be the same */
-        g_assert (common == xesam);
-        
-
-}
-
-static void
 test_creation_common_db_no_reindex () 
 {
         ensure_db_manager_is_reindex (FALSE);
@@ -130,14 +114,14 @@
 test_creation_file_meta_db_no_reindex ()
 {
         ensure_db_manager_is_reindex (FALSE);
-        test_assert_tables_in_db (TRACKER_DB_COMMON, "SELECT * FROM 'file-meta'.ServiceMetaData");
+        test_assert_tables_in_db (TRACKER_DB_FILE_METADATA, "SELECT * FROM ServiceMetaData");
 }
 
 static void
 test_creation_file_contents_db_no_reindex ()
 {
         ensure_db_manager_is_reindex (FALSE);
-        test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM 'file-contents'.ServiceContents");
+        test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM ServiceContents");
 }
 
 
@@ -152,9 +136,6 @@
 
 
         // Tests with attach and no-reindex
-        g_test_add_func ("/libtrakcer-db/tracker-db-manager/attach/no-reindex/equal_iface",
-                         test_always_same_iface_no_reindex);
-
         g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/common_db_tables",
                         test_creation_common_db_no_reindex);
 

Modified: branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c	(original)
+++ branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c	Thu Aug  7 14:13:12 2008
@@ -117,13 +117,13 @@
 
         /* Init */
 
-        g_test_add_func ("/trackerd/tracker-indexer/get_suggestion",
+        g_test_add_func ("/libtracker-db/tracker-index/get_suggestion",
                          test_get_suggestion );
-        g_test_add_func ("/trackerd/tracker-indexer/reloading",
+        g_test_add_func ("/libtracker-db/tracker-index/reloading",
                          test_reloading );
-        g_test_add_func ("/trackerd/tracker-indexer/bad_index",
+        g_test_add_func ("/libtracker-db/tracker-index/bad_index",
                          test_bad_index );
-        g_test_add_func ("/trackerd/tracker-indexer/created_file_in_the_mean_time",
+        g_test_add_func ("/libtracker-db/tracker-index/created_file_in_the_mean_time",
                          test_created_file_in_the_mean_time);
         result = g_test_run ();
         

Modified: branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c	(original)
+++ branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c	Thu Aug  7 14:13:12 2008
@@ -342,25 +342,25 @@
 
 	g_test_init (&argc, &argv, NULL);
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-index/add_word",
+        g_test_add_func ("/libtracker-db/tracker-index/add_word",
                          test_add_one_word);
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-index/add_n_words",
+        g_test_add_func ("/libtracker-db/tracker-index/add_n_words",
                          test_add_n_words);
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-index/add_word_n_times",
+        g_test_add_func ("/libtracker-db/tracker-index/add_word_n_times",
                          test_add_word_n_times);
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-index/add_word_multiple_occurrences",
+        g_test_add_func ("/libtracker-db/tracker-index/add_word_multiple_occurrences",
                          test_add_word_multiple_occurrences);
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-index/add_with_flush",
+        g_test_add_func ("/libtracker-db/tracker-index/add_with_flush",
                          test_add_with_flushs);
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-index/remove_document",
+        g_test_add_func ("/libtracker-db/tracker-index/remove_document",
                          test_remove_document);
 
-        g_test_add_func ("/tracker/tracker-indexer/tracker-index/remove_before_flush",
+        g_test_add_func ("/libtracker-db/tracker-index/remove_before_flush",
                          test_remove_before_flush);
 
         result = g_test_run ();