From bf2c9be06640c1ce1fff6da893ddb55297069af9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 28 Nov 2014 11:18:15 +0100
Subject: concatenate queries with 'or'

---
 tests/lib/activitymanager.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/lib/activitymanager.php b/tests/lib/activitymanager.php
index 85f8320de09..0683eb68193 100644
--- a/tests/lib/activitymanager.php
+++ b/tests/lib/activitymanager.php
@@ -87,11 +87,14 @@ class Test_ActivityManager extends \Test\TestCase {
 	}
 
 	public function testQueryForFilter() {
+		$this->activityManager->registerExtension(function() {
+			return new SimpleExtension();
+		});
 		$result = $this->activityManager->getQueryForFilter('filter1');
 		$this->assertEquals(
 			array(
-				'`app` = ? and `message` like ?',
-				array('mail', 'ownCloud%')
+				' and ((`app` = ? and `message` like ?) or (`app` = ? and `message` like ?))',
+				array('mail', 'ownCloud%', 'mail', 'ownCloud%')
 			), $result
 		);
 
-- 
cgit v1.2.3