aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/activitymanager.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-11-28 11:18:15 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-11-28 14:46:27 +0100
commitbf2c9be06640c1ce1fff6da893ddb55297069af9 (patch)
tree41d5d369720c7b99ceff237b0996db6df88a0759 /tests/lib/activitymanager.php
parent154628daf46d2ace4bf90e05053696160b2b00c3 (diff)
downloadnextcloud-server-bf2c9be06640c1ce1fff6da893ddb55297069af9.tar.gz
nextcloud-server-bf2c9be06640c1ce1fff6da893ddb55297069af9.zip
concatenate queries with 'or'
Diffstat (limited to 'tests/lib/activitymanager.php')
-rw-r--r--tests/lib/activitymanager.php7
1 files changed, 5 insertions, 2 deletions
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
);