diff options
Diffstat (limited to 'apps/user_ldap/tests')
-rw-r--r-- | apps/user_ldap/tests/GroupLDAPTest.php | 8 | ||||
-rw-r--r-- | apps/user_ldap/tests/User/UserTest.php | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/User_LDAPTest.php | 12 | ||||
-rw-r--r-- | apps/user_ldap/tests/WizardTest.php | 6 | ||||
-rw-r--r-- | apps/user_ldap/tests/access.php | 6 | ||||
-rw-r--r-- | apps/user_ldap/tests/integration/abstractintegrationtest.php | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/apps/user_ldap/tests/GroupLDAPTest.php b/apps/user_ldap/tests/GroupLDAPTest.php index b8aa4ff5591..57c22f8bda1 100644 --- a/apps/user_ldap/tests/GroupLDAPTest.php +++ b/apps/user_ldap/tests/GroupLDAPTest.php @@ -27,8 +27,8 @@ namespace OCA\User_LDAP\Tests; use OCA\User_LDAP\Group_LDAP as GroupLDAP; -use \OCA\user_ldap\lib\Access; -use \OCA\User_LDAP\Connection; +use OCA\User_LDAP\Access; +use OCA\User_LDAP\Connection; /** * Class GroupLDAPTest @@ -44,7 +44,7 @@ class GroupLDAPTest extends \Test\TestCase { if(is_null($conMethods) || is_null($accMethods)) { $conMethods = get_class_methods('\OCA\User_LDAP\Connection'); - $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + $accMethods = get_class_methods('\OCA\User_LDAP\Access'); } $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper'); $connector = $this->getMock('\OCA\User_LDAP\Connection', @@ -53,7 +53,7 @@ class GroupLDAPTest extends \Test\TestCase { $um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager') ->disableOriginalConstructor() ->getMock(); - $access = $this->getMock('\OCA\user_ldap\lib\Access', + $access = $this->getMock('\OCA\User_LDAP\Access', $accMethods, array($connector, $lw, $um)); diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 9d165c7f29e..12ebc7227a1 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -56,7 +56,7 @@ class UserTest extends \Test\TestCase { if(is_null($conMethods) || is_null($accMethods)) { $conMethods = get_class_methods('\OCA\User_LDAP\Connection'); - $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + $accMethods = get_class_methods('\OCA\User_LDAP\Access'); //getConnection shall not be replaced unset($accMethods[array_search('getConnection', $accMethods)]); $umMethods = get_class_methods('\OCA\User_LDAP\User\Manager'); @@ -70,7 +70,7 @@ class UserTest extends \Test\TestCase { $umMethods, array($cfMock, $fsMock, $logMock, $avaMgr, $im, $dbc, $userMgr)); $connector = $this->getMock('\OCA\User_LDAP\Connection', $conMethods, array($lw, null, null)); - $access = $this->getMock('\OCA\user_ldap\lib\Access', + $access = $this->getMock('\OCA\User_LDAP\Access', $accMethods, array($connector, $lw, $um)); return array($access, $connector); diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 748b8f83706..b4d346470d3 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -28,7 +28,7 @@ namespace OCA\User_LDAP\Tests; use OCA\User_LDAP\User_LDAP as UserLDAP; -use \OCA\user_ldap\lib\Access; +use \OCA\User_LDAP\Access; use \OCA\User_LDAP\Connection; /** @@ -57,7 +57,7 @@ class User_LDAPTest extends \Test\TestCase { if(is_null($conMethods) || is_null($accMethods)) { $conMethods = get_class_methods('\OCA\User_LDAP\Connection'); - $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + $accMethods = get_class_methods('\OCA\User_LDAP\Access'); unset($accMethods[array_search('getConnection', $accMethods)]); $uMethods = get_class_methods('\OCA\User_LDAP\User\User'); unset($uMethods[array_search('getUsername', $uMethods)]); @@ -92,7 +92,7 @@ class User_LDAPTest extends \Test\TestCase { ->method('getDeletedUser') ->will($this->returnValue($offlineUser)); - $access = $this->getMock('\OCA\user_ldap\lib\Access', + $access = $this->getMock('\OCA\User_LDAP\Access', $accMethods, array($connector, $lw, $um)); @@ -126,8 +126,8 @@ class User_LDAPTest extends \Test\TestCase { /** * Prepares the Access mock for checkPassword tests - * @param \OCA\user_ldap\lib\Access $access mock - * @param bool noDisplayName + * @param \OCA\User_LDAP\Access $access mock + * @param bool $noDisplayName * @return void */ private function prepareAccessForCheckPassword(&$access, $noDisplayName = false) { @@ -295,7 +295,7 @@ class User_LDAPTest extends \Test\TestCase { /** * Prepares the Access mock for getUsers tests - * @param \OCA\user_ldap\lib\Access $access mock + * @param \OCA\User_LDAP\Access $access mock * @return void */ private function prepareAccessForGetUsers(&$access) { diff --git a/apps/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php index d962e057911..d6ee5a473b2 100644 --- a/apps/user_ldap/tests/WizardTest.php +++ b/apps/user_ldap/tests/WizardTest.php @@ -28,7 +28,7 @@ namespace OCA\User_LDAP\tests; use \OCA\User_LDAP\Wizard; // use \OCA\User_LDAP\User_LDAP as UserLDAP; -// use \OCA\user_ldap\lib\Access; +// use \OCA\User_LDAP\Access; // use \OCA\User_LDAP\Configuration; // use \OCA\User_LDAP\ILDAPWrapper; @@ -61,7 +61,7 @@ class WizardTest extends \Test\TestCase { if(is_null($confMethods)) { $confMethods = get_class_methods('\OCA\User_LDAP\Configuration'); $connMethods = get_class_methods('\OCA\User_LDAP\Connection'); - $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + $accMethods = get_class_methods('\OCA\User_LDAP\Access'); } $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper'); $conf = $this->getMock('\OCA\User_LDAP\Configuration', @@ -73,7 +73,7 @@ class WizardTest extends \Test\TestCase { $um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager') ->disableOriginalConstructor() ->getMock(); - $access = $this->getMock('\OCA\user_ldap\lib\Access', + $access = $this->getMock('\OCA\User_LDAP\Access', $accMethods, array($connector, $lw, $um)); return array(new Wizard($conf, $lw, $access), $conf, $lw, $access); diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index 1578e0ffad2..b1401b7c9bb 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -25,8 +25,8 @@ namespace OCA\user_ldap\tests; -use \OCA\user_ldap\lib\Access; -use \OCA\User_LDAP\Connection; +use OCA\User_LDAP\Access; +use OCA\User_LDAP\Connection; /** * Class Test_Access @@ -43,7 +43,7 @@ class Test_Access extends \Test\TestCase { if(is_null($conMethods) || is_null($accMethods)) { $conMethods = get_class_methods('\OCA\User_LDAP\Connection'); - $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + $accMethods = get_class_methods('\OCA\User_LDAP\Access'); $umMethods = get_class_methods('\OCA\User_LDAP\User\Manager'); } $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper'); diff --git a/apps/user_ldap/tests/integration/abstractintegrationtest.php b/apps/user_ldap/tests/integration/abstractintegrationtest.php index e5ecad75ba0..7b3d7b171c4 100644 --- a/apps/user_ldap/tests/integration/abstractintegrationtest.php +++ b/apps/user_ldap/tests/integration/abstractintegrationtest.php @@ -21,7 +21,7 @@ namespace OCA\user_ldap\tests\integration; -use OCA\user_ldap\lib\Access; +use OCA\User_LDAP\Access; use OCA\User_LDAP\Connection; use OCA\User_LDAP\LDAP; use OCA\User_LDAP\User\Manager; |