Add test cases for Current Origin

2 files changed, 42 insertions, 0 deletions

diff --git a/test/dbus/engine-test.py b/test/dbus/engine-test.py
index 9213d411..93e350a6 100644
--- a/test/dbus/engine-test.py
+++ b/test/dbus/engine-test.py
@@ -573,6 +573,32 @@ class ZeitgeistEngineTest(testutils.RemoteTestCase):
 		)
 		self.assertEquals(1, len(results))
 
+	def testMoving(self):
+		import_events("test/data/five_events.js", self)
+		import_events("test/data/five_events_ext_move.js", self)
+		template = Event.new_for_values(subject_current_uri='file:///*')
+
+		ids = self.findEventIdsAndWait([template],
+			num_events = 0,
+			result_type = ResultType.MostRecentCurrentUri)
+		self.assertEquals(2, len(ids))
+
+		ids = self.findEventIdsAndWait([template],
+			num_events = 0,
+			result_type = ResultType.MostRecentCurrentUri)
+		self.assertEquals(2, len(ids))
+
+		ids = self.findEventIdsAndWait([template],
+			num_events = 0,
+			result_type = ResultType.MostRecentEvents)
+		self.assertEquals(5, len(ids))
+
+		template = Event.new_for_values(subject_current_origin='file:///*')
+		ids = self.findEventIdsAndWait([template],
+			num_events = 0,
+			result_type = ResultType.MostRecentEvents)
+		self.assertEquals(4, len(ids))
+
 	def testWildcard(self):
 		import_events("test/data/five_events.js", self)
 
diff --git a/test/dbus/remote-test.py b/test/dbus/remote-test.py
index 187faac5..72f80a06 100644
--- a/test/dbus/remote-test.py
+++ b/test/dbus/remote-test.py
@@ -430,6 +430,22 @@ class ZeitgeistRemoteFindEventIdsTest(testutils.RemoteTestCase):
 		ids = self.findEventIdsAndWait([template])
 		self.assertEquals(map(int, ids), [5, 4, 2, 3])
 
+	def testFindEventIdsForSubjectCurrentOrigin(self):
+		# Retrieve events for a particular current origin
+		template = Event.new_for_values(subject_current_origin='file:///tmp')
+		ids = self.findEventIdsAndWait([template])
+		self.assertEquals(ids, [4, 2, 3])
+
+		# Now let's try with wildcard and negation
+		template = Event.new_for_values(subject_current_origin='!file:*')
+		ids = self.findEventIdsAndWait([template])
+		self.assertEquals(map(int, ids), [5, 1])
+
+		# Now let's try with wildcard and negation
+		template = Event.new_for_values(subject_current_origin='!http:*')
+		ids = self.findEventIdsAndWait([template])
+		self.assertEquals(map(int, ids), [4, 2, 3])
+
 	def testFindEventIdsForSubjectStorage(self):
 		# Retrieve events for a particular subject storage
 		template = Event.new_for_values(subject_storage=