Merge lp:~rainct/zeitgeist/least-popular-959615 into lp:~zeitgeist/zeitgeist/bluebird

[Siegfried Gevatter]

Unmerged revisions

458. By Siegfried Gevatter on 2012-03-29

Fix sorting of LEAST_POPULAR_* result types (LP: #959615)

They should query for least popular X but return the most
(not least) recent event for it.

=== modified file 'src/datamodel.vala'
--- src/datamodel.vala	2012-03-27 14:30:23 +0000
+++ src/datamodel.vala	2012-04-10 16:04:18 +0000
@@ -243,40 +243,39 @@
         {
             switch (result_type)
             {
-                // FIXME: Why are LEAST_POPULAR_* using ASC?
                 case ResultType.LEAST_RECENT_EVENTS:
                 case ResultType.LEAST_RECENT_EVENT_ORIGIN:
-                case ResultType.LEAST_POPULAR_EVENT_ORIGIN:
                 case ResultType.LEAST_RECENT_SUBJECTS:
-                case ResultType.LEAST_POPULAR_SUBJECTS:
                 case ResultType.LEAST_RECENT_CURRENT_URI:
-                case ResultType.LEAST_POPULAR_CURRENT_URI:
                 case ResultType.LEAST_RECENT_ACTOR:
-                case ResultType.LEAST_POPULAR_ACTOR:
                 case ResultType.OLDEST_ACTOR:
                 case ResultType.LEAST_RECENT_ORIGIN:
-                case ResultType.LEAST_POPULAR_ORIGIN:
                 case ResultType.LEAST_RECENT_SUBJECT_INTERPRETATION:
-                case ResultType.LEAST_POPULAR_SUBJECT_INTERPRETATION:
                 case ResultType.LEAST_RECENT_MIMETYPE:
-                case ResultType.LEAST_POPULAR_MIMETYPE:
                     return true;
 
                 case ResultType.MOST_RECENT_EVENTS:
                 case ResultType.MOST_RECENT_EVENT_ORIGIN:
                 case ResultType.MOST_POPULAR_EVENT_ORIGIN:
+                case ResultType.LEAST_POPULAR_EVENT_ORIGIN:
                 case ResultType.MOST_RECENT_SUBJECTS:
                 case ResultType.MOST_POPULAR_SUBJECTS:
+                case ResultType.LEAST_POPULAR_SUBJECTS:
                 case ResultType.MOST_RECENT_CURRENT_URI:
                 case ResultType.MOST_POPULAR_CURRENT_URI:
+                case ResultType.LEAST_POPULAR_CURRENT_URI:
                 case ResultType.MOST_RECENT_ACTOR:
                 case ResultType.MOST_POPULAR_ACTOR:
+                case ResultType.LEAST_POPULAR_ACTOR:
                 case ResultType.MOST_RECENT_ORIGIN:
                 case ResultType.MOST_POPULAR_ORIGIN:
+                case ResultType.LEAST_POPULAR_ORIGIN:
                 case ResultType.MOST_RECENT_SUBJECT_INTERPRETATION:
                 case ResultType.MOST_POPULAR_SUBJECT_INTERPRETATION:
+                case ResultType.LEAST_POPULAR_SUBJECT_INTERPRETATION:
                 case ResultType.MOST_RECENT_MIMETYPE:
                 case ResultType.MOST_POPULAR_MIMETYPE:
+                case ResultType.LEAST_POPULAR_MIMETYPE:
                     return false;
 
                 default:

=== modified file 'src/db-reader.vala'
=== modified file 'test/dbus/engine-test.py'
--- test/dbus/engine-test.py	2012-03-16 17:08:43 +0000
+++ test/dbus/engine-test.py	2012-04-10 16:04:18 +0000
@@ -829,7 +829,7 @@
 		events = self.getEventsAndWait(ids)
 		
 		self.assertEquals([e.timestamp for e in events],
-			["123", "153", "163", "143"])
+			["163", "153", "123", "143"])
 	
 	def testResultTypesMostRecentCurrentUri(self):
 		import_events("test/data/five_events.js", self)
@@ -988,8 +988,8 @@
 		events = self.getEventsAndWait(ids)
 		
 		self.assertEquals([e[0][5] for e in events],
-			["origin2", "origin3", "origin1"])
-		self.assertEquals([e.timestamp for e in events], ["100", "103", "102"])
+			["origin3", "origin2", "origin1"])
+		self.assertEquals([e.timestamp for e in events], ["103", "100", "102"])
 
 	def testResultTypesMostRecentEventOrigin(self):
 		import_events("test/data/twenty_events.js", self)