tracker r1941 - in branches/indexer-split: . tests/trackerd

[mr svn gnome org]

Author: mr
Date: Fri Jul 25 14:48:22 2008
New Revision: 1941
URL: http://svn.gnome.org/viewvc/tracker?rev=1941&view=rev

Log:
	* tests/trackerd/Makefile.am:
	* tests/trackerd/tracker-index-test.c:
	(test_created_file_in_the_mean_time): Fixed compilation errors.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/tests/trackerd/Makefile.am
   branches/indexer-split/tests/trackerd/tracker-index-test.c

Modified: branches/indexer-split/tests/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/tests/trackerd/Makefile.am	(original)
+++ branches/indexer-split/tests/trackerd/Makefile.am	Fri Jul 25 14:48:22 2008
@@ -43,13 +43,13 @@
 
 endif
 
-TEST_PROGS += tracker-indexer
+TEST_PROGS += tracker-index
 
-tracker_indexer_SOURCES = \
-	tracker-indexer-test.c \
-	tracker-indexer.c
+tracker_index_SOURCES = \
+	tracker-index-test.c \
+	tracker-index.c
 
-tracker_indexer_LDADD = \
+tracker_index_LDADD = \
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(GMODULE_LIBS) \
 	$(GTHREAD_LIBS) \

Modified: branches/indexer-split/tests/trackerd/tracker-index-test.c
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-index-test.c	(original)
+++ branches/indexer-split/tests/trackerd/tracker-index-test.c	Fri Jul 25 14:48:22 2008
@@ -3,7 +3,7 @@
 #include <tracker-test-helpers.h>
 #include <gio/gio.h>
 
-#include "tracker-indexer.h"
+#include "tracker-index.h"
 
 /* From libtracker-common/tracker-config.c */
 #define DEFAULT_MAX_BUCKET_COUNT		 524288
@@ -12,78 +12,79 @@
 static void
 test_get_suggestion ()
 {
-        TrackerIndexer *indexer;
-        gchar          *suggestion;
-        indexer = tracker_indexer_new ("./example.index", 
-                                       DEFAULT_MIN_BUCKET_COUNT,
-                                       DEFAULT_MAX_BUCKET_COUNT);
-        g_assert (!tracker_indexer_get_reload (indexer));
-
-        suggestion = tracker_indexer_get_suggestion (indexer, "Thiz", 9);
+        TrackerIndex *index;
+        gchar        *suggestion;
 
+        index = tracker_index_new ("./example.index", 
+                                     DEFAULT_MIN_BUCKET_COUNT,
+                                     DEFAULT_MAX_BUCKET_COUNT);
+        g_assert (!tracker_index_get_reload (index));
+        
+        suggestion = tracker_index_get_suggestion (index, "Thiz", 9);
+        
         g_assert (tracker_test_helpers_cmpstr_equal (suggestion, "this"));
-
+        
         g_free (suggestion);
-
-        g_object_unref (indexer);
+        
+        g_object_unref (index);
 }
 
 static void
 test_reloading ()
 {
-        TrackerIndexer   *indexer;
-        guint              count;
+        TrackerIndex     *index;
         TrackerIndexItem *hits;
+        guint             count;
 
-        indexer = tracker_indexer_new ("./example.index", 
-                                       DEFAULT_MIN_BUCKET_COUNT,
-                                       DEFAULT_MAX_BUCKET_COUNT);
-
-        tracker_indexer_set_reload (indexer, TRUE);
-        g_assert (tracker_indexer_get_reload (indexer)); /* Trivial check of get/set */
+        index = tracker_index_new ("./example.index", 
+                                   DEFAULT_MIN_BUCKET_COUNT,
+                                   DEFAULT_MAX_BUCKET_COUNT);
+        
+        tracker_index_set_reload (index, TRUE);
+        g_assert (tracker_index_get_reload (index)); /* Trivial check of get/set */
 
         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
-                hits = tracker_indexer_get_word_hits (indexer, "this", &count);
+                hits = tracker_index_get_word_hits (index, "this", &count);
                 g_free (hits);
         }
-        g_test_trap_assert_stderr ("*Reloading the index ./example.index*");
 
+        g_test_trap_assert_stderr ("*Reloading the index ./example.index*");
 }
 
 static void
 test_bad_index ()
 {
-        TrackerIndexer *indexer;
-        guint            count;
+        TrackerIndex *index;
+        guint         count;
 
-        indexer = tracker_indexer_new ("unknown-index",
-                                       DEFAULT_MIN_BUCKET_COUNT,
-                                       DEFAULT_MAX_BUCKET_COUNT);
+        index = tracker_index_new ("unknown-index",
+                                   DEFAULT_MIN_BUCKET_COUNT,
+                                   DEFAULT_MAX_BUCKET_COUNT);
 
         /* Reload true: it cannot open the index */
-        g_assert (tracker_indexer_get_reload (indexer));
+        g_assert (tracker_index_get_reload (index));
 
         /* Return NULL, the index cannot reload the file */
-        g_assert (!tracker_indexer_get_word_hits (indexer, "this", &count));
+        g_assert (!tracker_index_get_word_hits (index, "this", &count));
 
         /* Return NULL, the index cannot reload the file */
-        g_assert (!tracker_indexer_get_suggestion (indexer, "Thiz", 9));
+        g_assert (!tracker_index_get_suggestion (index, "Thiz", 9));
 
 }
 
 static void
 test_created_file_in_the_mean_time ()
 {
-        TrackerIndexer *indexer;
+        TrackerIndex *index;
         GFile          *good, *bad;
         guint           count;
 
-        indexer = tracker_indexer_new ("./unknown-index",
+        index = tracker_index_new ("./unknown-index",
                                        DEFAULT_MIN_BUCKET_COUNT,
                                        DEFAULT_MAX_BUCKET_COUNT);
 
         /* Reload true: it cannot open the index */
-        g_assert (tracker_indexer_get_reload (indexer));
+        g_assert (tracker_index_get_reload (index));
 
         good = g_file_new_for_path ("./example.index");
         bad = g_file_new_for_path ("./unknown-index");
@@ -91,10 +92,10 @@
         g_file_copy (good, bad, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL);
 
         /* Now the first operation reload the index */
-        g_assert (tracker_indexer_get_word_hits (indexer, "this", &count));
+        g_assert (tracker_index_get_word_hits (index, "this", &count));
         
         /* Reload false: It is already reloaded */
-        g_assert (!tracker_indexer_get_reload (indexer));
+        g_assert (!tracker_index_get_reload (index));
 
         g_file_delete (bad, NULL, NULL);
 }