diff --git a/tests/core/command/config/app/deleteconfigtest.php b/tests/Core/Command/Config/App/DeleteConfigTest.php
similarity index 100%
rename from tests/core/command/config/app/deleteconfigtest.php
rename to tests/Core/Command/Config/App/DeleteConfigTest.php
diff --git a/tests/core/command/config/app/getconfigtest.php b/tests/Core/Command/Config/App/GetConfigTest.php
similarity index 100%
rename from tests/core/command/config/app/getconfigtest.php
rename to tests/Core/Command/Config/App/GetConfigTest.php
diff --git a/tests/core/command/config/app/setconfigtest.php b/tests/Core/Command/Config/App/SetConfigTest.php
similarity index 100%
rename from tests/core/command/config/app/setconfigtest.php
rename to tests/Core/Command/Config/App/SetConfigTest.php
diff --git a/tests/core/command/config/importtest.php b/tests/Core/Command/Config/ImportTest.php
similarity index 100%
rename from tests/core/command/config/importtest.php
rename to tests/Core/Command/Config/ImportTest.php
diff --git a/tests/core/command/config/listconfigstest.php b/tests/Core/Command/Config/ListConfigsTest.php
similarity index 100%
rename from tests/core/command/config/listconfigstest.php
rename to tests/Core/Command/Config/ListConfigsTest.php
diff --git a/tests/core/command/config/system/deleteconfigtest.php b/tests/Core/Command/Config/System/DeleteConfigTest.php
similarity index 100%
rename from tests/core/command/config/system/deleteconfigtest.php
rename to tests/Core/Command/Config/System/DeleteConfigTest.php
diff --git a/tests/core/command/config/system/getconfigtest.php b/tests/Core/Command/Config/System/GetConfigTest.php
similarity index 100%
rename from tests/core/command/config/system/getconfigtest.php
rename to tests/Core/Command/Config/System/GetConfigTest.php
diff --git a/tests/core/command/config/system/setconfigtest.php b/tests/Core/Command/Config/System/SetConfigTest.php
similarity index 100%
rename from tests/core/command/config/system/setconfigtest.php
rename to tests/Core/Command/Config/System/SetConfigTest.php
diff --git a/tests/core/command/encryption/changekeystorageroottest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
similarity index 100%
rename from tests/core/command/encryption/changekeystorageroottest.php
rename to tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
diff --git a/tests/core/command/encryption/decryptalltest.php b/tests/Core/Command/Encryption/DecryptAllTest.php
similarity index 100%
rename from tests/core/command/encryption/decryptalltest.php
rename to tests/Core/Command/Encryption/DecryptAllTest.php
diff --git a/tests/core/command/encryption/disabletest.php b/tests/Core/Command/Encryption/DisableTest.php
similarity index 100%
rename from tests/core/command/encryption/disabletest.php
rename to tests/Core/Command/Encryption/DisableTest.php
diff --git a/tests/core/command/encryption/enabletest.php b/tests/Core/Command/Encryption/EnableTest.php
similarity index 100%
rename from tests/core/command/encryption/enabletest.php
rename to tests/Core/Command/Encryption/EnableTest.php
diff --git a/tests/core/command/encryption/encryptalltest.php b/tests/Core/Command/Encryption/EncryptAllTest.php
similarity index 100%
rename from tests/core/command/encryption/encryptalltest.php
rename to tests/Core/Command/Encryption/EncryptAllTest.php
diff --git a/tests/core/command/encryption/setdefaultmoduletest.php b/tests/Core/Command/Encryption/SetDefaultModuleTest.php
similarity index 100%
rename from tests/core/command/encryption/setdefaultmoduletest.php
rename to tests/Core/Command/Encryption/SetDefaultModuleTest.php
diff --git a/tests/core/command/log/managetest.php b/tests/Core/Command/Log/ManageTest.php
similarity index 100%
rename from tests/core/command/log/managetest.php
rename to tests/Core/Command/Log/ManageTest.php
diff --git a/tests/core/command/log/owncloudtest.php b/tests/Core/Command/Log/OwnCloudTest.php
similarity index 100%
rename from tests/core/command/log/owncloudtest.php
rename to tests/Core/Command/Log/OwnCloudTest.php
diff --git a/tests/core/command/maintenance/datafingerprinttest.php b/tests/Core/Command/Maintenance/DataFingerprintTest.php
similarity index 100%
rename from tests/core/command/maintenance/datafingerprinttest.php
rename to tests/Core/Command/Maintenance/DataFingerprintTest.php
diff --git a/tests/core/command/maintenance/mimetype/updatedbtest.php b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php
similarity index 100%
rename from tests/core/command/maintenance/mimetype/updatedbtest.php
rename to tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php
diff --git a/tests/core/command/maintenance/singleusertest.php b/tests/Core/Command/Maintenance/SingleUserTest.php
similarity index 100%
rename from tests/core/command/maintenance/singleusertest.php
rename to tests/Core/Command/Maintenance/SingleUserTest.php
diff --git a/tests/core/command/user/deletetest.php b/tests/Core/Command/User/DeleteTest.php
similarity index 100%
rename from tests/core/command/user/deletetest.php
rename to tests/Core/Command/User/DeleteTest.php
diff --git a/tests/core/command/user/lastseentest.php b/tests/Core/Command/User/LastSeenTest.php
similarity index 100%
rename from tests/core/command/user/lastseentest.php
rename to tests/Core/Command/User/LastSeenTest.php
diff --git a/tests/core/controller/avatarcontrollertest.php b/tests/Core/Controller/AvatarControllerTest.php
similarity index 93%
rename from tests/core/controller/avatarcontrollertest.php
rename to tests/Core/Controller/AvatarControllerTest.php
index c99b69228b1d4e36e4f29f2d2a60744a7f05c0f1..937d8aaf17b66b2fd381fe0a85bfa2b527e3933a 100644
--- a/tests/core/controller/avatarcontrollertest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -18,13 +18,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
-namespace OC\Core\Controller;
-use OC;
+namespace Tests\Core\Controller;
+
use OC\Core\Application;
use OCP\AppFramework\IAppContainer;
use OCP\AppFramework\Http;
-use OCP\Files\Folder;
use OCP\Files\File;
use OCP\Files\NotFoundException;
use OCP\IUser;
@@ -52,7 +51,7 @@ class AvatarControllerTest extends \Test\TestCase {
/** @var IAppContainer */
private $container;
- /** @var AvatarController */
+ /** @var \OC\Core\Controller\AvatarController */
private $avatarController;
/** @var IAvatar */
private $avatarMock;
@@ -228,7 +227,7 @@ class AvatarControllerTest extends \Test\TestCase {
* Fetch tmp avatar
*/
public function testTmpAvatarValid() {
- $this->container['Cache']->method('get')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$response = $this->avatarController->getTmpAvatar();
$this->assertEquals(Http::STATUS_OK, $response->getStatus());
@@ -250,14 +249,14 @@ class AvatarControllerTest extends \Test\TestCase {
public function testPostAvatarFile() {
//Create temp file
$fileName = tempnam(null, "avatarTest");
- $copyRes = copy(OC::$SERVERROOT.'/tests/data/testimage.jpg', $fileName);
+ $copyRes = copy(\OC::$SERVERROOT.'/tests/data/testimage.jpg', $fileName);
$this->assertTrue($copyRes);
//Create file in cache
- $this->container['Cache']->method('get')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
//Create request return
- $reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [filesize(OC::$SERVERROOT.'/tests/data/testimage.jpg')]];
+ $reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [filesize(\OC::$SERVERROOT.'/tests/data/testimage.jpg')]];
$this->container['Request']->method('getUploadedFile')->willReturn($reqRet);
$response = $this->avatarController->postAvatar(null);
@@ -288,14 +287,14 @@ class AvatarControllerTest extends \Test\TestCase {
public function testPostAvatarFileGif() {
//Create temp file
$fileName = tempnam(null, "avatarTest");
- $copyRes = copy(OC::$SERVERROOT.'/tests/data/testimage.gif', $fileName);
+ $copyRes = copy(\OC::$SERVERROOT.'/tests/data/testimage.gif', $fileName);
$this->assertTrue($copyRes);
//Create file in cache
- $this->container['Cache']->method('get')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'));
+ $this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.gif'));
//Create request return
- $reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => filesize(OC::$SERVERROOT.'/tests/data/testimage.gif')];
+ $reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => filesize(\OC::$SERVERROOT.'/tests/data/testimage.gif')];
$this->container['Request']->method('getUploadedFile')->willReturn($reqRet);
$response = $this->avatarController->postAvatar(null);
@@ -313,7 +312,7 @@ class AvatarControllerTest extends \Test\TestCase {
//Mock node API call
$file = $this->getMockBuilder('OCP\Files\File')
->disableOriginalConstructor()->getMock();
- $file->method('getContent')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $file->method('getContent')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$this->container['UserFolder']->method('get')->willReturn($file);
//Create request return
@@ -349,7 +348,7 @@ class AvatarControllerTest extends \Test\TestCase {
->will($this->throwException(new \Exception("foo")));
$file = $this->getMockBuilder('OCP\Files\File')
->disableOriginalConstructor()->getMock();
- $file->method('getContent')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $file->method('getContent')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$this->container['UserFolder']->method('get')->willReturn($file);
$this->container['Logger']->expects($this->once())
@@ -382,7 +381,7 @@ class AvatarControllerTest extends \Test\TestCase {
* Test with non square crop
*/
public function testPostCroppedAvatarNoSquareCrop() {
- $this->container['Cache']->method('get')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$this->avatarMock->method('set')->will($this->throwException(new \OC\NotSquareException));
$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
@@ -395,7 +394,7 @@ class AvatarControllerTest extends \Test\TestCase {
* Check for proper reply on proper crop argument
*/
public function testPostCroppedAvatarValidCrop() {
- $this->container['Cache']->method('get')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
$response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 10]);
@@ -407,7 +406,7 @@ class AvatarControllerTest extends \Test\TestCase {
* Test what happens if the cropping of the avatar fails
*/
public function testPostCroppedAvatarException() {
- $this->container['Cache']->method('get')->willReturn(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$this->avatarMock->method('set')->will($this->throwException(new \Exception('foo')));
$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
@@ -424,7 +423,7 @@ class AvatarControllerTest extends \Test\TestCase {
* Check for proper reply on proper crop argument
*/
public function testFileTooBig() {
- $fileName = OC::$SERVERROOT.'/tests/data/testimage.jpg';
+ $fileName = \OC::$SERVERROOT.'/tests/data/testimage.jpg';
//Create request return
$reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [21*1024*1024]];
$this->container['Request']->method('getUploadedFile')->willReturn($reqRet);
diff --git a/tests/core/controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
similarity index 99%
rename from tests/core/controller/LoginControllerTest.php
rename to tests/Core/Controller/LoginControllerTest.php
index 139d48ad7dac26b0a007c18fee9fe7cd67bdcc5c..32902a01530373a04c2146d1b0d4440cf2f588e9 100644
--- a/tests/core/controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -19,8 +19,9 @@
*
*/
-namespace OC\Core\Controller;
+namespace Tests\Core\Controller;
+use OC\Core\Controller\LoginController;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
diff --git a/tests/core/controller/lostcontrollertest.php b/tests/Core/Controller/LostControllerTest.php
similarity index 99%
rename from tests/core/controller/lostcontrollertest.php
rename to tests/Core/Controller/LostControllerTest.php
index 44bc539247f542218ec1cc363ff6244bb763486e..ca63c3404eb696a3c42a874fa12700e19d741976 100644
--- a/tests/core/controller/lostcontrollertest.php
+++ b/tests/Core/Controller/LostControllerTest.php
@@ -19,8 +19,9 @@
*
*/
-namespace OC\Core\Controller;
+namespace Tests\Core\Controller;
+use OC\Core\Controller\LostController;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IConfig;
diff --git a/tests/core/controller/TokenControllerTest.php b/tests/Core/Controller/TokenControllerTest.php
similarity index 97%
rename from tests/core/controller/TokenControllerTest.php
rename to tests/Core/Controller/TokenControllerTest.php
index 4635f96f48f5c113d5945a0e9d00964d96fba03b..b600bfa5451bdc72f2ca87749f80921cbc56f090 100644
--- a/tests/core/controller/TokenControllerTest.php
+++ b/tests/Core/Controller/TokenControllerTest.php
@@ -20,9 +20,10 @@
*
*/
-namespace OC\Core\Controller;
+namespace Tests\Core\Controller;
use OC\AppFramework\Http;
+use OC\Core\Controller\TokenController;
use OCP\AppFramework\Http\Response;
use Test\TestCase;
diff --git a/tests/core/templates/templates.php b/tests/Core/Templates/TemplatesTest.php
similarity index 94%
rename from tests/core/templates/templates.php
rename to tests/Core/Templates/TemplatesTest.php
index 338d80b276c3af1fb8bd29c23eb13ed2bb1d3225..03565411a13d315fa90ebf89bd02fc40f3f9b5e9 100644
--- a/tests/core/templates/templates.php
+++ b/tests/Core/Templates/TemplatesTest.php
@@ -2,7 +2,7 @@
namespace Tests\Core\Templates;
-class Templates extends \Test\TestCase {
+class TemplatesTest extends \Test\TestCase {
public function test403() {
$template = \OC::$SERVERROOT . '/core/templates/403.php';
diff --git a/tests/settings/controller/AppSettingsControllerTest.php b/tests/Settings/Controller/AppSettingsControllerTest.php
similarity index 98%
rename from tests/settings/controller/AppSettingsControllerTest.php
rename to tests/Settings/Controller/AppSettingsControllerTest.php
index dba5728ca4b3a22f669ac1c2b6c5006f46d01034..9dcc55e135bfd0db11168b0c35aa11be6abaa10e 100644
--- a/tests/settings/controller/AppSettingsControllerTest.php
+++ b/tests/Settings/Controller/AppSettingsControllerTest.php
@@ -19,8 +19,9 @@
*
*/
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
+use OC\Settings\Controller\AppSettingsController;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\TemplateResponse;
@@ -36,7 +37,7 @@ use OC\OCSClient;
/**
* Class AppSettingsControllerTest
*
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class AppSettingsControllerTest extends TestCase {
/** @var AppSettingsController */
diff --git a/tests/settings/controller/CertificateControllerTest.php b/tests/Settings/Controller/CertificateControllerTest.php
similarity index 97%
rename from tests/settings/controller/CertificateControllerTest.php
rename to tests/Settings/Controller/CertificateControllerTest.php
index 2fdbbb8b0acca31addc16d06aae9c9cabc7d1f26..c9ea2a4024fba3823010c1d6089d60c6cf1e3f01 100644
--- a/tests/settings/controller/CertificateControllerTest.php
+++ b/tests/Settings/Controller/CertificateControllerTest.php
@@ -19,8 +19,9 @@
*
*/
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
+use OC\Settings\Controller\CertificateController;
use OCP\App\IAppManager;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
@@ -31,7 +32,7 @@ use OCP\ICertificateManager;
/**
* Class CertificateControllerTest
*
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class CertificateControllerTest extends \Test\TestCase {
/** @var CertificateController */
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
similarity index 99%
rename from tests/settings/controller/CheckSetupControllerTest.php
rename to tests/Settings/Controller/CheckSetupControllerTest.php
index 3ce7c64b4a3a36f3271ad8da64a05f2621ae6e77..f48e9c04f3d1833a6b3016dbc54410ea69abd530 100644
--- a/tests/settings/controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -19,8 +19,9 @@
*
*/
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
+use OC\Settings\Controller\CheckSetupController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Http\DataResponse;
@@ -47,7 +48,7 @@ function version_compare($version1, $version2) {
/**
* Class CheckSetupControllerTest
*
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class CheckSetupControllerTest extends TestCase {
/** @var int */
diff --git a/tests/settings/controller/EncryptionControllerTest.php b/tests/Settings/Controller/EncryptionControllerTest.php
similarity index 97%
rename from tests/settings/controller/EncryptionControllerTest.php
rename to tests/Settings/Controller/EncryptionControllerTest.php
index 565aaf29c9af2c9b2f0b84933f0f7fb85d3d5118..adbbe2cf6a40ecef6ef1a5f155c3336d4b793830 100644
--- a/tests/settings/controller/EncryptionControllerTest.php
+++ b/tests/Settings/Controller/EncryptionControllerTest.php
@@ -19,10 +19,11 @@
*
*/
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
use OC\DB\Connection;
use OC\Files\View;
+use OC\Settings\Controller\EncryptionController;
use OCP\IConfig;
use OCP\IL10N;
use OCP\ILogger;
@@ -33,7 +34,7 @@ use Test\TestCase;
/**
* Class EncryptionControllerTest
*
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class EncryptionControllerTest extends TestCase {
/** @var IRequest */
diff --git a/tests/settings/controller/groupscontrollertest.php b/tests/Settings/Controller/GroupsControllerTest.php
similarity index 98%
rename from tests/settings/controller/groupscontrollertest.php
rename to tests/Settings/Controller/GroupsControllerTest.php
index 82b4c7d3c05bbf1361b91c08eb4c32044424ac32..70cb8282b261fab44996717603226f1ea2b078ea 100644
--- a/tests/settings/controller/groupscontrollertest.php
+++ b/tests/Settings/Controller/GroupsControllerTest.php
@@ -7,16 +7,18 @@
* later.
* See the COPYING-README file.
*/
-namespace OC\Settings\Controller;
+
+namespace Tests\Settings\Controller;
use OC\Group\Group;
use OC\Group\MetaData;
use \OC\Settings\Application;
+use OC\Settings\Controller\GroupsController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
/**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class GroupsControllerTest extends \Test\TestCase {
diff --git a/tests/settings/controller/logsettingscontrollertest.php b/tests/Settings/Controller/LogSettingsControllerTest.php
similarity index 95%
rename from tests/settings/controller/logsettingscontrollertest.php
rename to tests/Settings/Controller/LogSettingsControllerTest.php
index 60680ba4647237e67f251d1a21b45b8017e30d6a..092c04aecc7aabcc27bb5caf915470ff1865afb3 100644
--- a/tests/settings/controller/logsettingscontrollertest.php
+++ b/tests/Settings/Controller/LogSettingsControllerTest.php
@@ -7,13 +7,14 @@
* later.
* See the COPYING-README file.
*/
-namespace Test\Settings\Controller;
+
+namespace Tests\Settings\Controller;
use \OC\Settings\Application;
use OC\Settings\Controller\LogSettingsController;
/**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class LogSettingsControllerTest extends \Test\TestCase {
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/Settings/Controller/MailSettingsControllerTest.php
similarity index 98%
rename from tests/settings/controller/mailsettingscontrollertest.php
rename to tests/Settings/Controller/MailSettingsControllerTest.php
index cc25fda52f7a7014ec88413ec66ef6ed0c05ef3e..1ac6bae69eacd15ec500f035431ce58eeb647941 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/Settings/Controller/MailSettingsControllerTest.php
@@ -7,12 +7,13 @@
* later.
* See the COPYING-README file.
*/
-namespace OC\Settings\Controller;
-use \OC\Settings\Application;
+namespace Tests\Settings\Controller;
+
+use OC\Settings\Application;
/**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class MailSettingsControllerTest extends \Test\TestCase {
diff --git a/tests/settings/controller/securitysettingscontrollertest.php b/tests/Settings/Controller/SecuritySettingsControllerTest.php
similarity index 93%
rename from tests/settings/controller/securitysettingscontrollertest.php
rename to tests/Settings/Controller/SecuritySettingsControllerTest.php
index 56848d8df3099b9ddc2825083a3f92501b1b7306..11b0edcae237de80c8aa5ff6f221d33e58abe071 100644
--- a/tests/settings/controller/securitysettingscontrollertest.php
+++ b/tests/Settings/Controller/SecuritySettingsControllerTest.php
@@ -7,12 +7,13 @@
* later.
* See the COPYING-README file.
*/
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
use \OC\Settings\Application;
+use OC\Settings\Controller\SecuritySettingsController;
/**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/settings/controller/userscontrollertest.php b/tests/Settings/Controller/UsersControllerTest.php
similarity index 99%
rename from tests/settings/controller/userscontrollertest.php
rename to tests/Settings/Controller/UsersControllerTest.php
index 2a2b53d8ff863b9382c02db3487c0ca241591d71..244d1f744d3d0fbf4f2bf9bd57ef6c25ae7b3a0c 100644
--- a/tests/settings/controller/userscontrollertest.php
+++ b/tests/Settings/Controller/UsersControllerTest.php
@@ -7,7 +7,8 @@
* later.
* See the COPYING-README file.
*/
-namespace OC\Settings\Controller;
+
+namespace Tests\Settings\Controller;
use \OC\Settings\Application;
use OCP\AppFramework\Http;
@@ -16,7 +17,7 @@ use OCP\AppFramework\Http\DataResponse;
/**
* @group DB
*
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
*/
class UsersControllerTest extends \Test\TestCase {
diff --git a/tests/settings/middleware/subadminmiddlewaretest.php b/tests/Settings/Middleware/SubadminMiddlewareTest.php
similarity index 96%
rename from tests/settings/middleware/subadminmiddlewaretest.php
rename to tests/Settings/Middleware/SubadminMiddlewareTest.php
index c16c21c9c10c34c317e2c5015146322cbcf04565..652f8b2d151be7d62138e4ae3000942644aafa66 100644
--- a/tests/settings/middleware/subadminmiddlewaretest.php
+++ b/tests/Settings/Middleware/SubadminMiddlewareTest.php
@@ -8,10 +8,11 @@
* See the COPYING-README file.
*/
-namespace OC\Settings\Middleware;
+namespace Tests\Settings\Middleware;
use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
use OC\AppFramework\Utility\ControllerMethodReflector;
+use OC\Settings\Middleware\SubadminMiddleware;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
@@ -19,7 +20,7 @@ use OCP\AppFramework\Http\TemplateResponse;
* Verifies whether an user has at least subadmin rights.
* To bypass use the `@NoSubadminRequired` annotation
*
- * @package OC\Settings\Middleware
+ * @package Tests\Settings\Middleware
*/
class SubadminMiddlewareTest extends \Test\TestCase {
/** @var SubadminMiddleware */