Merge lp:~rainct/zeitgeist/fts-current-uri into lp:~zeitgeist/zeitgeist/bluebird

[Siegfried Gevatter]

[Siegfried Gevatter (rainct)]

Outstanding issue: Should CompileEventFilterQuery also be changed to use current_uri instead (or in addition to?) uri?

[Michal Hruby (mhr3)]

The boolean terms we're adding to the document should also use current_uri. As for CompileEventFilterQuery, since the indexer no longer cares about logged uris, there's basically no distinction between them - therefore it should look at uri field and if that is unset try current_uri.

review: Needs Fixing

[lp:~rainct/zeitgeist/fts-current-uri]

429. By Siegfried Gevatter on 2012-03-16

FTS++: Change to current_uri in some more places. Add random test cases.

430. By Siegfried Gevatter on 2012-03-16

FTS++: some more test cases and add a couple utility functions

431. By Siegfried Gevatter on 2012-03-16

FTS++: more test stuff (add more asserts, extend {Most,Least}Recent tests,
       introduce new helper function)

[Michal Hruby (mhr3)]

Awesome!

review: Approve

=== modified file 'extensions/fts++/indexer.cpp'
--- extensions/fts++/indexer.cpp	2012-03-14 12:31:51 +0000
+++ extensions/fts++/indexer.cpp	2012-03-16 18:46:19 +0000
@@ -262,7 +262,10 @@
     for (unsigned j = 0; j < subjects->len; j++)
     {
       ZeitgeistSubject *subject = (ZeitgeistSubject*) g_ptr_array_index (subjects, j);
+      // For backwards compatibility, we still check URI
       val = zeitgeist_subject_get_uri (subject);
+      if (!val || val[0] == '\0')
+          val = zeitgeist_subject_get_current_uri (subject);
       if (val && val[0] != '\0')
         tmpl.push_back ("zgsu:" + StringUtils::MangleUri (val));
 
@@ -344,7 +347,7 @@
   for (unsigned j = 0; j < subjects->len; j++)
   {
     ZeitgeistSubject *subject = (ZeitgeistSubject*) g_ptr_array_index (subjects, j);
-    val = zeitgeist_subject_get_uri (subject);
+    val = zeitgeist_subject_get_current_uri (subject);
     if (val && val[0] != '\0')
       doc.add_boolean_term (StringUtils::Truncate (FILTER_PREFIX_SUBJECT_URI + StringUtils::MangleUri (val)));
 
@@ -928,12 +931,13 @@
       if (subjects == NULL) continue;
       for (unsigned j = 0; j < subjects->len; j++)
       {
-        const gchar *subj_uri = zeitgeist_subject_get_uri ((ZeitgeistSubject*) subjects->pdata[j]);
+        const gchar *subj_uri = zeitgeist_subject_get_current_uri (
+                (ZeitgeistSubject*) subjects->pdata[j]);
         if (subj_uri == NULL) continue;
         remapper[subj_uri] = event_id;
         ZeitgeistEvent *event = zeitgeist_event_new ();
         ZeitgeistSubject *subject = zeitgeist_subject_new ();
-        zeitgeist_subject_set_uri (subject, subj_uri);
+        zeitgeist_subject_set_current_uri (subject, subj_uri);
         zeitgeist_event_add_subject (event, subject); // FIXME: leaks?
         g_ptr_array_add (event_templates, event);
       }
@@ -976,7 +980,8 @@
       if (subjects == NULL) continue;
       for (unsigned j = 0; j < subjects->len; j++)
       {
-        const gchar *subj_uri = zeitgeist_subject_get_uri ((ZeitgeistSubject*) subjects->pdata[j]);
+        const gchar *subj_uri = zeitgeist_subject_get_current_uri (
+                (ZeitgeistSubject*) subjects->pdata[j]);
         if (subj_uri == NULL) continue;
         relevancy_map[event_id] = relevancy_map[remapper[subj_uri]];
       }
@@ -1259,7 +1264,6 @@
 {
   try
   {
-    // FIXME: we need to special case MOVE_EVENTs
     const gchar *val;
     guint event_id = zeitgeist_event_get_id (event);
     g_return_if_fail (event_id > 0);
@@ -1288,7 +1292,13 @@
       ZeitgeistSubject *subject;
       subject = (ZeitgeistSubject*) g_ptr_array_index (subjects, i);
 
-      val = zeitgeist_subject_get_uri (subject);
+      // We use current_uri (vs. uri) where since we care about real stuff,
+      // not whatever happened some time ago.
+      //
+      // This will most likely still be the same as URI (unless something
+      // triggers a reindexation of the DB), but at least MOVE_EVENTS
+      // will have the updated URI.
+      val = zeitgeist_subject_get_current_uri (subject);
       if (val == NULL || val[0] == '\0') continue;
 
       std::string uri(val);
 
=== modified file 'extensions/fts++/test/test-indexer.cpp'
--- extensions/fts++/test/test-indexer.cpp	2012-03-14 15:47:20 +0000
+++ extensions/fts++/test/test-indexer.cpp	2012-03-16 18:46:19 +0000
@@ -62,6 +62,30 @@
   g_object_unref (fix->db);
 }
 
+static void
+assert_nth_result_has_id (GPtrArray* results, guint n, guint32 event_id)
+{
+  g_assert_cmpuint (n, <, results->len);
+  ZeitgeistEvent *event = (ZeitgeistEvent*) results->pdata[n];
+  g_assert (event);
+  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
+}
+
+// This function only supports events with a single subject,
+// since that's enough for the tests in this file.
+static void
+assert_nth_result_has_text (GPtrArray* results, int n, const char *text)
+{
+  g_assert_cmpuint (n, <, results->len);
+  ZeitgeistEvent *event = (ZeitgeistEvent*) results->pdata[n];
+  g_assert (event);
+  g_assert_cmpint (zeitgeist_event_num_subjects (event), ==, 1);
+  ZeitgeistSubject *subject = (ZeitgeistSubject*)
+    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
+  g_assert (subject);
+  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, text);
+}
+
 static ZeitgeistEvent* create_test_event1 (void)
 {
   ZeitgeistEvent *event = zeitgeist_event_new ();
@@ -131,7 +155,7 @@
   zeitgeist_subject_set_interpretation (subject, ZEITGEIST_NFO_PRESENTATION);
   zeitgeist_subject_set_manifestation (subject, ZEITGEIST_NFO_FILE_DATA_OBJECT);
   zeitgeist_subject_set_uri (subject, "file:///home/username/Documents/my_fabulous_presentation.pdf");
-  zeitgeist_subject_set_text (subject, NULL);
+  zeitgeist_subject_set_text (subject, "test texts");
   zeitgeist_subject_set_mimetype (subject, "application/pdf");
 
   zeitgeist_event_set_interpretation (event, ZEITGEIST_ZG_MODIFY_EVENT);
@@ -191,7 +215,7 @@
   zeitgeist_subject_set_interpretation (subject, ZEITGEIST_NFO_PRESENTATION);
   zeitgeist_subject_set_manifestation (subject, ZEITGEIST_NFO_FILE_DATA_OBJECT);
   zeitgeist_subject_set_uri (subject, "file:///home/username/directory-with-dashes/and.dot/%C4%8C%20some-intl/CamelCasePresentation.pdf");
-  zeitgeist_subject_set_text (subject, NULL);
+  zeitgeist_subject_set_text (subject, "some more texts");
   zeitgeist_subject_set_mimetype (subject, "application/pdf");
 
   zeitgeist_event_set_interpretation (event, ZEITGEIST_ZG_MODIFY_EVENT);
@@ -203,6 +227,27 @@
   return event;
 }
 
+static ZeitgeistEvent* create_test_event8 (void)
+{
+  ZeitgeistEvent *event = zeitgeist_event_new ();
+  ZeitgeistSubject *subject = zeitgeist_subject_new ();
+  
+  zeitgeist_subject_set_interpretation (subject, ZEITGEIST_NFO_PRESENTATION);
+  zeitgeist_subject_set_manifestation (subject, ZEITGEIST_NFO_FILE_DATA_OBJECT);
+  zeitgeist_subject_set_uri (subject, "file:///home/username/Documents/my_fabulous_presentation.pdf");
+  zeitgeist_subject_set_current_uri (subject, "file:///home/username/Awesome.pdf");
+  zeitgeist_subject_set_text (subject, "some more textt about a presentation or something");
+  zeitgeist_subject_set_mimetype (subject, "application/pdf");
+
+  zeitgeist_event_set_interpretation (event, ZEITGEIST_ZG_MOVE_EVENT);
+  zeitgeist_event_set_manifestation (event, ZEITGEIST_ZG_USER_ACTIVITY);
+  zeitgeist_event_set_actor (event, "application://nautilus.desktop");
+  zeitgeist_event_add_subject (event, subject);
+
+  g_object_unref (subject);
+  return event;
+}
+
 // Steals the event, ref it if you want to keep it
 static guint
 index_event (Fixture *fix, ZeitgeistEvent *event)
@@ -236,6 +281,42 @@
   return event_id;
 }
 
+static GPtrArray*
+search_simple (Fixture *fix, const char *text, GPtrArray *templates,
+        ZeitgeistResultType result_type, guint *matches)
+{
+  if (!templates) templates = g_ptr_array_new ();
+  return zeitgeist_indexer_search (fix->indexer,
+                            text,
+                            zeitgeist_time_range_new_anytime (),
+                            templates,
+                            0, // offset
+                            10, // count
+                            result_type,
+                            matches,
+                            NULL);
+}
+
+static GPtrArray*
+search_with_relevancies_simple (Fixture *fix, const char *text,
+        GPtrArray *templates, ZeitgeistResultType result_type,
+        gdouble **relevancies, gint *relevancies_size, guint *matches)
+{
+  if (!templates) templates = g_ptr_array_new ();
+  return zeitgeist_indexer_search_with_relevancies (fix->indexer,
+                            text,
+                            zeitgeist_time_range_new_anytime (),
+                            templates,
+                            ZEITGEIST_STORAGE_STATE_ANY,
+                            0, // offset
+                            10, // count
+                            result_type,
+                            relevancies,
+                            relevancies_size,
+                            matches,
+                            NULL);
+}
+
 static void
 test_simple_query (Fixture *fix, gconstpointer data)
 {
@@ -249,33 +330,44 @@
   index_event (fix, create_test_event3 ());
   index_event (fix, create_test_event4 ());
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "text",
-                              zeitgeist_time_range_new_anytime (),
-                              g_ptr_array_new (),
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "text", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
-
-  ZeitgeistSubject *subject = (ZeitgeistSubject*)
-    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
-  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, "text");
+  assert_nth_result_has_id (results, 0, event_id);
+  assert_nth_result_has_text (results, 0, "text");
+}
+
+static void
+test_simple_query_empty_database (Fixture *fix, gconstpointer data)
+{
+  guint matches;
+
+  GPtrArray *results = search_simple (fix,
+          "NothingWillEverMatchThisMwhahahaha", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
+
+  g_assert_cmpuint (matches, ==, 0);
+  g_assert_cmpuint (results->len, ==, 0);
+}
+
+static void
+test_simple_query_no_results (Fixture *fix, gconstpointer data)
+{
+  // add test events to DBs
+  index_event (fix, create_test_event1 ());
+  index_event (fix, create_test_event2 ());
+  index_event (fix, create_test_event3 ());
+  index_event (fix, create_test_event4 ());
+
+  test_simple_query_empty_database (fix, data);
 }
 
 static void
 test_simple_with_filter (Fixture *fix, gconstpointer data)
 {
   guint matches;
-  guint event_id;
   ZeitgeistEvent* event;
 
   // add test events to DBs
@@ -287,16 +379,8 @@
   zeitgeist_event_set_interpretation (event, ZEITGEIST_NFO_DOCUMENT);
   g_ptr_array_add (filters, event); // steals ref
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "text",
-                              zeitgeist_time_range_new_anytime (),
-                              filters,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "text", filters,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (results->len, ==, 0);
   g_assert_cmpuint (matches, ==, 0);
@@ -321,38 +405,24 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (filters, event); // steals ref
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "text",
-                              zeitgeist_time_range_new_anytime (),
-                              filters,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "text", filters,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
-
-  subject = (ZeitgeistSubject*)
-    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
-  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, "text");
+  assert_nth_result_has_id (results, 0, event_id);
+  assert_nth_result_has_text (results, 0, "text");
 }
 
 static void
 test_simple_negation (Fixture *fix, gconstpointer data)
 {
   guint matches;
-  guint event_id;
   ZeitgeistEvent* event;
   ZeitgeistSubject *subject;
 
   // add test events to DBs
-  event_id = index_event (fix, create_test_event1 ());
+  index_event (fix, create_test_event1 ());
   index_event (fix, create_test_event2 ());
 
   GPtrArray *filters = g_ptr_array_new_with_free_func (g_object_unref);
@@ -362,16 +432,8 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (filters, event); // steals ref
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "text",
-                              zeitgeist_time_range_new_anytime (),
-                              filters,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "text", filters,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, ==, 0);
   g_assert_cmpuint (results->len, ==, 0);
@@ -381,12 +443,11 @@
 test_simple_noexpand (Fixture *fix, gconstpointer data)
 {
   guint matches;
-  guint event_id;
   ZeitgeistEvent* event;
   ZeitgeistSubject *subject;
 
   // add test events to DBs
-  event_id = index_event (fix, create_test_event1 ());
+  index_event (fix, create_test_event1 ());
   index_event (fix, create_test_event2 ());
 
   GPtrArray *filters = g_ptr_array_new_with_free_func (g_object_unref);
@@ -396,16 +457,8 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (filters, event); // steals ref
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "text",
-                              zeitgeist_time_range_new_anytime (),
-                              filters,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "text", filters,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, ==, 0);
   g_assert_cmpuint (results->len, ==, 0);
@@ -430,26 +483,13 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (filters, event); // steals ref
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "text",
-                              zeitgeist_time_range_new_anytime (),
-                              filters,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "text", filters,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
-
-  subject = (ZeitgeistSubject*)
-    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
-  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, "text");
+  assert_nth_result_has_id (results, 0, event_id);
+  assert_nth_result_has_text (results, 0, "text");
 }
 
 static void
@@ -471,26 +511,14 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (filters, event); // steals ref
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "love",
-                              zeitgeist_time_range_new_anytime (),
-                              filters,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "love", filters,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
-
-  subject = (ZeitgeistSubject*)
-    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
-  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, "Example.com Wiki Page. Kanji is awesome 漢字");
+  assert_nth_result_has_id (results, 0, event_id);
+  assert_nth_result_has_text (results, 0,
+          "Example.com Wiki Page. Kanji is awesome 漢字");
 }
 
 static void
@@ -507,22 +535,12 @@
   index_event (fix, create_test_event3 ());
   event_id = index_event (fix, create_test_event4 ());
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "fabulo*",
-                              zeitgeist_time_range_new_anytime (),
-                              g_ptr_array_new (),
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "fabulo*", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
+  assert_nth_result_has_id (results, 0, event_id);
 }
 
 static void
@@ -540,22 +558,12 @@
   index_event (fix, create_test_event4 ());
   event_id = index_event (fix, create_test_event5 ());
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "signal",
-                              zeitgeist_time_range_new_anytime (),
-                              g_ptr_array_new (),
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "signal", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
+  assert_nth_result_has_id (results, 0, event_id);
 }
 
 static void
@@ -583,22 +591,12 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (event_template, event);
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "pdf",
-                              zeitgeist_time_range_new_anytime (),
-                              event_template,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "pdf", event_template,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
+  assert_nth_result_has_id (results, 0, event_id);
 }
 
 static void
@@ -626,22 +624,12 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (event_template, event);
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "pdf",
-                              zeitgeist_time_range_new_anytime (),
-                              event_template,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "pdf", event_template,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
+  assert_nth_result_has_id (results, 0, event_id);
 }
 
 static void
@@ -669,22 +657,12 @@
   zeitgeist_event_add_subject (event, subject);
   g_ptr_array_add (event_template, event);
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "pdf",
-                              zeitgeist_time_range_new_anytime (),
-                              event_template,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "pdf", event_template,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
+  assert_nth_result_has_id (results, 0, event_id);
 }
 
 static void
@@ -699,26 +677,14 @@
   index_event (fix, create_test_event1 ());
   event_id = index_event (fix, create_test_event2 ());
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "漢*",
-                              zeitgeist_time_range_new_anytime (),
-                              g_ptr_array_new (),
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "漢*", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
-
-  subject = (ZeitgeistSubject*)
-    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
-  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, "Example.com Wiki Page. Kanji is awesome 漢字");
+  assert_nth_result_has_id (results, 0, event_id);
+  assert_nth_result_has_text (results, 0,
+          "Example.com Wiki Page. Kanji is awesome 漢字");
 }
 
 static void
@@ -734,26 +700,13 @@
   index_event (fix, create_test_event2 ());
   event_id = index_event (fix, create_test_event3 ());
 
-  GPtrArray *results =
-    zeitgeist_indexer_search (fix->indexer,
-                              "παράδειγμα",
-                              zeitgeist_time_range_new_anytime (),
-                              g_ptr_array_new (),
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_simple (fix, "παράδειγμα", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
-
-  subject = (ZeitgeistSubject*)
-    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
-  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, "IDNwiki");
+  assert_nth_result_has_id (results, 0, event_id);
+  assert_nth_result_has_text (results, 0, "IDNwiki");
 }
 
 static void
@@ -771,30 +724,16 @@
   index_event (fix, create_test_event3 ());
   index_event (fix, create_test_event4 ());
 
-  GPtrArray *results =
-    zeitgeist_indexer_search_with_relevancies (fix->indexer,
-                              "text",
-                              zeitgeist_time_range_new_anytime (),
-                              g_ptr_array_new (),
-                              ZEITGEIST_STORAGE_STATE_ANY,
-                              0,
-                              10,
-                              (ZeitgeistResultType) 100,
-                              &relevancies, &relevancies_size,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_with_relevancies_simple (fix, "text", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS,
+          &relevancies, &relevancies_size, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 1);
   g_assert_cmpint (relevancies_size, ==, 1);
   g_assert_cmpfloat (relevancies[0], >=, 1.0);
-
-  event = (ZeitgeistEvent*) results->pdata[0];
-  g_assert_cmpuint (zeitgeist_event_get_id (event), ==, event_id);
-
-  ZeitgeistSubject *subject = (ZeitgeistSubject*)
-    g_ptr_array_index (zeitgeist_event_get_subjects (event), 0);
-  g_assert_cmpstr (zeitgeist_subject_get_text (subject), ==, "text");
+  assert_nth_result_has_id (results, 0, event_id);
+  assert_nth_result_has_text (results, 0, "text");
 }
 
 static void
@@ -815,18 +754,9 @@
   usleep (50000);
   event_id6 = index_event (fix, create_test_event6 ());
 
-  GPtrArray *results =
-    zeitgeist_indexer_search_with_relevancies (fix->indexer,
-                              "user*",
-                              zeitgeist_time_range_new_anytime (),
-                              g_ptr_array_new (),
-                              ZEITGEIST_STORAGE_STATE_ANY,
-                              0,
-                              10,
-                              ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS,
-                              &relevancies, &relevancies_size,
-                              &matches,
-                              NULL);
+  GPtrArray *results = search_with_relevancies_simple (fix, "user*", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS,
+          &relevancies, &relevancies_size, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 3);
@@ -834,8 +764,131 @@
 
   // we're creating event 6 after 5 and 4, so it has to be more recent (but it seems
   // that number of terms indexed matters as well, so careful with the relevancies)
-  g_assert_cmpuint (event_id6, ==,
-      zeitgeist_event_get_id ((ZeitgeistEvent*) results->pdata[0]));
+  assert_nth_result_has_id (results, 0, event_id6);
+}
+
+static void
+test_simple_move_event (Fixture *fix, gconstpointer data)
+{
+  guint matches;
+  guint event_id;
+  ZeitgeistEvent* event;
+ 
+  // add test events to DBs
+  index_event (fix, create_test_event1 ());
+  index_event (fix, create_test_event4 ());
+  event_id = index_event (fix, create_test_event8 ());
+
+  GPtrArray *results = search_simple (fix, "awesome", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
+
+  g_assert_cmpuint (matches, >, 0);
+  g_assert_cmpuint (results->len, ==, 1);
+  assert_nth_result_has_id (results, 0, event_id);
+}
+
+static void
+test_simple_most_recent (Fixture *fix, gconstpointer data)
+{
+  guint matches;
+  guint event_id1, event_id2, event_id3, event_id4;
+  ZeitgeistEvent* event;
+  GPtrArray* results;
+  gdouble *relevancies;
+  gint relevancies_size;
+ 
+  // add test events to DBs
+  event_id1 = index_event (fix, create_test_event1 ());
+  event_id2 = index_event (fix, create_test_event2 ());
+  event_id3 = index_event (fix, create_test_event3 ());
+  event_id4 = index_event (fix, create_test_event4 ());
+
+  for (int i = 0; i < 4; ++i)
+  {
+    if (i == 0)
+    {
+      // Search for MostRecentEvents
+      results = search_simple (fix, "*text*", NULL,
+              ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS, &matches);
+    }
+    else if (i == 1)
+    {
+      // Search for MostRecentSubjects
+      results = search_simple (fix, "*text*", NULL,
+              ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS, &matches);
+    }
+    else if (i == 2)
+    {
+      // SearchWithRelevancies for MostRecentEvents
+      GPtrArray *results = search_with_relevancies_simple (fix, "*text*", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS,
+          &relevancies, &relevancies_size, &matches);
+    }
+    else
+    {
+      // SearchWithRelevancies for MostRecentSubjects
+      GPtrArray *results = search_with_relevancies_simple (fix, "*text*", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS,
+          &relevancies, &relevancies_size, &matches);
+    }
+
+    g_assert_cmpuint (matches, >, 0);
+    g_assert_cmpuint (results->len, ==, 2);
+    assert_nth_result_has_id (results, 0, event_id4);
+    assert_nth_result_has_id (results, 1, event_id1);
+  }
+}
+
+static void
+test_simple_least_recent (Fixture *fix, gconstpointer data)
+{
+  guint matches;
+  guint event_id1, event_id2, event_id3, event_id4;
+  ZeitgeistEvent* event;
+  GPtrArray* results;
+  gdouble *relevancies;
+  gint relevancies_size;
+ 
+  // add test events to DBs
+  event_id1 = index_event (fix, create_test_event1 ());
+  event_id2 = index_event (fix, create_test_event2 ());
+  event_id3 = index_event (fix, create_test_event3 ());
+  event_id4 = index_event (fix, create_test_event4 ());
+
+  for (int i = 0; i < 4; ++i)
+  {
+    if (i == 0)
+    {
+      // Search for LeastRecentEvents
+      results = search_simple (fix, "*text*", NULL,
+              ZEITGEIST_RESULT_TYPE_LEAST_RECENT_EVENTS, &matches);
+    }
+    else if (i == 1)
+    {
+      // Search for LeastRecentSubjects
+      results = search_simple (fix, "*text*", NULL,
+              ZEITGEIST_RESULT_TYPE_LEAST_RECENT_SUBJECTS, &matches);
+    }
+    else if (i == 2)
+    {
+      // SearchWithRelevancies for LeastRecentEvents
+      GPtrArray *results = search_with_relevancies_simple (fix, "*text*", NULL,
+          ZEITGEIST_RESULT_TYPE_LEAST_RECENT_EVENTS,
+          &relevancies, &relevancies_size, &matches);
+    }
+    else
+    {
+      // SearchWithRelevancies for LeastRecentSubjects
+      GPtrArray *results = search_with_relevancies_simple (fix, "*text*", NULL,
+          ZEITGEIST_RESULT_TYPE_LEAST_RECENT_SUBJECTS,
+          &relevancies, &relevancies_size, &matches);
+    }
+
+    g_assert_cmpuint (matches, >, 0);
+    g_assert_cmpuint (results->len, ==, 2);
+    assert_nth_result_has_id (results, 0, event_id1);
+    assert_nth_result_has_id (results, 1, event_id4);
+  }
 }
 
 G_BEGIN_DECLS
@@ -851,6 +904,10 @@
 {
   g_test_add ("/Zeitgeist/FTS/Indexer/SimpleQuery", Fixture, 0,
               setup, test_simple_query, teardown);
+  g_test_add ("/Zeitgeist/FTS/Indexer/SimpleQueryEmptyDatabase", Fixture, 0,
+              setup, test_simple_query_empty_database, teardown);
+  g_test_add ("/Zeitgeist/FTS/Indexer/SimpleQueryNoResults", Fixture, 0,
+              setup, test_simple_query_no_results, teardown);
   g_test_add ("/Zeitgeist/FTS/Indexer/SimpleWithFilter", Fixture, 0,
               setup, test_simple_with_filter, teardown);
   g_test_add ("/Zeitgeist/FTS/Indexer/SimpleWithValidFilter", Fixture, 0,
@@ -881,6 +938,12 @@
               setup, test_simple_relevancies_query, teardown);
   g_test_add ("/Zeitgeist/FTS/Indexer/RelevanciesSubject", Fixture, 0,
               setup, test_simple_relevancies_subject_query, teardown);
+  g_test_add ("/Zeitgeist/FTS/Indexer/MoveEvent", Fixture, 0,
+              setup, test_simple_move_event, teardown);
+  g_test_add ("/Zeitgeist/FTS/Indexer/MostRecent", Fixture, 0,
+              setup, test_simple_most_recent, teardown);
+  g_test_add ("/Zeitgeist/FTS/Indexer/LeastRecent", Fixture, 0,
+              setup, test_simple_least_recent, teardown);
 
   // get rid of the "rebuilding index..." messages
   g_log_set_handler (NULL, G_LOG_LEVEL_MESSAGE, discard_message, NULL);
 
=== modified file 'test/dbus/engine-test.py'
--- test/dbus/engine-test.py	2012-01-02 07:42:53 +0000
+++ test/dbus/engine-test.py	2012-03-16 18:46:19 +0000
@@ -134,7 +134,7 @@
 
 	def testIllegalPredefinedEventId(self):
 		event = Event()
-		event[0][0] = str(23) # This is illegal, we assert the erro later
+		event[0][0] = str(23) # This is illegal, we assert the error later
 		event.timestamp = 0
 		event.interpretation = Manifestation.USER_ACTIVITY
 		event.manifestation = Interpretation.CREATE_EVENT