diff options
author | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-12 18:14:59 +0300 |
---|---|---|
committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-25 17:06:09 +0300 |
commit | 3ef8c95b3790e6e9be94f772b65e4aa19c042d50 (patch) | |
tree | a8ddb49ba1928af17238dfea3785caf9de61b97e | |
parent | b6163183276470039f3a2a2094d1a6224c272f28 (diff) |
Move tests/ to PSR-4
-rw-r--r-- | apps/user_ldap/tests/AccessTest.php (renamed from apps/user_ldap/tests/access.php) | 8 | ||||
-rw-r--r-- | apps/user_ldap/tests/ConfigurationTest.php (renamed from apps/user_ldap/tests/configuration.php) | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/ConnectionTest.php (renamed from apps/user_ldap/tests/connection.php) | 6 | ||||
-rw-r--r-- | apps/user_ldap/tests/Group_LDAPTest.php (renamed from apps/user_ldap/tests/GroupLDAPTest.php) | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/AbstractIntegrationTest.php (renamed from apps/user_ldap/tests/integration/abstractintegrationtest.php) | 2 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php (renamed from apps/user_ldap/tests/integration/exceptionOnLostConnection.php) | 3 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/FakeManager.php (renamed from apps/user_ldap/tests/integration/fakemanager.php) | 2 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php (renamed from apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php) | 6 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php (renamed from apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php) | 6 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php (renamed from apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php) | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php (renamed from apps/user_ldap/tests/integration/lib/integrationtestconnect.php) | 7 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php (renamed from apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php) | 9 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php (renamed from apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php) | 7 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php (renamed from apps/user_ldap/tests/integration/lib/integrationtestpaging.php) | 5 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php (renamed from apps/user_ldap/tests/integration/lib/integrationtestuserhome.php) | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php (renamed from apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php) | 6 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php (renamed from apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php) | 7 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/data/avatar-invalid.gif (renamed from apps/user_ldap/tests/integration/data/avatar-invalid.gif) | bin | 48702 -> 48702 bytes | |||
-rw-r--r-- | apps/user_ldap/tests/Integration/data/avatar-valid.jpg (renamed from apps/user_ldap/tests/integration/data/avatar-valid.jpg) | bin | 95495 -> 95495 bytes | |||
-rw-r--r-- | apps/user_ldap/tests/Integration/readme.md (renamed from apps/user_ldap/tests/integration/readme.md) | 0 | ||||
-rwxr-xr-x | apps/user_ldap/tests/Integration/run-test.sh (renamed from apps/user_ldap/tests/integration/run-test.sh) | 0 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroups.php (renamed from apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php) | 0 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroupsDifferentOU.php (renamed from apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php) | 0 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/setup-scripts/createExplicitUsers.php (renamed from apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php) | 0 | ||||
-rw-r--r-- | apps/user_ldap/tests/Integration/setup-scripts/createUsersWithoutDisplayName.php (renamed from apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php) | 0 | ||||
-rw-r--r-- | apps/user_ldap/tests/Jobs/CleanUpTest.php (renamed from apps/user_ldap/tests/jobs/cleanup.php) | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/Mapping/AbstractMappingTest.php (renamed from apps/user_ldap/tests/mapping/abstractmappingtest.php) | 2 | ||||
-rw-r--r-- | apps/user_ldap/tests/Mapping/GroupMappingTest.php (renamed from apps/user_ldap/tests/mapping/groupmapping.php) | 8 | ||||
-rw-r--r-- | apps/user_ldap/tests/Mapping/UserMappingTest.php (renamed from apps/user_ldap/tests/mapping/usermapping.php) | 8 | ||||
-rw-r--r-- | apps/user_ldap/tests/User/ManagerTest.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/tests/User/UserTest.php | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/WizardTest.php | 9 |
32 files changed, 61 insertions, 66 deletions
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/AccessTest.php index b1401b7c9bb..97012f8c720 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -23,19 +23,19 @@ * */ -namespace OCA\user_ldap\tests; +namespace OCA\User_LDAP\Tests; use OCA\User_LDAP\Access; use OCA\User_LDAP\Connection; /** - * Class Test_Access + * Class AccessTest * * @group DB * - * @package OCA\user_ldap\tests + * @package OCA\User_LDAP\Tests */ -class Test_Access extends \Test\TestCase { +class AccessTest extends \Test\TestCase { private function getConnectorAndLdapMock() { static $conMethods; static $accMethods; diff --git a/apps/user_ldap/tests/configuration.php b/apps/user_ldap/tests/ConfigurationTest.php index d4f1ce142bd..808a4c9ed04 100644 --- a/apps/user_ldap/tests/configuration.php +++ b/apps/user_ldap/tests/ConfigurationTest.php @@ -19,9 +19,9 @@ * */ -namespace OCA\user_ldap\tests; +namespace OCA\User_LDAP\Tests; -class Test_Configuration extends \Test\TestCase { +class ConfigurationTest extends \Test\TestCase { public function configurationDataProvider() { $inputWithDN = array( diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/ConnectionTest.php index 2c87d41cfa1..ad0bed240cc 100644 --- a/apps/user_ldap/tests/connection.php +++ b/apps/user_ldap/tests/ConnectionTest.php @@ -22,7 +22,7 @@ * */ -namespace OCA\user_ldap\tests; +namespace OCA\User_LDAP\Tests; use OCA\User_LDAP\Connection; /** @@ -30,9 +30,9 @@ use OCA\User_LDAP\Connection; * * @group DB * - * @package OCA\user_ldap\tests + * @package OCA\User_LDAP\Tests */ -class Test_Connection extends \Test\TestCase { +class ConnectionTest extends \Test\TestCase { /** @var \OCA\User_LDAP\ILDAPWrapper */ protected $ldap; diff --git a/apps/user_ldap/tests/GroupLDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index 57c22f8bda1..bf9f40a1b2f 100644 --- a/apps/user_ldap/tests/GroupLDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -35,9 +35,9 @@ use OCA\User_LDAP\Connection; * * @group DB * - * @package OCA\user_ldap\tests + * @package OCA\User_LDAP\Tests */ -class GroupLDAPTest extends \Test\TestCase { +class Group_LDAPTest extends \Test\TestCase { private function getAccessMock() { static $conMethods; static $accMethods; diff --git a/apps/user_ldap/tests/integration/abstractintegrationtest.php b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php index 7b3d7b171c4..a736956ebf2 100644 --- a/apps/user_ldap/tests/integration/abstractintegrationtest.php +++ b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\user_ldap\tests\integration; +namespace OCA\User_LDAP\Tests\Integration; use OCA\User_LDAP\Access; use OCA\User_LDAP\Connection; diff --git a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php index 007c1116d05..fd3edcbf0c0 100644 --- a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php +++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php @@ -19,6 +19,9 @@ * */ +namespace OCA\User_LDAP\Tests\Integration; + + use OC\ServerNotAvailableException; use OCA\User_LDAP\LDAP; diff --git a/apps/user_ldap/tests/integration/fakemanager.php b/apps/user_ldap/tests/Integration/FakeManager.php index 6d67e98fb48..11f270dba01 100644 --- a/apps/user_ldap/tests/integration/fakemanager.php +++ b/apps/user_ldap/tests/Integration/FakeManager.php @@ -19,7 +19,7 @@ * */ -namespace OCA\user_ldap\tests\integration; +namespace OCA\User_LDAP\Tests\Integration; /** * Class FakeManager diff --git a/apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php index 829dc2e0a48..d058540bd4c 100644 --- a/apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php @@ -19,10 +19,10 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\User_LDAP\Connection; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; + +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; require_once __DIR__ . '/../../../../../lib/base.php'; diff --git a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php index 450032de9a7..ccd9b251bfc 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php @@ -19,15 +19,15 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; require_once __DIR__ . '/../../../../../lib/base.php'; -class IntegrationBackupServer extends AbstractIntegrationTest { +class IntegrationTestBackupServer extends AbstractIntegrationTest { /** @var UserMapping */ protected $mapping; diff --git a/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php index 587811eb13c..89afcaa4b90 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php @@ -19,10 +19,10 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; use OCA\User_LDAP\Mapping\UserMapping; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; require_once __DIR__ . '/../../../../../lib/base.php'; diff --git a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php index e453c52b2ca..3ada556bbea 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php @@ -19,16 +19,15 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\User_LDAP\User\Manager as LDAPUserManager; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; require_once __DIR__ . '/../../../../../lib/base.php'; -class IntegrationConnect extends AbstractIntegrationTest { +class IntegrationTestConnect extends AbstractIntegrationTest { /** @var UserMapping */ protected $mapping; diff --git a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php index bf46cfeffa1..5f4fd6f572f 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php @@ -19,16 +19,13 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\User_LDAP\User\Manager as LDAPUserManager; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; -use OCA\User_LDAP\Mapping\UserMapping; -use OCA\User_LDAP\User_LDAP; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; require_once __DIR__ . '/../../../../../lib/base.php'; -class IntegrationTestUserHome extends AbstractIntegrationTest { +class IntegrationTestCountUsersByLoginName extends AbstractIntegrationTest { /** * prepares the LDAP environment and sets up a test configuration for diff --git a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php index 9713f26ba72..f2dbd7393f3 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php @@ -19,16 +19,15 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\User_LDAP\User\Manager as LDAPUserManager; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; require_once __DIR__ . '/../../../../../lib/base.php'; -class IntegrationTestUserHome extends AbstractIntegrationTest { +class IntegrationTestFetchUsersByLoginName extends AbstractIntegrationTest { /** @var UserMapping */ protected $mapping; diff --git a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php index 1de0a4d059b..72cc3e459b7 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php @@ -19,10 +19,9 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\User_LDAP\User\Manager as LDAPUserManager; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php index 751cb99600c..8538fd2f964 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php @@ -19,10 +19,10 @@ * */ -namespace OCA\user_ldap\tests\integration\lib; +namespace OCA\User_LDAP\Tests\Integration\Lib; use OCA\User_LDAP\User\Manager as LDAPUserManager; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_LDAP; diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php index 195862226b7..5f555956ea2 100644 --- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php +++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php @@ -21,9 +21,11 @@ * */ +namespace OCA\User_LDAP\Tests\Integration\Lib\User; + use OCA\User_LDAP\User\User; use OCA\User_LDAP\Mapping\UserMapping; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; require_once __DIR__ . '/../../../../../../lib/base.php'; @@ -41,7 +43,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest { $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); $this->mapping->clear(); $this->access->setUserMapper($this->mapping); - $userBackend = new OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig()); + $userBackend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig()); \OC_User::useBackend($userBackend); } diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php index d1c048b4d25..07ab2e287ca 100644 --- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php +++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php @@ -19,9 +19,10 @@ * */ -use OCA\User_LDAP\User\User; +namespace OCA\User_LDAP\Tests\Integration\Lib\User; + use OCA\User_LDAP\Mapping\UserMapping; -use OCA\user_ldap\tests\integration\AbstractIntegrationTest; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; require_once __DIR__ . '/../../../../../../lib/base.php'; @@ -39,7 +40,7 @@ class IntegrationTestUserDisplayName extends AbstractIntegrationTest { $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); $this->mapping->clear(); $this->access->setUserMapper($this->mapping); - $userBackend = new OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig()); + $userBackend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig()); \OC_User::useBackend($userBackend); } diff --git a/apps/user_ldap/tests/integration/data/avatar-invalid.gif b/apps/user_ldap/tests/Integration/data/avatar-invalid.gif Binary files differindex 000108834d8..000108834d8 100644 --- a/apps/user_ldap/tests/integration/data/avatar-invalid.gif +++ b/apps/user_ldap/tests/Integration/data/avatar-invalid.gif diff --git a/apps/user_ldap/tests/integration/data/avatar-valid.jpg b/apps/user_ldap/tests/Integration/data/avatar-valid.jpg Binary files differindex 61b5ec2e730..61b5ec2e730 100644 --- a/apps/user_ldap/tests/integration/data/avatar-valid.jpg +++ b/apps/user_ldap/tests/Integration/data/avatar-valid.jpg diff --git a/apps/user_ldap/tests/integration/readme.md b/apps/user_ldap/tests/Integration/readme.md index e20efef8fdc..e20efef8fdc 100644 --- a/apps/user_ldap/tests/integration/readme.md +++ b/apps/user_ldap/tests/Integration/readme.md diff --git a/apps/user_ldap/tests/integration/run-test.sh b/apps/user_ldap/tests/Integration/run-test.sh index 7a29db25670..7a29db25670 100755 --- a/apps/user_ldap/tests/integration/run-test.sh +++ b/apps/user_ldap/tests/Integration/run-test.sh diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroups.php index 57a304be057..57a304be057 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroups.php diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroupsDifferentOU.php index 62480c5160c..62480c5160c 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitGroupsDifferentOU.php diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitUsers.php index fb5609865c4..fb5609865c4 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createExplicitUsers.php diff --git a/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php b/apps/user_ldap/tests/Integration/setup-scripts/createUsersWithoutDisplayName.php index 687b1da91e1..687b1da91e1 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php +++ b/apps/user_ldap/tests/Integration/setup-scripts/createUsersWithoutDisplayName.php diff --git a/apps/user_ldap/tests/jobs/cleanup.php b/apps/user_ldap/tests/Jobs/CleanUpTest.php index 18d46071172..24f646bd90f 100644 --- a/apps/user_ldap/tests/jobs/cleanup.php +++ b/apps/user_ldap/tests/Jobs/CleanUpTest.php @@ -20,9 +20,9 @@ * */ -namespace OCA\user_ldap\tests; +namespace OCA\User_LDAP\Tests\Jobs; -class Test_CleanUp extends \PHPUnit_Framework_TestCase { +class CleanUpTest extends \Test\TestCase { public function getMocks() { $mocks = array(); $mocks['userBackend'] = diff --git a/apps/user_ldap/tests/mapping/abstractmappingtest.php b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php index a931a07a44c..b800862d2c1 100644 --- a/apps/user_ldap/tests/mapping/abstractmappingtest.php +++ b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\user_ldap\tests\mapping; +namespace OCA\User_LDAP\Tests\Mapping; abstract class AbstractMappingTest extends \Test\TestCase { abstract public function getMapper(\OCP\IDBConnection $dbMock); diff --git a/apps/user_ldap/tests/mapping/groupmapping.php b/apps/user_ldap/tests/Mapping/GroupMappingTest.php index e25fae9329f..5cdb9d463b2 100644 --- a/apps/user_ldap/tests/mapping/groupmapping.php +++ b/apps/user_ldap/tests/Mapping/GroupMappingTest.php @@ -21,18 +21,18 @@ * */ -namespace OCA\user_ldap\tests\mapping; +namespace OCA\User_LDAP\Tests\Mapping; use OCA\User_LDAP\Mapping\GroupMapping; /** - * Class Test_GroupMapping + * Class GroupMappingTest * * @group DB * - * @package OCA\user_ldap\tests\mapping + * @package OCA\User_LDAP\Tests\Mapping */ -class Test_GroupMapping extends AbstractMappingTest { +class GroupMappingTest extends AbstractMappingTest { public function getMapper(\OCP\IDBConnection $dbMock) { return new GroupMapping($dbMock); } diff --git a/apps/user_ldap/tests/mapping/usermapping.php b/apps/user_ldap/tests/Mapping/UserMappingTest.php index 6138740b81a..90618962393 100644 --- a/apps/user_ldap/tests/mapping/usermapping.php +++ b/apps/user_ldap/tests/Mapping/UserMappingTest.php @@ -21,18 +21,18 @@ * */ -namespace OCA\user_ldap\tests\mapping; +namespace OCA\User_LDAP\Tests\Mapping; use OCA\User_LDAP\Mapping\UserMapping; /** - * Class Test_UserMapping + * Class UserMappingTest * * @group DB * - * @package OCA\user_ldap\tests\mapping + * @package OCA\User_LDAP\Tests\Mapping */ -class Test_UserMapping extends AbstractMappingTest { +class UserMappingTest extends AbstractMappingTest { public function getMapper(\OCP\IDBConnection $dbMock) { return new UserMapping($dbMock); } diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php index 09eff64b9b1..848918729d7 100644 --- a/apps/user_ldap/tests/User/ManagerTest.php +++ b/apps/user_ldap/tests/User/ManagerTest.php @@ -32,7 +32,7 @@ use OCA\User_LDAP\User\Manager; * * @group DB * - * @package OCA\user_ldap\tests + * @package OCA\User_LDAP\Tests\User */ class ManagerTest extends \Test\TestCase { diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 12ebc7227a1..7362348c326 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -28,11 +28,11 @@ use OCA\User_LDAP\User\User; use OCP\IUserManager; /** - * Class Test_User_User + * Class UserTest * * @group DB * - * @package OCA\user_ldap\tests + * @package OCA\User_LDAP\Tests\User */ class UserTest extends \Test\TestCase { diff --git a/apps/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php index d6ee5a473b2..7a4a478d43a 100644 --- a/apps/user_ldap/tests/WizardTest.php +++ b/apps/user_ldap/tests/WizardTest.php @@ -23,21 +23,16 @@ * */ -namespace OCA\User_LDAP\tests; +namespace OCA\User_LDAP\Tests; use \OCA\User_LDAP\Wizard; -// use \OCA\User_LDAP\User_LDAP as UserLDAP; -// use \OCA\User_LDAP\Access; -// use \OCA\User_LDAP\Configuration; -// use \OCA\User_LDAP\ILDAPWrapper; - /** * Class Test_Wizard * * @group DB * - * @package OCA\User_LDAP\tests + * @package OCA\User_LDAP\Tests */ class WizardTest extends \Test\TestCase { protected function setUp() { |