Move tests/settings to PSR-4
This commit is contained in:
parent
392bc0c6b9
commit
c58d174616
|
@ -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\ContentSecurityPolicy;
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
use OCP\AppFramework\Http\TemplateResponse;
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
|
@ -36,7 +37,7 @@ use OC\OCSClient;
|
||||||
/**
|
/**
|
||||||
* Class AppSettingsControllerTest
|
* Class AppSettingsControllerTest
|
||||||
*
|
*
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class AppSettingsControllerTest extends TestCase {
|
class AppSettingsControllerTest extends TestCase {
|
||||||
/** @var AppSettingsController */
|
/** @var AppSettingsController */
|
|
@ -19,8 +19,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Settings\Controller;
|
namespace Tests\Settings\Controller;
|
||||||
|
|
||||||
|
use OC\Settings\Controller\CertificateController;
|
||||||
use OCP\App\IAppManager;
|
use OCP\App\IAppManager;
|
||||||
use OCP\AppFramework\Http;
|
use OCP\AppFramework\Http;
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
|
@ -31,7 +32,7 @@ use OCP\ICertificateManager;
|
||||||
/**
|
/**
|
||||||
* Class CertificateControllerTest
|
* Class CertificateControllerTest
|
||||||
*
|
*
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class CertificateControllerTest extends \Test\TestCase {
|
class CertificateControllerTest extends \Test\TestCase {
|
||||||
/** @var CertificateController */
|
/** @var CertificateController */
|
|
@ -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;
|
||||||
use OCP\AppFramework\Http\DataDisplayResponse;
|
use OCP\AppFramework\Http\DataDisplayResponse;
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
|
@ -47,7 +48,7 @@ function version_compare($version1, $version2) {
|
||||||
/**
|
/**
|
||||||
* Class CheckSetupControllerTest
|
* Class CheckSetupControllerTest
|
||||||
*
|
*
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class CheckSetupControllerTest extends TestCase {
|
class CheckSetupControllerTest extends TestCase {
|
||||||
/** @var int */
|
/** @var int */
|
|
@ -19,10 +19,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Settings\Controller;
|
namespace Tests\Settings\Controller;
|
||||||
|
|
||||||
use OC\DB\Connection;
|
use OC\DB\Connection;
|
||||||
use OC\Files\View;
|
use OC\Files\View;
|
||||||
|
use OC\Settings\Controller\EncryptionController;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IL10N;
|
use OCP\IL10N;
|
||||||
use OCP\ILogger;
|
use OCP\ILogger;
|
||||||
|
@ -33,7 +34,7 @@ use Test\TestCase;
|
||||||
/**
|
/**
|
||||||
* Class EncryptionControllerTest
|
* Class EncryptionControllerTest
|
||||||
*
|
*
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class EncryptionControllerTest extends TestCase {
|
class EncryptionControllerTest extends TestCase {
|
||||||
/** @var IRequest */
|
/** @var IRequest */
|
|
@ -7,16 +7,18 @@
|
||||||
* later.
|
* later.
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
namespace OC\Settings\Controller;
|
|
||||||
|
namespace Tests\Settings\Controller;
|
||||||
|
|
||||||
use OC\Group\Group;
|
use OC\Group\Group;
|
||||||
use OC\Group\MetaData;
|
use OC\Group\MetaData;
|
||||||
use \OC\Settings\Application;
|
use \OC\Settings\Application;
|
||||||
|
use OC\Settings\Controller\GroupsController;
|
||||||
use OCP\AppFramework\Http;
|
use OCP\AppFramework\Http;
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class GroupsControllerTest extends \Test\TestCase {
|
class GroupsControllerTest extends \Test\TestCase {
|
||||||
|
|
|
@ -7,13 +7,14 @@
|
||||||
* later.
|
* later.
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
namespace Test\Settings\Controller;
|
|
||||||
|
namespace Tests\Settings\Controller;
|
||||||
|
|
||||||
use \OC\Settings\Application;
|
use \OC\Settings\Application;
|
||||||
use OC\Settings\Controller\LogSettingsController;
|
use OC\Settings\Controller\LogSettingsController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class LogSettingsControllerTest extends \Test\TestCase {
|
class LogSettingsControllerTest extends \Test\TestCase {
|
||||||
|
|
|
@ -7,12 +7,13 @@
|
||||||
* later.
|
* later.
|
||||||
* See the COPYING-README file.
|
* 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 {
|
class MailSettingsControllerTest extends \Test\TestCase {
|
||||||
|
|
|
@ -7,12 +7,13 @@
|
||||||
* later.
|
* later.
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
namespace OC\Settings\Controller;
|
namespace Tests\Settings\Controller;
|
||||||
|
|
||||||
use \OC\Settings\Application;
|
use \OC\Settings\Application;
|
||||||
|
use OC\Settings\Controller\SecuritySettingsController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase {
|
class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase {
|
||||||
|
|
|
@ -7,7 +7,8 @@
|
||||||
* later.
|
* later.
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
namespace OC\Settings\Controller;
|
|
||||||
|
namespace Tests\Settings\Controller;
|
||||||
|
|
||||||
use \OC\Settings\Application;
|
use \OC\Settings\Application;
|
||||||
use OCP\AppFramework\Http;
|
use OCP\AppFramework\Http;
|
||||||
|
@ -16,7 +17,7 @@ use OCP\AppFramework\Http\DataResponse;
|
||||||
/**
|
/**
|
||||||
* @group DB
|
* @group DB
|
||||||
*
|
*
|
||||||
* @package OC\Settings\Controller
|
* @package Tests\Settings\Controller
|
||||||
*/
|
*/
|
||||||
class UsersControllerTest extends \Test\TestCase {
|
class UsersControllerTest extends \Test\TestCase {
|
||||||
|
|
|
@ -8,10 +8,11 @@
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Settings\Middleware;
|
namespace Tests\Settings\Middleware;
|
||||||
|
|
||||||
use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
|
use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
|
||||||
use OC\AppFramework\Utility\ControllerMethodReflector;
|
use OC\AppFramework\Utility\ControllerMethodReflector;
|
||||||
|
use OC\Settings\Middleware\SubadminMiddleware;
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
use OCP\AppFramework\Http\TemplateResponse;
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
|
|
||||||
|
@ -19,7 +20,7 @@ use OCP\AppFramework\Http\TemplateResponse;
|
||||||
* Verifies whether an user has at least subadmin rights.
|
* Verifies whether an user has at least subadmin rights.
|
||||||
* To bypass use the `@NoSubadminRequired` annotation
|
* To bypass use the `@NoSubadminRequired` annotation
|
||||||
*
|
*
|
||||||
* @package OC\Settings\Middleware
|
* @package Tests\Settings\Middleware
|
||||||
*/
|
*/
|
||||||
class SubadminMiddlewareTest extends \Test\TestCase {
|
class SubadminMiddlewareTest extends \Test\TestCase {
|
||||||
/** @var SubadminMiddleware */
|
/** @var SubadminMiddleware */
|
Loading…
Reference in New Issue