diff --git a/tests/lib/User/AccountMapperTest.php b/tests/lib/User/AccountMapperTest.php index 7b0cd66c0e77..85b6607c8ac1 100644 --- a/tests/lib/User/AccountMapperTest.php +++ b/tests/lib/User/AccountMapperTest.php @@ -25,6 +25,7 @@ use OC\User\Account; use OC\User\AccountMapper; use OC\User\AccountTermMapper; +use OCP\IConfig; use OCP\IDBConnection; use Test\TestCase; @@ -37,13 +38,13 @@ */ class AccountMapperTest extends TestCase { - /** - * @var IDBConnection - */ + /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ + protected $config; + + /** @var IDBConnection */ protected $connection; - /** - * @var AccountMapper - */ + + /** @var AccountMapper */ protected $mapper; public static function setUpBeforeClass() { @@ -76,8 +77,16 @@ public static function setUpBeforeClass() { public function setUp() { parent::setUp(); + + $this->config = $this->createMock(IConfig::class); + $this->connection = \OC::$server->getDatabaseConnection(); - $this->mapper = new AccountMapper($this->connection, new AccountTermMapper($this->connection)); + + $this->mapper = new AccountMapper( + $this->config, + $this->connection, + new AccountTermMapper($this->connection) + ); } public static function tearDownAfterClass () { @@ -91,7 +100,6 @@ public static function tearDownAfterClass () { public function testFindAll() { $result = $this->mapper->find("testfind"); $this->assertEquals(4, count($result)); - } /** @@ -101,7 +109,6 @@ public function testFindByUserId() { $result = $this->mapper->find("testfind1"); $this->assertEquals(1, count($result)); $this->assertEquals("TestFind1", array_shift($result)->getUserId()); - } /** @@ -111,7 +118,6 @@ public function testFindByDisplayName() { $result = $this->mapper->find('test find 2'); $this->assertEquals(1, count($result)); $this->assertEquals("TestFind2", array_shift($result)->getUserId()); - } /** @@ -121,7 +127,6 @@ public function testFindByEmail() { $result= $this->mapper->find('test3@find.tld'); $this->assertEquals(1, count($result)); $this->assertEquals("TestFind3", array_shift($result)->getUserId()); - } /** @@ -131,7 +136,6 @@ public function testFindBySearchTerm() { $result = $this->mapper->find('term 4 b'); $this->assertEquals(1, count($result)); $this->assertEquals("TestFind4", array_shift($result)->getUserId()); - } /** @@ -143,6 +147,5 @@ public function testFindLimitAndOffset() { //results are ordered by display name $this->assertEquals("TestFind3", array_shift($result)->getUserId()); $this->assertEquals("TestFind4", array_shift($result)->getUserId()); - } } \ No newline at end of file