]> source.dussan.org Git - nextcloud-server.git/commitdiff
adjust Access test
authorArthur Schiwon <blizzz@owncloud.com>
Mon, 31 Mar 2014 08:48:38 +0000 (10:48 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Tue, 3 Jun 2014 10:59:09 +0000 (12:59 +0200)
apps/user_ldap/tests/access.php

index 9beb2b973365a051b0436dbeb4d05358049d7cc4..8ead5d684821a4b3429185495736308512fae257 100644 (file)
@@ -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';