Sorting by CurrentOrigin (w/ test cases)

3 files changed, 49 insertions, 3 deletions

diff --git a/test/data/five_events.js b/test/data/five_events.js
index b18f2b57..d8ede4f9 100644
--- a/test/data/five_events.js
+++ b/test/data/five_events.js
@@ -9,7 +9,7 @@
 				"uri" : "http://www.google.de",
 				"interpretation" : "stfu:Document",
 				"manifestation" : "stfu:File",
-				"origin" : "file:///tmp",
+				"origin" : "http://www.google.de",
 				"mimetype" : "meat/raw",
 				"text" : "this item has not text... rly!",
 				"storage" : "368c991f-8b59-4018-8130-3ce0ec944157"
diff --git a/test/data/five_events_ext_move.js b/test/data/five_events_ext_move.js
index 1040c1df..4c26e2b8 100644
--- a/test/data/five_events_ext_move.js
+++ b/test/data/five_events_ext_move.js
@@ -11,6 +11,7 @@
 				"interpretation" : "stfu:Bar",
 				"manifestation" : "stfu:File",
 				"origin" : "file:///tmp",
+				"current_origin" : "http://www.google.de",
 				"mimetype" : "text/plain",
 				"text" : "this item has not text... rly!",
 				"storage" : "368c991f-8b59-4018-8130-3ce0ec944157"
@@ -28,6 +29,7 @@
 				"interpretation" : "stfu:Bar",
 				"manifestation" : "stfu:File",
 				"origin" : "file:///tmp",
+				"current_origin" : "file:///home/",
 				"mimetype" : "text/plain",
 				"text" : "this item has not text... rly!",
 				"storage" : "368c991f-8b59-4018-8130-3ce0ec944157"
diff --git a/test/dbus/result-types-test.py b/test/dbus/result-types-test.py
index bb9aaeb7..c4f57292 100644
--- a/test/dbus/result-types-test.py
+++ b/test/dbus/result-types-test.py
@@ -192,8 +192,52 @@ class ResultTypeTest(testutils.RemoteTestCase):
 			result_type = ResultType.LeastPopularCurrentUri)
 		events = self.getEventsAndWait(ids)
 		self.assertEquals([e.timestamp for e in events],
-			["153", "123", "200"]) #Zeitgeist 0.8 does this test wrong.
-				#This is the expected results
+			["153", "123", "200"])
+
+	def testResultTypesMostRecentCurrentOrigin(self):
+		import_events("test/data/five_events.js", self)
+		import_events("test/data/five_events_ext_move.js", self)
+
+		ids = self.findEventIdsAndWait([],
+			num_events=0,
+			result_type=ResultType.MostRecentCurrentOrigin)
+		events = self.getEventsAndWait(ids)
+
+		self.assertEquals([e.timestamp for e in events],
+			["200", "163", "153", "123"])
+
+	def testResultTypesLeastRecentCurrentOrigin(self):
+		import_events("test/data/five_events.js", self)
+		import_events("test/data/five_events_ext_move.js", self)
+
+		ids = self.findEventIdsAndWait([],
+			num_events=0,
+			result_type=ResultType.LeastRecentCurrentOrigin)
+		events = self.getEventsAndWait(ids)
+		self.assertEquals([e.timestamp for e in events],
+			["123", "153", "163", "200"])
+
+	def testResultTypesMostPopularCurrentOrigin(self):
+		import_events("test/data/five_events.js", self)
+		import_events("test/data/five_events_ext_move.js", self)
+
+		ids = self.findEventIdsAndWait([],
+			num_events=0,
+			result_type=ResultType.MostPopularCurrentOrigin)
+		events = self.getEventsAndWait(ids)
+		self.assertEquals([e.timestamp for e in events],
+			["200", "123", "163", "153"])
+
+	def testResultTypesLeastPopularCurrentOrigin(self):
+		import_events("test/data/five_events.js", self)
+		import_events("test/data/five_events_ext_move.js", self)
+
+		ids = self.findEventIdsAndWait([],
+			num_events=0,
+			result_type=ResultType.LeastPopularCurrentOrigin)
+		events = self.getEventsAndWait(ids)
+		self.assertEquals([e.timestamp for e in events],
+			["153", "163", "123", "200"])
 
 	def testResultTypesMostRecentActor(self):
 		import_events("test/data/twenty_events.js", self)