From b0d1b2557c4b85d2b32cfaf329e1022f4d4c65ad Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 31 Mar 2014 10:48:38 +0200 Subject: [PATCH] adjust Access test --- apps/user_ldap/tests/access.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index 9beb2b97336..8ead5d68482 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -30,30 +30,39 @@ class Test_Access extends \PHPUnit_Framework_TestCase { private function getConnecterAndLdapMock() { static $conMethods; static $accMethods; + static $umMethods; if(is_null($conMethods) || is_null($accMethods)) { $conMethods = get_class_methods('\OCA\user_ldap\lib\Connection'); $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + $umMethods = get_class_methods('\OCA\user_ldap\lib\user\Manager'); } $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper'); $connector = $this->getMock('\OCA\user_ldap\lib\Connection', $conMethods, array($lw, null, null)); + $um = $this->getMock('\OCA\user_ldap\lib\user\Manager', + $umMethods, array( + $this->getMock('\OCP\IConfig'), + $this->getMock('\OCA\user_ldap\lib\FilesystemHelper'), + $this->getMock('\OCA\user_ldap\lib\LogWrapper'), + $this->getMock('\OCP\IAvatarManager'), + $this->getMock('\OCP\Image'))); - return array($lw, $connector); + return array($lw, $connector, $um); } public function testEscapeFilterPartValidChars() { - list($lw, $con) = $this->getConnecterAndLdapMock(); - $access = new Access($con, $lw); + list($lw, $con, $um) = $this->getConnecterAndLdapMock(); + $access = new Access($con, $lw, $um); $input = 'okay'; $this->assertTrue($input === $access->escapeFilterPart($input)); } public function testEscapeFilterPartEscapeWildcard() { - list($lw, $con) = $this->getConnecterAndLdapMock(); - $access = new Access($con, $lw); + list($lw, $con, $um) = $this->getConnecterAndLdapMock(); + $access = new Access($con, $lw, $um); $input = '*'; $expected = '\\\\*'; @@ -61,8 +70,8 @@ class Test_Access extends \PHPUnit_Framework_TestCase { } public function testEscapeFilterPartEscapeWildcard2() { - list($lw, $con) = $this->getConnecterAndLdapMock(); - $access = new Access($con, $lw); + list($lw, $con, $um) = $this->getConnecterAndLdapMock(); + $access = new Access($con, $lw, $um); $input = 'foo*bar'; $expected = 'foo\\\\*bar'; -- 2.39.5