From baa91809bd11a78a53c8b39e6b2f73ff41b7f925 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sat, 20 Aug 2016 23:45:31 +0200 Subject: [PATCH] adjust test --- tests/lib/Settings/ManagerTest.php | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php index 4728784167..942a2bb63e 100644 --- a/tests/lib/Settings/ManagerTest.php +++ b/tests/lib/Settings/ManagerTest.php @@ -139,23 +139,18 @@ class ManagerTest extends TestCase { $expr = $this->getMockBuilder('OCP\DB\QueryBuilder\IExpressionBuilder')->getMock(); $qb ->expects($this->once()) - ->method('select') - ->with(['s.class', 's.priority']) + ->method('selectDistinct') + ->with('s.class') + ->willReturn($qb); + $qb + ->expects($this->once()) + ->method('addSelect') + ->with('s.priority') ->willReturn($qb); $qb ->expects($this->exactly(2)) ->method('from') ->willReturn($qb); - $qb - ->expects($this->at(1)) - ->method('from') - ->with('admin_sections', 's') - ->willReturn($qb); - $qb - ->expects($this->at(2)) - ->method('from') - ->with('admin_settings', 'f') - ->willReturn($qb); $qb ->expects($this->once()) ->method('expr')