zeitgeist team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 439
committer: Siegfried-Angel Gevatter Pujals <siegfried@xxxxxxxxxxxx>
branch nick: bluebird
timestamp: Mon 2012-03-19 22:15:57 +0100
message:
  FTS++ test case: popularity is broken :(
modified:
  extensions/fts++/test/test-indexer.cpp


--
lp:zeitgeist
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird

Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist.
To unsubscribe from this branch go to https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription

=== modified file 'extensions/fts++/test/test-indexer.cpp'
--- extensions/fts++/test/test-indexer.cpp	2012-03-16 20:03:05 +0000
+++ extensions/fts++/test/test-indexer.cpp	2012-03-19 21:15:57 +0000
@@ -1,5 +1,7 @@
 /*
  * Copyright © 2012 Mikkel Kamstrup Erlandsen <mikkel.kamstrup@xxxxxxxxx>
+ * Copyright © 2012 Canonical Ltd.
+ *             By Siegfried-A. Gevatter <siegfried.gevatter@xxxxxxxxxxxxxxx>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -987,8 +989,6 @@
   guint event_id1, event_id2, event_id3, event_id4;
   ZeitgeistEvent* event;
   GPtrArray* results;
-  //gdouble *relevancies;
-  //gint relevancies_size;
  
   // add test events to DBs
   const char uri1[] = "file:///home/fibonacci/test.py";
@@ -1029,7 +1029,7 @@
 
   // Search for LeastPopularSubjects
   results = search_simple (fix, "test", NULL,
-          ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS, &matches);
+          ZEITGEIST_RESULT_TYPE_LEAST_RECENT_SUBJECTS, &matches);
 
   g_assert_cmpuint (matches, >, 0);
   g_assert_cmpuint (results->len, ==, 2);
@@ -1037,6 +1037,40 @@
   assert_nth_result_has_id (results, 1, event_id4);
 }
 
+static void
+test_query_most_popular_subjects (Fixture *fix, gconstpointer data)
+{
+  guint matches;
+  guint event_id1, event_id2, event_id3, event_id4, event_id5,
+        event_id6, event_id7, event_id8, event_id9;
+  ZeitgeistEvent* event;
+  GPtrArray* results;
+ 
+  // add test events to DBs
+  const char uri1[] = "file:///file1.txt";
+  const char uri2[] = "file:///file2.txt";
+  const char uri3[] = "file:///file3.txt";
+  event_id1 = index_event (fix, create_test_event_simple (uri1, "test"));
+  event_id2 = index_event (fix, create_test_event_simple (uri1, "test"));
+  event_id3 = index_event (fix, create_test_event_simple (uri2, "test"));
+  event_id4 = index_event (fix, create_test_event_simple (uri1, "test"));
+  event_id5 = index_event (fix, create_test_event_simple (uri3, "test"));
+  event_id6 = index_event (fix, create_test_event_simple (uri2, "test"));
+  event_id7 = index_event (fix, create_test_event_simple (uri1, "test"));
+  event_id8 = index_event (fix, create_test_event_simple (uri3, "test"));
+  event_id9 = index_event (fix, create_test_event_simple (uri3, "test"));
+
+  // Search for MostPopularSubjects
+  results = search_simple (fix, "test", NULL,
+          ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS, &matches);
+
+  g_assert_cmpuint (matches, >, 0);
+  g_assert_cmpuint (results->len, ==, 3);
+  assert_nth_result_has_id (results, 0, event_id7);
+  assert_nth_result_has_id (results, 1, event_id9);
+  assert_nth_result_has_id (results, 2, event_id6);
+}
+
 G_BEGIN_DECLS
 
 static void discard_message (const gchar *domain,
@@ -1096,6 +1130,8 @@
               setup, test_query_sort_order, teardown);
   g_test_add ("/Zeitgeist/FTS/Indexer/Query/Duplicates", Fixture, 0,
               setup, test_query_with_duplicates, teardown);
+  g_test_add ("/Zeitgeist/FTS/Indexer/Query/MostPopularSubjects", Fixture, 0,
+              setup, test_query_most_popular_subjects, teardown);
 
   // get rid of the "rebuilding index..." messages
   g_log_set_handler (NULL, G_LOG_LEVEL_MESSAGE, discard_message, NULL);