diff options
Diffstat (limited to 'apps/user_ldap/tests')
| -rw-r--r-- | apps/user_ldap/tests/AccessTest.php | 1 | ||||
| -rw-r--r-- | apps/user_ldap/tests/ConfigurationTest.php | 8 | ||||
| -rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/tests/User/ManagerTest.php | 1 |
4 files changed, 3 insertions, 11 deletions
diff --git a/apps/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php index 2fddafa214b..5e99583c70f 100644 --- a/apps/user_ldap/tests/AccessTest.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -201,6 +201,7 @@ class AccessTest extends \Test\TestCase { return $case['interResult']; } } + return null; })); foreach($cases as $case) { diff --git a/apps/user_ldap/tests/ConfigurationTest.php b/apps/user_ldap/tests/ConfigurationTest.php index 9951b97e06c..797d2598be4 100644 --- a/apps/user_ldap/tests/ConfigurationTest.php +++ b/apps/user_ldap/tests/ConfigurationTest.php @@ -93,14 +93,6 @@ class ConfigurationTest extends \Test\TestCase { public function testSetValue($key, $input, $expected) { $configuration = new \OCA\User_LDAP\Configuration('t01', false); - $settingsInput = array( - 'ldapBaseUsers' => array( - 'cn=someUsers,dc=example,dc=org', - ' ', - ' cn=moreUsers,dc=example,dc=org ' - ) - ); - $configuration->setConfiguration([$key => $input]); $this->assertSame($configuration->$key, $expected); } diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php index 95c14ca8947..2200ac327a1 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php @@ -111,7 +111,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest { */ protected function case2() { \OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', true); - $userManager = \oc::$server->getUserManager(); + $userManager = \OC::$server->getUserManager(); // clearing backends is critical, otherwise the userManager will have // the user objects cached and the value from case1 returned $userManager->clearBackends(); @@ -144,7 +144,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest { $this->connection->setConfiguration([ 'homeFolderNamingRule' => 'attr:', ]); - $userManager = \oc::$server->getUserManager(); + $userManager = \OC::$server->getUserManager(); $userManager->clearBackends(); $userManager->registerBackend($this->backend); $users = $userManager->search('', 5, 0); diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php index 0c370f12c43..b3f22d6a068 100644 --- a/apps/user_ldap/tests/User/ManagerTest.php +++ b/apps/user_ldap/tests/User/ManagerTest.php @@ -208,7 +208,6 @@ class ManagerTest extends \Test\TestCase { list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); - $dn = 'cn=foo,dc=foobar,dc=bar'; $uid = 'gone'; $access->expects($this->never()) |