diff --git a/apps/dav/tests/unit/bootstrap.php b/apps/dav/tests/unit/bootstrap.php index 28f6b971dec378149bb6709b14feb9970d36c0b9..b6ea48ec9036ef9f496cb14e95578d285a3f2e58 100644 --- a/apps/dav/tests/unit/bootstrap.php +++ b/apps/dav/tests/unit/bootstrap.php @@ -1,6 +1,8 @@ <?php -define('PHPUNIT_RUN', 1); +if (!defined('PHPUNIT_RUN')) { + define('PHPUNIT_RUN', 1); +} require_once __DIR__.'/../../../../lib/base.php'; diff --git a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php b/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php index e1bcc996908b39177d34abde8d8991a79d5bab76..1a973a28ed42dc66bf2a24b8a3deb7882bb75de5 100644 --- a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php +++ b/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php @@ -8,6 +8,14 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre; * later. * See the COPYING-README file. */ + +/** + * Class CustomPropertiesBackend + * + * @group DB + * + * @package Tests\Connector\Sabre + */ class CustomPropertiesBackend extends \Test\TestCase { /** diff --git a/apps/dav/tests/unit/connector/sabre/file.php b/apps/dav/tests/unit/connector/sabre/file.php index 0a52299cec7ebd51f199bab378db2f06e33776bf..2a6cf46ef1627b0018ffa71a3315461571c76bfd 100644 --- a/apps/dav/tests/unit/connector/sabre/file.php +++ b/apps/dav/tests/unit/connector/sabre/file.php @@ -14,6 +14,13 @@ use Test\HookHelper; use OC\Files\Filesystem; use OCP\Lock\ILockingProvider; +/** + * Class File + * + * @group DB + * + * @package Test\Connector\Sabre + */ class File extends \Test\TestCase { /** diff --git a/apps/dav/tests/unit/connector/sabre/objecttree.php b/apps/dav/tests/unit/connector/sabre/objecttree.php index 3a56404e552ac3380d346e43552744293d81ca39..1cea4ff0b696caa58133e6d3155f494f5473480e 100644 --- a/apps/dav/tests/unit/connector/sabre/objecttree.php +++ b/apps/dav/tests/unit/connector/sabre/objecttree.php @@ -41,6 +41,13 @@ class TestDoubleFileView extends \OC\Files\View { } } +/** + * Class ObjectTree + * + * @group DB + * + * @package OCA\DAV\Tests\Unit\Connector\Sabre + */ class ObjectTree extends \Test\TestCase { /** diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php index 245deff3b318d7fcb806bc49845e07a255ab9b6c..29454c38218a51d2d503ff702dbc932da4dd07ee 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php @@ -11,6 +11,13 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; use OCP\AppFramework\Http; use OCP\Lock\ILockingProvider; +/** + * Class DownloadTest + * + * @group DB + * + * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest + */ class DownloadTest extends RequestTest { public function testDownload() { $user = $this->getUniqueID(); diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php index ed1d6046d757445bc92b82edd8b92dd886cb2251..b79dfa0c2659fae1a8aa2860a7c19f618d3ac4eb 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php @@ -11,6 +11,13 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; use OC\Files\View; use Test\Traits\EncryptionTrait; +/** + * Class EncryptionUploadTest + * + * @group DB + * + * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest + */ class EncryptionUploadTest extends UploadTest { use EncryptionTrait; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php index a2a8326f4ff9f1712b6ea20a3fb3fe487942e9b4..c1876a7f29f202cdee387b253d6e9c1599728a6c 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php +++ b/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php @@ -12,6 +12,13 @@ use OC\Connector\Sabre\Exception\FileLocked; use OCP\AppFramework\Http; use OCP\Lock\ILockingProvider; +/** + * Class UploadTest + * + * @group DB + * + * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest + */ class UploadTest extends RequestTest { public function testBasicUpload() { $user = $this->getUniqueID(); diff --git a/apps/federation/tests/backgroundjob/getsharedsecrettest.php b/apps/federation/tests/backgroundjob/getsharedsecrettest.php index 953af5ff3e103d2fd3c679dd39278e110e9598cc..cb3a294713a1149af30c5af792438853ab4382e2 100644 --- a/apps/federation/tests/backgroundjob/getsharedsecrettest.php +++ b/apps/federation/tests/backgroundjob/getsharedsecrettest.php @@ -34,6 +34,13 @@ use OCP\Http\Client\IResponse; use OCP\ILogger; use OCP\IURLGenerator; +/** + * Class GetSharedSecretTest + * + * @group DB + * + * @package OCA\Federation\Tests\BackgroundJob + */ class GetSharedSecretTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | IClient */ diff --git a/apps/files/tests/command/deleteorphanedfilestest.php b/apps/files/tests/command/deleteorphanedfilestest.php index a667dba99fc1217693c4d88e327762c30a6fc124..18f568036e44dc45f3cfa17cbcc36991d949936d 100644 --- a/apps/files/tests/command/deleteorphanedfilestest.php +++ b/apps/files/tests/command/deleteorphanedfilestest.php @@ -25,6 +25,13 @@ namespace OCA\Files\Tests\Command; use OCA\Files\Command\DeleteOrphanedFiles; use OCP\Files\StorageNotAvailableException; +/** + * Class DeleteOrphanedFilesTest + * + * @group DB + * + * @package OCA\Files\Tests\Command + */ class DeleteOrphanedFilesTest extends \Test\TestCase { /** diff --git a/apps/files/tests/service/tagservice.php b/apps/files/tests/service/tagservice.php index 147e698aaaa2d2c9b983e8972fc9c2019a9ef2ae..36da3edc61e7c1a3524c3eb188246db35dd1a369 100644 --- a/apps/files/tests/service/tagservice.php +++ b/apps/files/tests/service/tagservice.php @@ -22,6 +22,13 @@ namespace OCA\Files; use \OCA\Files\Service\TagService; +/** + * Class TagServiceTest + * + * @group DB + * + * @package OCA\Files + */ class TagServiceTest extends \Test\TestCase { /** diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php index 3eba5bca644c09960d320ec6632cd0c793621628..33fb6119a92a346602472fbd4d687239475e4116 100644 --- a/apps/files_external/tests/amazons3migration.php +++ b/apps/files_external/tests/amazons3migration.php @@ -25,6 +25,13 @@ namespace Test\Files\Storage; +/** + * Class AmazonS3Migration + * + * @group DB + * + * @package Test\Files\Storage + */ class AmazonS3Migration extends \Test\TestCase { /** diff --git a/apps/files_external/tests/backends/amazons3.php b/apps/files_external/tests/backends/amazons3.php index c16581a4495037b7ed9bfc90d99459ebbec2230c..e1465b51125adbce9a307a7db9bcd2db601f7f70 100644 --- a/apps/files_external/tests/backends/amazons3.php +++ b/apps/files_external/tests/backends/amazons3.php @@ -25,6 +25,13 @@ namespace Test\Files\Storage; +/** + * Class AmazonS3 + * + * @group DB + * + * @package Test\Files\Storage + */ class AmazonS3 extends Storage { private $config; diff --git a/apps/files_external/tests/backends/dropbox.php b/apps/files_external/tests/backends/dropbox.php index 8765011532cda86cb4da9e198d726a20e21b2076..8dd0e58adc1f299ed24a138182b1e9f66225f4b2 100644 --- a/apps/files_external/tests/backends/dropbox.php +++ b/apps/files_external/tests/backends/dropbox.php @@ -25,6 +25,13 @@ namespace Test\Files\Storage; +/** + * Class Dropbox + * + * @group DB + * + * @package Test\Files\Storage + */ class Dropbox extends Storage { private $config; diff --git a/apps/files_external/tests/backends/ftp.php b/apps/files_external/tests/backends/ftp.php index 20a5c275d29157acffdba8e35dfb988ff0473c10..b715f0f780d28c148881fb39afb8d988bddf04a3 100644 --- a/apps/files_external/tests/backends/ftp.php +++ b/apps/files_external/tests/backends/ftp.php @@ -26,6 +26,13 @@ namespace Test\Files\Storage; +/** + * Class FTP + * + * @group DB + * + * @package Test\Files\Storage + */ class FTP extends Storage { private $config; diff --git a/apps/files_external/tests/backends/google.php b/apps/files_external/tests/backends/google.php index 6ff235ac6af0e0154ac4dc72b250642ccdfa79b8..c9a5d48382c1d2d2b6d3716b58dca6b9124fb895 100644 --- a/apps/files_external/tests/backends/google.php +++ b/apps/files_external/tests/backends/google.php @@ -28,6 +28,13 @@ namespace Test\Files\Storage; require_once 'files_external/lib/google.php'; +/** + * Class Google + * + * @group DB + * + * @package Test\Files\Storage + */ class Google extends Storage { private $config; diff --git a/apps/files_external/tests/backends/owncloud.php b/apps/files_external/tests/backends/owncloud.php index 47e27870be20ac32671443ac520d4afcfb41e01a..d51fa638c508053d3dd24a24a6d190fbc9127d40 100644 --- a/apps/files_external/tests/backends/owncloud.php +++ b/apps/files_external/tests/backends/owncloud.php @@ -23,6 +23,13 @@ namespace Test\Files\Storage; +/** + * Class OwnCloud + * + * @group DB + * + * @package Test\Files\Storage + */ class OwnCloud extends Storage { private $config; diff --git a/apps/files_external/tests/backends/sftp.php b/apps/files_external/tests/backends/sftp.php index aaed2b3460ad6151d5f769f8832828510e53d3ee..03f2dcc0d7764caedd7a3646006b395d58b2b534 100644 --- a/apps/files_external/tests/backends/sftp.php +++ b/apps/files_external/tests/backends/sftp.php @@ -25,6 +25,13 @@ namespace Test\Files\Storage; +/** + * Class SFTP + * + * @group DB + * + * @package Test\Files\Storage + */ class SFTP extends Storage { /** * @var \OC\Files\Storage\SFTP instance diff --git a/apps/files_external/tests/backends/sftp_key.php b/apps/files_external/tests/backends/sftp_key.php index 6e8ac9f723911a9f58bf1584f8bea70f99e79e2e..762cb0887c190cc420044926f690c32915b998c4 100644 --- a/apps/files_external/tests/backends/sftp_key.php +++ b/apps/files_external/tests/backends/sftp_key.php @@ -23,6 +23,13 @@ namespace Test\Files\Storage; +/** + * Class SFTP_Key + * + * @group DB + * + * @package Test\Files\Storage + */ class SFTP_Key extends Storage { private $config; diff --git a/apps/files_external/tests/backends/smb.php b/apps/files_external/tests/backends/smb.php index 0da86cb824f6c10ff13b4399ff8f2f09fbfd0e82..0c43aba24dd83e78a3bfda3cc26d9d36370ef12e 100644 --- a/apps/files_external/tests/backends/smb.php +++ b/apps/files_external/tests/backends/smb.php @@ -24,6 +24,13 @@ namespace Test\Files\Storage; +/** + * Class SMB + * + * @group DB + * + * @package Test\Files\Storage + */ class SMB extends Storage { protected function setUp() { diff --git a/apps/files_external/tests/backends/swift.php b/apps/files_external/tests/backends/swift.php index 07ee36043b18a029e94e69adb277b151c5d44c27..b71b4f77add66c6e47e43bc139ff6bac5927462c 100644 --- a/apps/files_external/tests/backends/swift.php +++ b/apps/files_external/tests/backends/swift.php @@ -25,6 +25,13 @@ namespace Test\Files\Storage; +/** + * Class Swift + * + * @group DB + * + * @package Test\Files\Storage + */ class Swift extends Storage { private $config; diff --git a/apps/files_external/tests/backends/webdav.php b/apps/files_external/tests/backends/webdav.php index e2020da7c72dc8a814d3e501b5500a019aa1a964..130e0c99cb387d19364a2ffec7526e97112f7004 100644 --- a/apps/files_external/tests/backends/webdav.php +++ b/apps/files_external/tests/backends/webdav.php @@ -24,6 +24,13 @@ namespace Test\Files\Storage; +/** + * Class DAV + * + * @group DB + * + * @package Test\Files\Storage + */ class DAV extends Storage { protected function setUp() { diff --git a/apps/files_external/tests/etagpropagator.php b/apps/files_external/tests/etagpropagator.php index d45982cb40ca7233a6b7d96b7501f06a1f0a2c28..ff3c63add207bf9abeb762dcc515fb3611f0af47 100644 --- a/apps/files_external/tests/etagpropagator.php +++ b/apps/files_external/tests/etagpropagator.php @@ -26,6 +26,13 @@ namespace Tests\Files_External; use OC\Files\Filesystem; use OC\User\User; +/** + * Class EtagPropagator + * + * @group DB + * + * @package Tests\Files_External + */ class EtagPropagator extends \Test\TestCase { protected function getUser() { return new User($this->getUniqueID(), null); diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php index 4cfe83db9505292ee761a50aa05c4f3f1d861b90..887dd91539b2312d953316a2b739dffbf7f96fd3 100644 --- a/apps/files_external/tests/owncloudfunctions.php +++ b/apps/files_external/tests/owncloudfunctions.php @@ -24,6 +24,13 @@ namespace Test\Files\Storage; +/** + * Class OwnCloudFunctions + * + * @group DB + * + * @package Test\Files\Storage + */ class OwnCloudFunctions extends \Test\TestCase { function configUrlProvider() { diff --git a/apps/files_sharing/tests/activity.php b/apps/files_sharing/tests/activity.php index f7f324cdfc30129684fb1ddd2c5f5f4292c29828..fa626749957c8690ca90c1ee9aeb69e4b5eb7497 100644 --- a/apps/files_sharing/tests/activity.php +++ b/apps/files_sharing/tests/activity.php @@ -22,10 +22,15 @@ */ namespace OCA\Files_sharing\Tests; -use OCA\Files_sharing\Tests\TestCase; - -class Activity extends \OCA\Files_Sharing\Tests\TestCase{ +/** + * Class Activity + * + * @group DB + * + * @package OCA\Files_sharing\Tests + */ +class Activity extends \OCA\Files_Sharing\Tests\TestCase { /** * @var \OCA\Files_Sharing\Activity diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 760bc0591e5672cee43ff1dbbae206ba0b7546c6..36ae33983931fabcf3d6d6212ff7b91a4e49794c 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -31,6 +31,8 @@ use OCA\Files_sharing\Tests\TestCase; /** * Class Test_Files_Sharing_Api + * + * @group DB */ class Test_Files_Sharing_Api extends TestCase { diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php index 8a35350aeb568f7d01c672f40f28098d20fae9b4..7db6580813f7a1e1cf2355672c0f2f8fca69cdbe 100644 --- a/apps/files_sharing/tests/api/shareestest.php +++ b/apps/files_sharing/tests/api/shareestest.php @@ -27,6 +27,13 @@ use OCA\Files_sharing\Tests\TestCase; use OCP\AppFramework\Http; use OCP\Share; +/** + * Class ShareesTest + * + * @group DB + * + * @package OCA\Files_Sharing\Tests\API + */ class ShareesTest extends TestCase { /** @var Sharees */ protected $sharees; diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php index 1332342c44bc5ffb028a8e32333157e6a9fa144d..57cdfc45115e0e9a9ba1946927c868e06991a44e 100644 --- a/apps/files_sharing/tests/backend.php +++ b/apps/files_sharing/tests/backend.php @@ -27,6 +27,8 @@ use OCA\Files_sharing\Tests\TestCase; /** * Class Test_Files_Sharing + * + * @group DB */ class Test_Files_Sharing_Backend extends TestCase { diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php index 7e7e5ee26d5c5776d9504c96fcfe90aeceaf3176..df7f4fd19a3ddfa042455ba6af85f7bfc76f6a0c 100644 --- a/apps/files_sharing/tests/cache.php +++ b/apps/files_sharing/tests/cache.php @@ -47,6 +47,12 @@ use OCA\Files_sharing\Tests\TestCase; * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ + +/** + * Class Test_Files_Sharing_Cache + * + * @group DB + */ class Test_Files_Sharing_Cache extends TestCase { /** diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php index 8bebde9f2d151c5b6aaca710332e9e58e0e0a0a9..6fb76f10c2443c2f331d35237c08bc140ab44dd1 100644 --- a/apps/files_sharing/tests/capabilities.php +++ b/apps/files_sharing/tests/capabilities.php @@ -26,6 +26,8 @@ use OCA\Files_Sharing\Tests\TestCase; /** * Class FilesSharingCapabilitiesTest + * + * @group DB */ class FilesSharingCapabilitiesTest extends \Test\TestCase { diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index db5eb75d7610c236d3c0c80843067b4a4a4161b8..ccef4263c2b029293e4a016b45a7a797dc07c22a 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -38,6 +38,8 @@ use OCP\Share; use OC\URLGenerator; /** + * @group DB + * * @package OCA\Files_Sharing\Controllers */ class ShareControllerTest extends \Test\TestCase { diff --git a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php index 124cb83e6f06b845beaa4b5295a882d3a69f988f..a2e3f36f6ac396c52df40d2d99a43e5cf2675af9 100644 --- a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php +++ b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php @@ -23,6 +23,13 @@ namespace Test\BackgroundJob; use OCA\Files_sharing\Lib\DeleteOrphanedSharesJob; +/** + * Class DeleteOrphanedSharesJobTest + * + * @group DB + * + * @package Test\BackgroundJob + */ class DeleteOrphanedSharesJobTest extends \Test\TestCase { /** diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php index 2a33732d63ff7f23ffbe93c3ed47ed1d9c4cb914..de9ce565394d204518695e194c89c1b23adbcfc8 100644 --- a/apps/files_sharing/tests/etagpropagation.php +++ b/apps/files_sharing/tests/etagpropagation.php @@ -27,6 +27,13 @@ namespace OCA\Files_sharing\Tests; use OC\Files\Filesystem; use OC\Files\View; +/** + * Class EtagPropagation + * + * @group DB + * + * @package OCA\Files_sharing\Tests + */ class EtagPropagation extends TestCase { /** * @var \OC\Files\View diff --git a/apps/files_sharing/tests/expiresharesjobtest.php b/apps/files_sharing/tests/expiresharesjobtest.php index 63a2c46f6470ce29d230b270eb613bee0942d761..b21d095e6b1432431df9f7435d0addebea8591b3 100644 --- a/apps/files_sharing/tests/expiresharesjobtest.php +++ b/apps/files_sharing/tests/expiresharesjobtest.php @@ -23,6 +23,13 @@ namespace OCA\Files_Sharing\Tests; use OCA\Files_Sharing\ExpireSharesJob; +/** + * Class ExpireSharesJobTest + * + * @group DB + * + * @package OCA\Files_Sharing\Tests + */ class ExpireSharesJobTest extends \Test\TestCase { /** diff --git a/apps/files_sharing/tests/external/cache.php b/apps/files_sharing/tests/external/cache.php index aa3839899cede7af24337d036d859ed7b3266933..e44c935d3fd64cedaf070ba0430933cd647bcd6d 100644 --- a/apps/files_sharing/tests/external/cache.php +++ b/apps/files_sharing/tests/external/cache.php @@ -23,24 +23,11 @@ namespace OCA\Files_sharing\Tests\External; use OCA\Files_sharing\Tests\TestCase; /** - * ownCloud + * Class Cache * - * @author Vincent Petry - * @copyright 2015 Vincent Petry <pvince81@owncloud.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * @group DB * + * @package OCA\Files_sharing\Tests\External */ class Cache extends TestCase { diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php index 5b93b7494e99f91f09d04ae131a93719b44cd839..015be47270e7f9c29e5838c352d141ba46737cbe 100644 --- a/apps/files_sharing/tests/external/managertest.php +++ b/apps/files_sharing/tests/external/managertest.php @@ -28,6 +28,13 @@ use OCA\Files_Sharing\External\MountProvider; use OCA\Files_Sharing\Tests\TestCase; use Test\Traits\UserTrait; +/** + * Class ManagerTest + * + * @group DB + * + * @package OCA\Files_Sharing\Tests\External + */ class ManagerTest extends TestCase { use UserTrait; diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php index a549e093dc1110da5c4877b489ef2a063f3dbe4b..109545119bac6fb3d0b8edf47112c3841e63f891 100644 --- a/apps/files_sharing/tests/externalstorage.php +++ b/apps/files_sharing/tests/externalstorage.php @@ -24,6 +24,8 @@ /** * Tests for the external Storage class for remote shares. + * + * @group DB */ class Test_Files_Sharing_External_Storage extends \Test\TestCase { diff --git a/apps/files_sharing/tests/helper.php b/apps/files_sharing/tests/helper.php index 34a1389db77ab3ea1a53948f485f61b035abf8b0..1a4a9ee78341bcfa5d3b74ede8f66b434ddcdc30 100644 --- a/apps/files_sharing/tests/helper.php +++ b/apps/files_sharing/tests/helper.php @@ -24,26 +24,10 @@ use OCA\Files_sharing\Tests\TestCase; /** - * ownCloud - * - * @author Bjoern Schiessle - * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * Class Test_Files_Sharing_Helper * + * @group DB */ - class Test_Files_Sharing_Helper extends TestCase { /** diff --git a/apps/files_sharing/tests/locking.php b/apps/files_sharing/tests/locking.php index ae1fcf30a53655397f30b47ce921a441874ed963..3b8900f206148bca84569a25546c4c4ac0988fff 100644 --- a/apps/files_sharing/tests/locking.php +++ b/apps/files_sharing/tests/locking.php @@ -27,6 +27,13 @@ use OC\Files\View; use OC\Lock\MemcacheLockingProvider; use OCP\Lock\ILockingProvider; +/** + * Class Locking + * + * @group DB + * + * @package OCA\Files_sharing\Tests + */ class Locking extends TestCase { /** * @var \Test\Util\User\Dummy diff --git a/apps/files_sharing/tests/migrationtest.php b/apps/files_sharing/tests/migrationtest.php index 522181fbb231aff8d65b3d40e64a686c54b13a7c..49d76126eb239ce164d86964f67bec2cd4c2f9d7 100644 --- a/apps/files_sharing/tests/migrationtest.php +++ b/apps/files_sharing/tests/migrationtest.php @@ -24,6 +24,11 @@ use OCA\Files_Sharing\Tests\TestCase; use OCA\Files_Sharing\Migration; +/** + * Class MigrationTest + * + * @group DB + */ class MigrationTest extends TestCase { /** diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php index 80e727b7178684c2f966001b7204b6daa9f20bd6..4261ede7a7615160054a868012d740382f451524 100644 --- a/apps/files_sharing/tests/permissions.php +++ b/apps/files_sharing/tests/permissions.php @@ -26,7 +26,11 @@ use OC\Files\Cache\Cache; use OC\Files\Storage\Storage; use OC\Files\View; - +/** + * Class Test_Files_Sharing_Permissions + * + * @group DB + */ class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase { /** diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php index 300c637c777f6873b6167b0226cbac414b156bea..a0f0e18b769e9f6398420fefbcfcc06e4c79a5c1 100644 --- a/apps/files_sharing/tests/server2server.php +++ b/apps/files_sharing/tests/server2server.php @@ -26,6 +26,8 @@ use OCA\Files_Sharing\Tests\TestCase; /** * Class Test_Files_Sharing_Api + * + * @group DB */ class Test_Files_Sharing_S2S_OCS_API extends TestCase { diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php index 896191dfe516f78c0785cf428e11639726eff220..b5ba0e3ad5136c7837b11a70177baf25885190a8 100644 --- a/apps/files_sharing/tests/share.php +++ b/apps/files_sharing/tests/share.php @@ -27,6 +27,8 @@ use OCA\Files\Share; /** * Class Test_Files_Sharing + * + * @group DB */ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase { diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index 94c0ad448bcbb0f69abd9f20cf1ec79cbc94cdd7..7b256588f936687c75fc4d342554ebba073dc9f3 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -27,6 +27,8 @@ /** * Class Test_Files_Sharing_Api + * + * @group DB */ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php index 3361d2cbd1216849437e92ce10c9d27c344afeea..0d4a6b56307b05d86f56a430e3c957a15664f47c 100644 --- a/apps/files_sharing/tests/sharedstorage.php +++ b/apps/files_sharing/tests/sharedstorage.php @@ -28,6 +28,8 @@ use OCA\Files\Share; /** * Class Test_Files_Sharing_Api + * + * @group DB */ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase { diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php index 1d09f69449fff4bb8264a2ab26811e8f10ba5fd2..535a475276c9ad0c7bfbc770857fa9189cd56445 100644 --- a/apps/files_sharing/tests/sizepropagation.php +++ b/apps/files_sharing/tests/sizepropagation.php @@ -24,6 +24,13 @@ namespace OCA\Files_sharing\Tests; use OC\Files\View; +/** + * Class SizePropagation + * + * @group DB + * + * @package OCA\Files_sharing\Tests + */ class SizePropagation extends TestCase { public function testSizePropagationWhenOwnerChangesFile() { diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index 6a72a34149ad53eb2210ba47f30d62befece233c..dc5b8ed79d9ca81035f428021d7811369a33a89d 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -36,6 +36,8 @@ use OCA\Files_Sharing\Appinfo\Application; /** * Class Test_Files_Sharing_Base * + * @group DB + * * Base class for sharing tests. */ abstract class TestCase extends \Test\TestCase { diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php index c57070ba6412ea92f8ed1b89540e9f34dc499c0b..8de735363d19cb6fc7dd611b07d408cc7795622b 100644 --- a/apps/files_sharing/tests/unsharechildren.php +++ b/apps/files_sharing/tests/unsharechildren.php @@ -26,6 +26,13 @@ namespace OCA\Files_sharing\Tests; use OCA\Files\Share; +/** + * Class UnshareChildren + * + * @group DB + * + * @package OCA\Files_sharing\Tests + */ class UnshareChildren extends TestCase { protected $subsubfolder; diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php index 63ab452a5e141ad2dcbbee373f05b1e1e043da21..312734523b56640ea2622fe5894f5a477d9fb224 100644 --- a/apps/files_sharing/tests/updater.php +++ b/apps/files_sharing/tests/updater.php @@ -25,6 +25,8 @@ /** * Class Test_Files_Sharing_Updater + * + * @group DB */ class Test_Files_Sharing_Updater extends OCA\Files_Sharing\Tests\TestCase { diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php index 5e96a3fe68e473e034d76d4e2b8ea1bb51099769..6443be664a7ae0de57b6fa141f8ce420de381582 100644 --- a/apps/files_sharing/tests/watcher.php +++ b/apps/files_sharing/tests/watcher.php @@ -25,6 +25,11 @@ * */ +/** + * Class Test_Files_Sharing_Watcher + * + * @group DB + */ class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase { /** diff --git a/apps/files_trashbin/tests/command/cleanuptest.php b/apps/files_trashbin/tests/command/cleanuptest.php index e928f55eb8b0c5330735e0645e2b65eb0b4b9af5..82084a2d525faf63679b3057bedd06d23d9121b4 100644 --- a/apps/files_trashbin/tests/command/cleanuptest.php +++ b/apps/files_trashbin/tests/command/cleanuptest.php @@ -29,6 +29,13 @@ use Test\TestCase; use OC\User\Manager; use OCP\Files\IRootFolder; +/** + * Class CleanUpTest + * + * @group DB + * + * @package OCA\Files_Trashbin\Tests\Command + */ class CleanUpTest extends TestCase { /** @var CleanUp */ diff --git a/apps/files_trashbin/tests/command/expiretest.php b/apps/files_trashbin/tests/command/expiretest.php index 0d457db280743872c821c8eb8927c7f471734df3..463fca6080ea88954ba62e26bff00f9bfa22b652 100644 --- a/apps/files_trashbin/tests/command/expiretest.php +++ b/apps/files_trashbin/tests/command/expiretest.php @@ -24,6 +24,13 @@ namespace OCA\Files_Trashbin\Tests\Command; use OCA\Files_Trashbin\Command\Expire; use Test\TestCase; +/** + * Class ExpireTest + * + * @group DB + * + * @package OCA\Files_Trashbin\Tests\Command + */ class ExpireTest extends TestCase { public function testExpireNonExistingUser() { $command = new Expire('test'); diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php index 44b680f265c8bc6cadcd2ad2603f5d44005a8a2d..3ebbbc3ec9db487546e281bf1592c1d8cd2a6300 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/storage.php @@ -27,6 +27,13 @@ namespace OCA\Files_trashbin\Tests\Storage; use OC\Files\Storage\Temporary; use OC\Files\Filesystem; +/** + * Class Storage + * + * @group DB + * + * @package OCA\Files_trashbin\Tests\Storage + */ class Storage extends \Test\TestCase { /** * @var string diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index 934f831ef7473785b09cf3ee41f2080a26052d74..1b5e955d2b2172d5cc7e11b710c15e7b7435f31f 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -29,6 +29,8 @@ use OCA\Files_Trashbin; /** * Class Test_Encryption + * + * @group DB */ class Test_Trashbin extends \Test\TestCase { diff --git a/apps/files_versions/tests/command/cleanuptest.php b/apps/files_versions/tests/command/cleanuptest.php index bfde25d75ce6dd786446ffb2de8af4775d1ae60b..141213774c08afbfcf80737bfd90ef7e43a94482 100644 --- a/apps/files_versions/tests/command/cleanuptest.php +++ b/apps/files_versions/tests/command/cleanuptest.php @@ -28,6 +28,13 @@ use Test\TestCase; use OC\User\Manager; use OCP\Files\IRootFolder; +/** + * Class CleanupTest + * + * @group DB + * + * @package OCA\Files_Versions\Tests\Command + */ class CleanupTest extends TestCase { /** @var CleanUp */ diff --git a/apps/files_versions/tests/command/expiretest.php b/apps/files_versions/tests/command/expiretest.php index eccc1f4c2ad5789bfc4fa5bd17a2eefb87e6e6b1..5048ab1ef31db62e98c140f350a13cbd273bc090 100644 --- a/apps/files_versions/tests/command/expiretest.php +++ b/apps/files_versions/tests/command/expiretest.php @@ -25,6 +25,13 @@ namespace OCA\Files_Versions\Tests\Command; use OCA\Files_Versions\Command\Expire; use Test\TestCase; +/** + * Class ExpireTest + * + * @group DB + * + * @package OCA\Files_Versions\Tests\Command + */ class ExpireTest extends TestCase { public function testExpireNonExistingUser() { $command = new Expire($this->getUniqueID('test'), ''); diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php index 6ebbf830e70e8d1731746d12eb533c6ec2432a2f..ffc98c2e98ce6e915076049dc896653d101c5441 100644 --- a/apps/files_versions/tests/versions.php +++ b/apps/files_versions/tests/versions.php @@ -34,6 +34,8 @@ use OC\Files\Storage\Temporary; /** * Class Test_Files_versions * this class provide basic files versions test + * + * @group DB */ class Test_Files_Versioning extends \Test\TestCase { diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php index 2e1a86025c287489de63920551e74e8cd9b58497..4ccba704a3a777fdd25f56fc2fa6b30ca0454c1b 100644 --- a/apps/provisioning_api/tests/appstest.php +++ b/apps/provisioning_api/tests/appstest.php @@ -23,15 +23,35 @@ */ namespace OCA\Provisioning_API\Tests; +use OCA\Provisioning_API\Apps; +use OCP\API; +use OCP\App\IAppManager; +use OCP\IUserSession; +/** + * Class AppsTest + * + * @group DB + * + * @package OCA\Provisioning_API\Tests + */ class AppsTest extends TestCase { - + + /** @var IAppManager */ + private $appManager; + + /** @var Apps */ + private $api; + + /** @var IUserSession */ + private $userSession; + public function setup() { parent::setup(); $this->appManager = \OC::$server->getAppManager(); $this->groupManager = \OC::$server->getGroupManager(); $this->userSession = \OC::$server->getUserSession(); - $this->api = new \OCA\Provisioning_API\Apps($this->appManager); + $this->api = new Apps($this->appManager); } public function testGetAppInfo() { @@ -46,7 +66,7 @@ class AppsTest extends TestCase { $result = $this->api->getAppInfo(['appid' => 'not_provisioning_api']); $this->assertInstanceOf('OC_OCS_Result', $result); $this->assertFalse($result->succeeded()); - $this->assertEquals(\OCP\API::RESPOND_NOT_FOUND, $result->getStatusCode()); + $this->assertEquals(API::RESPOND_NOT_FOUND, $result->getStatusCode()); } diff --git a/apps/provisioning_api/tests/testcase.php b/apps/provisioning_api/tests/testcase.php index 113bc512243cc3b1d24050a79eef37bf4a310b69..0cbe0d89f8653104011a5afbab1f918dffa3cdba 100644 --- a/apps/provisioning_api/tests/testcase.php +++ b/apps/provisioning_api/tests/testcase.php @@ -23,10 +23,13 @@ namespace OCA\Provisioning_API\Tests; +use OCP\IUser; use OCP\IUserManager; use OCP\IGroupManager; abstract class TestCase extends \Test\TestCase { + + /** @var IUser[] */ protected $users = array(); /** @var IUserManager */ @@ -46,7 +49,7 @@ abstract class TestCase extends \Test\TestCase { /** * Generates a temp user * @param int $num number of users to generate - * @return IUser[]|Iuser + * @return IUser[]|IUser */ protected function generateUsers($num = 1) { $users = array(); diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index 25e871d9b3da89714e62fd723da25aa789a8296b..ef31a1037dd8970f4a42e841ae8e9207c6c624d5 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -28,6 +28,13 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_Access + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Access extends \Test\TestCase { private function getConnectorAndLdapMock() { static $conMethods; diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php index b0b4b78ce4d275cad19705d720e31686fca754f0..10a299a61b19fc7de4f53e64a8790b1011c90659 100644 --- a/apps/user_ldap/tests/connection.php +++ b/apps/user_ldap/tests/connection.php @@ -23,6 +23,13 @@ namespace OCA\user_ldap\tests; +/** + * Class Test_Connection + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Connection extends \Test\TestCase { public function testOriginalAgentUnchangedOnClone() { @@ -52,4 +59,4 @@ class Test_Connection extends \Test\TestCase { $this->assertSame($agentPawd, $agent['ldapAgentPassword']); } -} \ No newline at end of file +} diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index 6a6d5bc7ca1e2c684d84bf1f20f621456dfe5fc0..5362b97f216e89ac3299889e932e5ea98634bd95 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -30,6 +30,13 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_Group_Ldap + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Group_Ldap extends \Test\TestCase { private function getAccessMock() { static $conMethods; diff --git a/apps/user_ldap/tests/mapping/groupmapping.php b/apps/user_ldap/tests/mapping/groupmapping.php index e8fe655630ddec229c15d0d2371bb018fe94317f..f9136cf529073ed2e7ea355cc2db159ce8f6125f 100644 --- a/apps/user_ldap/tests/mapping/groupmapping.php +++ b/apps/user_ldap/tests/mapping/groupmapping.php @@ -24,6 +24,13 @@ namespace OCA\user_ldap\tests\mapping; use OCA\User_LDAP\Mapping\GroupMapping; +/** + * Class Test_GroupMapping + * + * @group DB + * + * @package OCA\user_ldap\tests\mapping + */ class Test_GroupMapping 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/usermapping.php index fa9311b405a94a8891d48dca5289a05ba7744edb..e84f5020231d5eac75bbbdb8055b0f60c5e21110 100644 --- a/apps/user_ldap/tests/mapping/usermapping.php +++ b/apps/user_ldap/tests/mapping/usermapping.php @@ -24,6 +24,13 @@ namespace OCA\user_ldap\tests\mapping; use OCA\User_LDAP\Mapping\UserMapping; +/** + * Class Test_UserMapping + * + * @group DB + * + * @package OCA\user_ldap\tests\mapping + */ class Test_UserMapping extends AbstractMappingTest { public function getMapper(\OCP\IDBConnection $dbMock) { return new UserMapping($dbMock); diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php index 98e48638d8b2d28cc534d67d7dbedb90959fa99e..d8602978a9d97d9f4616d1debcfedc232188cf17 100644 --- a/apps/user_ldap/tests/user/manager.php +++ b/apps/user_ldap/tests/user/manager.php @@ -26,6 +26,13 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\user\Manager; +/** + * Class Test_User_Manager + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_User_Manager extends \Test\TestCase { private function getTestInstances() { diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php index 19581d835d1f8769df8c9eb5a8136eb43af6a5f6..a5bb459d6fd9030addbf3e79e329598f297ceddf 100644 --- a/apps/user_ldap/tests/user/user.php +++ b/apps/user_ldap/tests/user/user.php @@ -25,6 +25,13 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\user\User; +/** + * Class Test_User_User + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_User_User extends \Test\TestCase { private function getTestInstances() { diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index 0f70c43fc11f30218a3589263b2733d580718aeb..7593371d85d1c845428d2b05e9090b8e5c5f8461 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -31,6 +31,13 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_User_Ldap_Direct + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_User_Ldap_Direct extends \Test\TestCase { protected $backend; protected $access; diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php index 7b0461878315df601752e11c5a21390082637f86..c29361096a150d43618a207e354078fac998e285 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/wizard.php @@ -31,6 +31,13 @@ use \OCA\user_ldap\lib\Wizard; // use \OCA\user_ldap\lib\Configuration; // use \OCA\user_ldap\lib\ILDAPWrapper; +/** + * Class Test_Wizard + * + * @group DB + * + * @package OCA\user_ldap\tests + */ class Test_Wizard extends \Test\TestCase { protected function setUp() { parent::setUp(); diff --git a/autotest.sh b/autotest.sh index f0efc45ccca7e22317587a4baf70c47afad6b07a..eb57264c9536b068e2ec1e1afccff8f4e5da7cf2 100755 --- a/autotest.sh +++ b/autotest.sh @@ -260,14 +260,23 @@ function execute_tests { if [[ "$_XDEBUG_CONFIG" ]]; then export XDEBUG_CONFIG=$_XDEBUG_CONFIG fi + GROUP='' + if [ "$TEST_SELECTION" == "DB" ]; then + GROUP='--group DB' + fi + if [ "$TEST_SELECTION" == "NODB" ]; then + GROUP='--exclude-group DB' + fi + + COVER='' if [ -z "$NOCOVERAGE" ]; then - "${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$DB.xml" --coverage-clover "autotest-clover-$DB.xml" --coverage-html "coverage-html-$DB" "$2" "$3" - RESULT=$? + COVER='--coverage-clover "autotest-clover-$DB.xml" --coverage-html "coverage-html-$DB"' else echo "No coverage" - "${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$DB.xml" "$2" "$3" - RESULT=$? fi + echo "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3" + "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3" + RESULT=$? if [ "$PRIMARY_STORAGE_CONFIG" == "swift" ] ; then cd .. diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 9147f5724610eec20a56ee0e692f935d42dc36d8..dda163e41a0c961add8aecb5991d52584fe5f6d7 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -105,6 +105,7 @@ class DAV extends Common { $this->secure = false; } if ($this->secure === true) { + // inject mock for testing $certPath = \OC_User::getHome(\OC_User::getUser()) . '/files_external/rootcerts.crt'; if (file_exists($certPath)) { $this->certPath = $certPath; diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 104cf7df596d552b23c5c00388f2432eaba8e7ed..428a222f9c7dae9f8958a75bad13966f746677a9 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -62,6 +62,7 @@ class URLGenerator implements IURLGenerator { * Returns a url to the given route. */ public function linkToRoute($route, $parameters = array()) { + // TODO: mock router $urlLinkTo = \OC::$server->getRouter()->generate($route, $parameters); return $urlLinkTo; } diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php index 948a432d2ed53e32630a27a96115c48c483e3a05..efe41763ff7d0ba6008517f5ef3b4bec74ed9dd1 100644 --- a/tests/core/avatar/avatarcontrollertest.php +++ b/tests/core/avatar/avatarcontrollertest.php @@ -44,6 +44,8 @@ function is_uploaded_file($filename) { /** * Class AvatarControllerTest * + * @group DB + * * @package OC\Core\Avatar */ class AvatarControllerTest extends \Test\TestCase { diff --git a/tests/lib/allconfig.php b/tests/lib/allconfig.php index 7f8ad5ec22171edace56b3bd207e88b72a87748a..ca3dce12eaffbbd2fff793318dccb21b5f363c79 100644 --- a/tests/lib/allconfig.php +++ b/tests/lib/allconfig.php @@ -8,6 +8,13 @@ namespace Test; +/** + * Class TestAllConfig + * + * @group DB + * + * @package Test + */ class TestAllConfig extends \Test\TestCase { /** @var \OCP\IDBConnection */ diff --git a/tests/lib/app.php b/tests/lib/app.php index bb972e7cf9a8dd05557349309b5f2e253188a9fa..1c38a1c161f3c0d0aba0b4fad6d96c72dd37a6b1 100644 --- a/tests/lib/app.php +++ b/tests/lib/app.php @@ -1,5 +1,4 @@ <?php - /** * Copyright (c) 2012 Bernhard Posselt <dev@bernhard-posselt.com> * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com> @@ -7,6 +6,12 @@ * later. * See the COPYING-README file. */ + +/** + * Class Test_App + * + * @group DB + */ class Test_App extends \Test\TestCase { const TEST_USER1 = 'user1'; diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php index 98420abe7bc32148499a18238c6e75d608ec4e57..64f0f80e045aaf54f43ef14695882e98a0f42057 100644 --- a/tests/lib/appconfig.php +++ b/tests/lib/appconfig.php @@ -11,6 +11,13 @@ namespace Test\Lib; use Test\TestCase; +/** + * Class AppConfig + * + * @group DB + * + * @package Test\Lib + */ class AppConfig extends TestCase { /** @var \OCP\IAppConfig */ protected $appConfig; diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php index 05190ca09b5852e78b8c167206cdadbdc875d7c7..7cba0e6db6b28e4d666b4a8b2217e8c370e5aacd 100644 --- a/tests/lib/appframework/AppTest.php +++ b/tests/lib/appframework/AppTest.php @@ -128,6 +128,7 @@ class AppTest extends \Test\TestCase { protected function tearDown() { rrmdir($this->appPath); + parent::tearDown(); } diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php index 0cbdddbb2051e2030d5eaedffda3dd642691be79..fc15b5a44ee56e8ece359802b5d3f0da53c8f8d7 100644 --- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php +++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php @@ -36,7 +36,9 @@ class DIContainerTest extends \Test\TestCase { protected function setUp(){ parent::setUp(); - $this->container = new DIContainer('name'); + $this->container = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', + ['isAdminUser'], ['name'] + ); $this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi')); } diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index badee9f34d13d997f680a391475c9414f2116d37..3fa7dc64547500dbc2ae27f2163b27cd186d158b 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -9,6 +9,11 @@ use OC\Avatar; +/** + * Class Test_Avatar + * + * @group DB + */ class Test_Avatar extends \Test\TestCase { private static $trashBinStatus; diff --git a/tests/lib/backgroundjob/joblist.php b/tests/lib/backgroundjob/joblist.php index b329c83009bf6a567bf36b2a861807734f07d82a..73b3255c0795ca4acd40e595ecdb756dcf53f2ea 100644 --- a/tests/lib/backgroundjob/joblist.php +++ b/tests/lib/backgroundjob/joblist.php @@ -9,8 +9,16 @@ namespace Test\BackgroundJob; use OCP\BackgroundJob\IJob; +use Test\TestCase; -class JobList extends \Test\TestCase { +/** + * Class JobList + * + * @group DB + * + * @package Test\BackgroundJob + */ +class JobList extends TestCase { /** * @var \OC\BackgroundJob\JobList */ diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index b5f186c5416171db336a3f9b959f474d001aba97..6db5acdf13f9e0a2619e2340314b8f542b4e4aee 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -22,6 +22,13 @@ namespace Test\Cache; +/** + * Class FileCache + * + * @group DB + * + * @package Test\Cache + */ class FileCache extends \Test_Cache { /** * @var string diff --git a/tests/lib/db.php b/tests/lib/db.php index 5c25bfb9a5ca3306b103d7f7b5d26c11a6b64bad..95eca4774b7dbad3e43038d969eef9c47ee2232f 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -6,6 +6,11 @@ * See the COPYING-README file. */ +/** + * Class Test_DB + * + * @group DB + */ class Test_DB extends \Test\TestCase { protected $backupGlobals = FALSE; diff --git a/tests/lib/db/connection.php b/tests/lib/db/connection.php index 720b448d0fbc72a05ea00478359f82dc089883d0..ab3b48b259fa767529a6d5d7a7308dfb3e1353a2 100644 --- a/tests/lib/db/connection.php +++ b/tests/lib/db/connection.php @@ -12,6 +12,13 @@ namespace Test\DB; use Doctrine\DBAL\Platforms\SqlitePlatform; use OC\DB\MDB2SchemaManager; +/** + * Class Connection + * + * @group DB + * + * @package Test\DB + */ class Connection extends \Test\TestCase { /** * @var \OCP\IDBConnection diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php index 8ce6febf3ac8cb297530c212cd8b681f4ed6c94d..e194e701d84748cc87ee1f501205112944fb8ad0 100644 --- a/tests/lib/db/mdb2schemamanager.php +++ b/tests/lib/db/mdb2schemamanager.php @@ -11,6 +11,13 @@ namespace Test\DB; use Doctrine\DBAL\Platforms\OraclePlatform; +/** + * Class MDB2SchemaManager + * + * @group DB + * + * @package Test\DB + */ class MDB2SchemaManager extends \Test\TestCase { protected function tearDown() { diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php index 4d5589097434a5cf036efac248e9a81bf18a3cbe..a50c5f1b864e4ac3763cf8879a08cbf5bb3ca56d 100644 --- a/tests/lib/db/migrator.php +++ b/tests/lib/db/migrator.php @@ -15,6 +15,13 @@ use \Doctrine\DBAL\Schema\Schema; use \Doctrine\DBAL\Schema\SchemaConfig; use OCP\IConfig; +/** + * Class Migrator + * + * @group DB + * + * @package Test\DB + */ class Migrator extends \Test\TestCase { /** * @var \Doctrine\DBAL\Connection $connection diff --git a/tests/lib/db/mysqlmigration.php b/tests/lib/db/mysqlmigration.php index 6c283e6c59cb6a9ab0a768ba4b24ab8f132279f2..50b9d91d4eece64bf3dfe55cc95523659c819fbc 100644 --- a/tests/lib/db/mysqlmigration.php +++ b/tests/lib/db/mysqlmigration.php @@ -6,6 +6,11 @@ * See the COPYING-README file. */ +/** + * Class TestMySqlMigration + * + * @group DB + */ class TestMySqlMigration extends \Test\TestCase { /** @var \Doctrine\DBAL\Connection */ diff --git a/tests/lib/db/querybuilder/expressionbuildertest.php b/tests/lib/db/querybuilder/expressionbuildertest.php index f041df01019f05a0efa77e82432f1d2b66ad6725..0563ff923345e34ed7c3531243dd93cc4b807d1e 100644 --- a/tests/lib/db/querybuilder/expressionbuildertest.php +++ b/tests/lib/db/querybuilder/expressionbuildertest.php @@ -24,6 +24,13 @@ namespace Test\DB\QueryBuilder; use Doctrine\DBAL\Query\Expression\ExpressionBuilder as DoctrineExpressionBuilder; use OC\DB\QueryBuilder\ExpressionBuilder; +/** + * Class ExpressionBuilderTest + * + * @group DB + * + * @package Test\DB\QueryBuilder + */ class ExpressionBuilderTest extends \Test\TestCase { /** @var ExpressionBuilder */ protected $expressionBuilder; diff --git a/tests/lib/db/querybuilder/querybuildertest.php b/tests/lib/db/querybuilder/querybuildertest.php index bbc45fc64f3efecbf5be070d24a2070a64018b56..ca3901ad049524f210b7466ccd8c3cbb49e8a866 100644 --- a/tests/lib/db/querybuilder/querybuildertest.php +++ b/tests/lib/db/querybuilder/querybuildertest.php @@ -27,6 +27,13 @@ use OC\DB\QueryBuilder\Parameter; use OC\DB\QueryBuilder\QueryBuilder; use OCP\IDBConnection; +/** + * Class QueryBuilderTest + * + * @group DB + * + * @package Test\DB\QueryBuilder + */ class QueryBuilderTest extends \Test\TestCase { /** @var QueryBuilder */ protected $queryBuilder; diff --git a/tests/lib/db/sqlitemigration.php b/tests/lib/db/sqlitemigration.php index 9206381ff711f74e7226ffc8fb1349e006634909..3674d452bae27738438f41d5c8c03a64790fd28d 100644 --- a/tests/lib/db/sqlitemigration.php +++ b/tests/lib/db/sqlitemigration.php @@ -6,6 +6,11 @@ * See the COPYING-README file. */ +/** + * Class TestSqliteMigration + * + * @group DB + */ class TestSqliteMigration extends \Test\TestCase { /** @var \Doctrine\DBAL\Connection */ diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index 97307664b6aaab745743b3c296bfa75050962e72..46d7559acc2c2e637d13c878648524289972dccd 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -9,6 +9,11 @@ use OCP\Security\ISecureRandom; +/** + * Class Test_DBSchema + * + * @group DB + */ class Test_DBSchema extends \Test\TestCase { protected $schema_file = 'static://test_db_scheme'; protected $schema_file2 = 'static://test_db_scheme2'; diff --git a/tests/lib/encryption/decryptalltest.php b/tests/lib/encryption/decryptalltest.php index ce5bcf1e5ae36173a62822dd763424ff63848581..85fbe3e0ed95408df016df4bc34e1b6c4af2f4b0 100644 --- a/tests/lib/encryption/decryptalltest.php +++ b/tests/lib/encryption/decryptalltest.php @@ -30,6 +30,13 @@ use OC\Files\View; use OCP\IUserManager; use Test\TestCase; +/** + * Class DecryptAllTest + * + * @group DB + * + * @package Test\Encryption + */ class DecryptAllTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | IUserManager */ diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php index c5395a97fd4ea649b4b5be48f94c32875ba086d0..503d25597cd83f1db4560758b169410b6dd84388 100644 --- a/tests/lib/files/cache/cache.php +++ b/tests/lib/files/cache/cache.php @@ -16,6 +16,13 @@ class LongId extends \OC\Files\Storage\Temporary { } } +/** + * Class Cache + * + * @group DB + * + * @package Test\Files\Cache + */ class Cache extends \Test\TestCase { /** * @var \OC\Files\Storage\Temporary $storage ; diff --git a/tests/lib/files/cache/changepropagator.php b/tests/lib/files/cache/changepropagator.php index 9108330eb9b9810771289414bf762e1c093035c1..6e9d9bfae75a1eff60eed5ca23b936d4bc24f9f8 100644 --- a/tests/lib/files/cache/changepropagator.php +++ b/tests/lib/files/cache/changepropagator.php @@ -12,6 +12,13 @@ use OC\Files\Filesystem; use OC\Files\Storage\Temporary; use OC\Files\View; +/** + * Class ChangePropagator + * + * @group DB + * + * @package Test\Files\Cache + */ class ChangePropagator extends \Test\TestCase { /** * @var \OC\Files\Cache\ChangePropagator diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php index 7ebb053bcfa5e9f4bca79922c2129d6f9768c022..3adb25fa9d445d437758d2ded307c8b9b1df19ba 100644 --- a/tests/lib/files/cache/homecache.php +++ b/tests/lib/files/cache/homecache.php @@ -43,6 +43,13 @@ class DummyUser extends \OC\User\User { } } +/** + * Class HomeCache + * + * @group DB + * + * @package Test\Files\Cache + */ class HomeCache extends \Test\TestCase { /** * @var \OC\Files\Storage\Home $storage diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index 871b12bac3a24f262cbc4ff003608c9cb4521dcd..8186fe29493647f8fb425263e020bbf4bf1dcb13 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -8,6 +8,13 @@ namespace Test\Files\Cache; +/** + * Class Scanner + * + * @group DB + * + * @package Test\Files\Cache + */ class Scanner extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage $storage diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php index 807dcd596fbe7103d3d193902da531b741df3d88..cdffac464dc379db68211fd9cbace2588bfcd1f8 100644 --- a/tests/lib/files/cache/updater.php +++ b/tests/lib/files/cache/updater.php @@ -12,6 +12,13 @@ use OC\Files\Filesystem; use OC\Files\Storage\Temporary; use OC\Files\View; +/** + * Class Updater + * + * @group DB + * + * @package Test\Files\Cache + */ class Updater extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php index c1a0d3d82309cf65c7a50f0675e0f65ec55efda8..1946913bba4a4470d5f1b2ebc9bee390cf005732 100644 --- a/tests/lib/files/cache/updaterlegacy.php +++ b/tests/lib/files/cache/updaterlegacy.php @@ -12,6 +12,13 @@ use \OC\Files\Filesystem as Filesystem; use OC\Files\Storage\Temporary; use OC\Files\View; +/** + * Class UpdaterLegacy + * + * @group DB + * + * @package Test\Files\Cache + */ class UpdaterLegacy extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage $storage diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php index acc03cc4c7750e4963584538594869bdd6f6591b..cb90e92b4772abd60697c2d8fb638dac0c87d662 100644 --- a/tests/lib/files/cache/watcher.php +++ b/tests/lib/files/cache/watcher.php @@ -8,6 +8,13 @@ namespace Test\Files\Cache; +/** + * Class Watcher + * + * @group DB + * + * @package Test\Files\Cache + */ class Watcher extends \Test\TestCase { /** diff --git a/tests/lib/files/cache/wrapper/cachejail.php b/tests/lib/files/cache/wrapper/cachejail.php index 13f3dc8858ef7c6ab5b9aea1e395e92afe74a033..9ddf3e9c61c4c7d6378ce64574ee6855be3bdbbb 100644 --- a/tests/lib/files/cache/wrapper/cachejail.php +++ b/tests/lib/files/cache/wrapper/cachejail.php @@ -10,6 +10,13 @@ namespace Test\Files\Cache\Wrapper; use Test\Files\Cache\Cache; +/** + * Class CacheJail + * + * @group DB + * + * @package Test\Files\Cache\Wrapper + */ class CacheJail extends Cache { /** * @var \OC\Files\Cache\Cache $sourceCache diff --git a/tests/lib/files/cache/wrapper/cachepermissionsmask.php b/tests/lib/files/cache/wrapper/cachepermissionsmask.php index 72fd22741d3f93073b2040caceed952a69bd5bf0..a4cc7edba3718b4f48b138714288beae72ab454b 100644 --- a/tests/lib/files/cache/wrapper/cachepermissionsmask.php +++ b/tests/lib/files/cache/wrapper/cachepermissionsmask.php @@ -11,6 +11,13 @@ namespace Test\Files\Cache\Wrapper; use OCP\Constants; use Test\Files\Cache\Cache; +/** + * Class CachePermissionsMask + * + * @group DB + * + * @package Test\Files\Cache\Wrapper + */ class CachePermissionsMask extends Cache { /** * @var \OC\Files\Cache\Cache $sourceCache diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php index 1b51030d4a31110591dc82ebed80220e90451574..7fbeae88820ccd758b773d6e0cadb29cef4c44a4 100644 --- a/tests/lib/files/etagtest.php +++ b/tests/lib/files/etagtest.php @@ -11,6 +11,13 @@ namespace Test\Files; use OC\Files\Filesystem; use OCP\Share; +/** + * Class EtagTest + * + * @group DB + * + * @package Test\Files + */ class EtagTest extends \Test\TestCase { private $datadir; diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php index 15a7c23540569583ea7564bc6195627020d6abde..7829eb9d7065856be1056e03191c6858530206e5 100644 --- a/tests/lib/files/filesystem.php +++ b/tests/lib/files/filesystem.php @@ -51,6 +51,13 @@ class DummyMountProvider implements IMountProvider { } } +/** + * Class Filesystem + * + * @group DB + * + * @package Test\Files + */ class Filesystem extends \Test\TestCase { const TEST_FILESYSTEM_USER1 = "test-filesystem-user1"; diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php index 8c98256575e26d12683e6451f867e70485795051..2c9339bb6dce724e51a31d4c38af5371ea1614e3 100644 --- a/tests/lib/files/node/folder.php +++ b/tests/lib/files/node/folder.php @@ -16,6 +16,13 @@ use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OC\Files\View; +/** + * Class Folder + * + * @group DB + * + * @package Test\Files\Node + */ class Folder extends \Test\TestCase { private $user; diff --git a/tests/lib/files/node/hookconnector.php b/tests/lib/files/node/hookconnector.php index 10566cf5fb1fd8e98ee291f3ea83534b68efc07b..646e3952a385f35612a4a041a221be87a730e120 100644 --- a/tests/lib/files/node/hookconnector.php +++ b/tests/lib/files/node/hookconnector.php @@ -17,6 +17,13 @@ use Test\TestCase; use Test\Traits\MountProviderTrait; use Test\Traits\UserTrait; +/** + * Class HookConnector + * + * @group DB + * + * @package Test\Files\Node + */ class HookConnector extends TestCase { use UserTrait; use MountProviderTrait; diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php index 5580b40a1264df41fea80b27bc885d7fc55830d2..addc7e98f48a0211932068fbd0fe20016dfdfd2e 100644 --- a/tests/lib/files/node/integration.php +++ b/tests/lib/files/node/integration.php @@ -13,6 +13,13 @@ use OC\Files\Storage\Temporary; use OC\Files\View; use OC\User\User; +/** + * Class IntegrationTests + * + * @group DB + * + * @package Test\Files\Node + */ class IntegrationTests extends \Test\TestCase { /** * @var \OC\Files\Node\Root $root diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php index 6d59078aa7cd597b1bc58315021e67f9f1a8b09b..63332af68da5677c6a6ef885eef64f9afa7c2f26 100644 --- a/tests/lib/files/objectstore/swift.php +++ b/tests/lib/files/objectstore/swift.php @@ -23,6 +23,13 @@ namespace OCA\ObjectStore\Tests\Unit; use OC\Files\ObjectStore\ObjectStoreStorage; use OC\Files\ObjectStore\Swift as ObjectStoreToTest; +/** + * Class Swift + * + * @group DB + * + * @package OCA\ObjectStore\Tests\Unit + */ class Swift extends \Test\Files\Storage\Storage { /** diff --git a/tests/lib/files/pathverificationtest.php b/tests/lib/files/pathverificationtest.php index 13fccd310f305a4ffe3c0cf6c689b856d58106fc..db393ce5e516730ccc5d6d0773e00c43d29bde7e 100644 --- a/tests/lib/files/pathverificationtest.php +++ b/tests/lib/files/pathverificationtest.php @@ -10,6 +10,13 @@ namespace Test\Files; use OC\Files\Storage\Local; use OC\Files\View; +/** + * Class PathVerification + * + * @group DB + * + * @package Test\Files + */ class PathVerification extends \Test\TestCase { /** diff --git a/tests/lib/files/storage/commontest.php b/tests/lib/files/storage/commontest.php index 2b70dc8713eb7361a1796f0e7062d25903d8e16f..bbe6f2a73e2ba75e6ec1556fcb653fbe739f5da2 100644 --- a/tests/lib/files/storage/commontest.php +++ b/tests/lib/files/storage/commontest.php @@ -22,6 +22,13 @@ namespace Test\Files\Storage; +/** + * Class CommonTest + * + * @group DB + * + * @package Test\Files\Storage + */ class CommonTest extends Storage { /** * @var string tmpDir diff --git a/tests/lib/files/storage/copydirectory.php b/tests/lib/files/storage/copydirectory.php index 3338747f49b0c4744a4831edd38ee3ff42c348e9..bc066268cda69ad0309733b38af87adb742f44fd 100644 --- a/tests/lib/files/storage/copydirectory.php +++ b/tests/lib/files/storage/copydirectory.php @@ -36,6 +36,13 @@ class CopyDirectoryStorage extends StorageNoRecursiveCopy { use \OC\Files\Storage\PolyFill\CopyDirectory; } +/** + * Class CopyDirectory + * + * @group DB + * + * @package Test\Files\Storage + */ class CopyDirectory extends Storage { protected function setUp() { diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php index b0670a22892a33b819be374aaf42afaad63a11e0..a51912ca1b2fee8261aef5210095897ce180ca48 100644 --- a/tests/lib/files/storage/home.php +++ b/tests/lib/files/storage/home.php @@ -47,6 +47,13 @@ class DummyUser extends User { } } +/** + * Class Home + * + * @group DB + * + * @package Test\Files\Storage + */ class Home extends Storage { /** * @var string tmpDir diff --git a/tests/lib/files/storage/homestoragequota.php b/tests/lib/files/storage/homestoragequota.php new file mode 100644 index 0000000000000000000000000000000000000000..49e8f499efdb50ddac4e4e6000f8469e8484b585 --- /dev/null +++ b/tests/lib/files/storage/homestoragequota.php @@ -0,0 +1,79 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace Test\Files\Storage; + +/** + * Class HomeStorageQuota + * + * @group DB + */ +class HomeStorageQuota extends \Test\TestCase { + /** + * Tests that the home storage is not wrapped when no quota exists. + */ + function testHomeStorageWrapperWithoutQuota() { + $user1 = $this->getUniqueID(); + \OC_User::createUser($user1, 'test'); + \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', 'none'); + \OC_User::setUserId($user1); + + \OC_Util::setupFS($user1); + + $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/'); + $this->assertNotNull($userMount); + $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $userMount->getStorage()); + + // clean up + \OC_User::setUserId(''); + \OC_User::deleteUser($user1); + \OC::$server->getConfig()->deleteAllUserValues($user1); + \OC_Util::tearDownFS(); + } + + /** + * Tests that the home storage is not wrapped when no quota exists. + */ + function testHomeStorageWrapperWithQuota() { + $user1 = $this->getUniqueID(); + \OC_User::createUser($user1, 'test'); + \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', '1024'); + \OC_User::setUserId($user1); + + \OC_Util::setupFS($user1); + + $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/'); + $this->assertNotNull($userMount); + $this->assertTrue($userMount->getStorage()->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')); + + // ensure that root wasn't wrapped + $rootMount = \OC\Files\Filesystem::getMountManager()->find('/'); + $this->assertNotNull($rootMount); + $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $rootMount->getStorage()); + + // clean up + \OC_User::setUserId(''); + \OC_User::deleteUser($user1); + \OC::$server->getConfig()->deleteAllUserValues($user1); + \OC_Util::tearDownFS(); + } + +} diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php index d2b27117c3b62cdbfbf9c31e0dd2ea0b2ae3f39a..36267dc66057d81aaaace09817a86076422927d6 100644 --- a/tests/lib/files/storage/local.php +++ b/tests/lib/files/storage/local.php @@ -22,6 +22,13 @@ namespace Test\Files\Storage; +/** + * Class Local + * + * @group DB + * + * @package Test\Files\Storage + */ class Local extends Storage { /** * @var string tmpDir diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php index 441f3a39d3262784a5a216af5bda1bc958409755..b0a06b0d898dee9f2a266cbdd099cedf76a2c8db 100644 --- a/tests/lib/files/storage/wrapper/quota.php +++ b/tests/lib/files/storage/wrapper/quota.php @@ -11,6 +11,13 @@ namespace Test\Files\Storage\Wrapper; //ensure the constants are loaded \OC::$loader->load('\OC\Files\Filesystem'); +/** + * Class Quota + * + * @group DB + * + * @package Test\Files\Storage\Wrapper + */ class Quota extends \Test\Files\Storage\Storage { /** * @var string tmpDir diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php index b731c6992e80bbc0be429c112bed078905459f2f..2a50c2a62220f34177df52a2acf6ba3fe8ec7a17 100644 --- a/tests/lib/files/utils/scanner.php +++ b/tests/lib/files/utils/scanner.php @@ -40,6 +40,13 @@ class TestScanner extends \OC\Files\Utils\Scanner { } } +/** + * Class Scanner + * + * @group DB + * + * @package Test\Files\Utils + */ class Scanner extends \Test\TestCase { /** * @var \Test\Util\User\Dummy diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index f0bad5abd18de96183e2395872d279e0f99ced40..186cf28d7c3eb771209244dd474e7bcbe0faef0d 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -40,6 +40,13 @@ class TemporaryNoLocal extends \OC\Files\Storage\Temporary { } } +/** + * Class View + * + * @group DB + * + * @package Test\Files + */ class View extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage[] $storages diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php index 62c189489d7c08c73385fe8c12f5c2aabcd3e68c..ce41a6c6359d9271af2691b98d0df0ed1f0ab259 100644 --- a/tests/lib/group/backend.php +++ b/tests/lib/group/backend.php @@ -20,6 +20,11 @@ * */ +/** + * Class Test_Group_Backend + * + * @group DB + */ abstract class Test_Group_Backend extends \Test\TestCase { /** * @var OC_Group_Backend $backend diff --git a/tests/lib/group/database.php b/tests/lib/group/database.php index 10958a6ccdceaa7d1e383a6b96e1e92a22250534..3997ff8bba539ad86cbe6f0f65be80d73e79ce2e 100644 --- a/tests/lib/group/database.php +++ b/tests/lib/group/database.php @@ -20,6 +20,11 @@ * */ +/** + * Class Test_Group_Database + * + * @group DB + */ class Test_Group_Database extends Test_Group_Backend { private $groups=array(); diff --git a/tests/lib/group/dummy.php b/tests/lib/group/dummy.php index b4456c8f7e17163a3bc248047089c13a48a74d00..6836f89d3feb4497cb20fa8d29cecc380a2b05c1 100644 --- a/tests/lib/group/dummy.php +++ b/tests/lib/group/dummy.php @@ -20,6 +20,11 @@ * */ +/** + * Class Test_Group_Dummy + * + * @group DB + */ class Test_Group_Dummy extends Test_Group_Backend { protected function setUp() { parent::setUp(); diff --git a/tests/lib/helperstorage.php b/tests/lib/helperstorage.php index 8b5f41fc94cb5c19ced115495c834bc4d479ce3e..d41bc68a7b1f6655a304935c1f57e47b753116c4 100644 --- a/tests/lib/helperstorage.php +++ b/tests/lib/helperstorage.php @@ -8,8 +8,9 @@ /** * Test the storage functions of OC_Helper + * + * @group DB */ - class Test_Helper_Storage extends \Test\TestCase { /** @var string */ private $user; diff --git a/tests/lib/lock/dblockingprovider.php b/tests/lib/lock/dblockingprovider.php index 2360052b4a0a5c602d17f455a26289410583d62e..d679b1ea6777274d913f172b445166277da31af9 100644 --- a/tests/lib/lock/dblockingprovider.php +++ b/tests/lib/lock/dblockingprovider.php @@ -23,6 +23,13 @@ namespace Test\Lock; use OCP\Lock\ILockingProvider; +/** + * Class DBLockingProvider + * + * @group DB + * + * @package Test\Lock + */ class DBLockingProvider extends LockingProvider { /** * @var \OC\Lock\DBLockingProvider diff --git a/tests/lib/log/owncloud.php b/tests/lib/log/owncloud.php index d977583612b0208a07c3d67aab91082e71cf83f7..8cc6aa9d57a97b49bf237fe90035505fad2d091e 100644 --- a/tests/lib/log/owncloud.php +++ b/tests/lib/log/owncloud.php @@ -15,6 +15,11 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ +/** + * Class Test_Log_Owncloud + * + * @group DB + */ class Test_Log_Owncloud extends Test\TestCase { private $restore_logfile; @@ -22,8 +27,8 @@ class Test_Log_Owncloud extends Test\TestCase protected function setUp() { parent::setUp(); - $restore_logfile = OC_Config::getValue("logfile"); - $restore_logdateformat = OC_Config::getValue('logdateformat'); + $this->restore_logfile = OC_Config::getValue("logfile"); + $this->restore_logdateformat = OC_Config::getValue('logdateformat'); OC_Config::setValue("logfile", OC_Config::getValue('datadirectory') . "/logtest"); OC_Log_Owncloud::init(); diff --git a/tests/lib/ocs/privatedata.php b/tests/lib/ocs/privatedata.php index a9300f5beac15730c10ecae04ca667c04d051010..ce153bf07d6025eaa5258f897acfff222420580b 100644 --- a/tests/lib/ocs/privatedata.php +++ b/tests/lib/ocs/privatedata.php @@ -20,6 +20,11 @@ * */ +/** + * Class Test_OC_OCS_Privatedata + * + * @group DB + */ class Test_OC_OCS_Privatedata extends \Test\TestCase { private $appKey; diff --git a/tests/lib/preview.php b/tests/lib/preview.php index e4c599c66cf21d410145af66c01ee8b5aa6cd532..bc6f849cbe8333b122583fcde998fdc21d176a07 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -28,6 +28,13 @@ use OC\Files\View; use Test\Traits\MountProviderTrait; use Test\Traits\UserTrait; +/** + * Class Preview + * + * @group DB + * + * @package Test + */ class Preview extends TestCase { use UserTrait; use MountProviderTrait; diff --git a/tests/lib/preview/bitmap.php b/tests/lib/preview/bitmap.php index 49112852e29e166c560b845715ffce589435bc22..1e135ceb08317673ef47a5c2a4bb1ea5f4b64d61 100644 --- a/tests/lib/preview/bitmap.php +++ b/tests/lib/preview/bitmap.php @@ -21,6 +21,13 @@ namespace Test\Preview; +/** + * Class Bitmap + * + * @group DB + * + * @package Test\Preview + */ class Bitmap extends Provider { public function setUp() { diff --git a/tests/lib/preview/image.php b/tests/lib/preview/image.php index af46f4e4a6689b7b79b0af15c328aab694248750..6c82ff85723cd0700996ab33ab30aa89b9bf0308 100644 --- a/tests/lib/preview/image.php +++ b/tests/lib/preview/image.php @@ -21,6 +21,13 @@ namespace Test\Preview; +/** + * Class Image + * + * @group DB + * + * @package Test\Preview + */ class Image extends Provider { public function setUp() { diff --git a/tests/lib/preview/mp3.php b/tests/lib/preview/mp3.php index ac3ab07a2bd5446e3607862faf64b2a2783a6c45..f6875a88ebde3eb18a12ebc0c576fcae7a3e5e97 100644 --- a/tests/lib/preview/mp3.php +++ b/tests/lib/preview/mp3.php @@ -21,6 +21,13 @@ namespace Test\Preview; +/** + * Class MP3 + * + * @group DB + * + * @package Test\Preview + */ class MP3 extends Provider { public function setUp() { diff --git a/tests/lib/preview/svg.php b/tests/lib/preview/svg.php index 768569c72edff2de409bb71e431feefb6fec1405..ef5f4cff80fb8a94eed64cd248cdef39b38057e4 100644 --- a/tests/lib/preview/svg.php +++ b/tests/lib/preview/svg.php @@ -21,6 +21,13 @@ namespace Test\Preview; +/** + * Class SVG + * + * @group DB + * + * @package Test\Preview + */ class SVG extends Provider { public function setUp() { diff --git a/tests/lib/preview/txt.php b/tests/lib/preview/txt.php index 8bda86f25e3279af6963f6746cc426b2c7f55c5c..219b850be95401fd80558a89d1792ffc522cbac7 100644 --- a/tests/lib/preview/txt.php +++ b/tests/lib/preview/txt.php @@ -21,6 +21,13 @@ namespace Test\Preview; +/** + * Class TXT + * + * @group DB + * + * @package Test\Preview + */ class TXT extends Provider { public function setUp() { diff --git a/tests/lib/repair/cleantags.php b/tests/lib/repair/cleantags.php index 896dd333cc2c46537168096d60d10967012beeca..9773a5917774d56d7e09c3ce402a210df10ae0cd 100644 --- a/tests/lib/repair/cleantags.php +++ b/tests/lib/repair/cleantags.php @@ -11,6 +11,8 @@ namespace Test\Repair; /** * Tests for the cleaning the tags tables * + * @group DB + * * @see \OC\Repair\CleanTags */ class CleanTags extends \Test\TestCase { diff --git a/tests/lib/repair/dropoldjobs.php b/tests/lib/repair/dropoldjobs.php index 27d7860c63dac738e5ad791c11db163918e4d686..a85c6506dbbc140835f3915ffb2b13ba789ed5e3 100644 --- a/tests/lib/repair/dropoldjobs.php +++ b/tests/lib/repair/dropoldjobs.php @@ -13,6 +13,8 @@ use OCP\BackgroundJob\IJobList; /** * Tests for the dropping old tables * + * @group DB + * * @see \OC\Repair\DropOldTables */ class DropOldJobs extends \Test\TestCase { diff --git a/tests/lib/repair/dropoldtables.php b/tests/lib/repair/dropoldtables.php index 244d883794919533a01b6ba7316d03db44f1481a..6ece8cf04d58753f30742182b7a0a0a8aacd3336 100644 --- a/tests/lib/repair/dropoldtables.php +++ b/tests/lib/repair/dropoldtables.php @@ -11,6 +11,8 @@ namespace Test\Repair; /** * Tests for the dropping old tables * + * @group DB + * * @see \OC\Repair\DropOldTables */ class DropOldTables extends \Test\TestCase { diff --git a/tests/lib/repair/oldgroupmembershipsharestest.php b/tests/lib/repair/oldgroupmembershipsharestest.php index 272e1ef09c4125b09c5cb01e6cbc81575c2d25d7..f02babab21d75806f49fc89ad8a658627874f75a 100644 --- a/tests/lib/repair/oldgroupmembershipsharestest.php +++ b/tests/lib/repair/oldgroupmembershipsharestest.php @@ -11,6 +11,13 @@ namespace Test\Repair; use OC\Repair\OldGroupMembershipShares; use OC\Share\Constants; +/** + * Class OldGroupMembershipSharesTest + * + * @group DB + * + * @package Test\Repair + */ class OldGroupMembershipSharesTest extends \Test\TestCase { /** @var OldGroupMembershipShares */ diff --git a/tests/lib/repair/removegetetagentriestest.php b/tests/lib/repair/removegetetagentriestest.php index 43b7bf323c095b2c5dd663b08090fd75fa514146..12f0ae8a8d643085249a598d294721b7acb29d2b 100644 --- a/tests/lib/repair/removegetetagentriestest.php +++ b/tests/lib/repair/removegetetagentriestest.php @@ -24,6 +24,13 @@ namespace Test\Repair; use OC\Repair\RemoveGetETagEntries; use Test\TestCase; +/** + * Class RemoveGetETagEntriesTest + * + * @group DB + * + * @package Test\Repair + */ class RemoveGetETagEntriesTest extends TestCase { /** @var \OCP\IDBConnection */ protected $connection; diff --git a/tests/lib/repair/repaircollation.php b/tests/lib/repair/repaircollation.php index 29dad19000876588ae3f25019c722217a080cb08..f9d921e88a48f2019aa2c53bec0a1d9268807d1b 100644 --- a/tests/lib/repair/repaircollation.php +++ b/tests/lib/repair/repaircollation.php @@ -19,6 +19,8 @@ class TestCollationRepair extends \OC\Repair\Collation { /** * Tests for the converting of MySQL tables to InnoDB engine * + * @group DB + * * @see \OC\Repair\RepairMimeTypes */ class TestRepairCollation extends \Test\TestCase { diff --git a/tests/lib/repair/repairinnodb.php b/tests/lib/repair/repairinnodb.php index 33f7a0e21366e880899a3e6978aaf9a975790e9e..e7d2b83c224766978dcf45877ab559dd1364c75e 100644 --- a/tests/lib/repair/repairinnodb.php +++ b/tests/lib/repair/repairinnodb.php @@ -10,6 +10,8 @@ namespace Test\Repair; /** * Tests for the converting of MySQL tables to InnoDB engine * + * @group DB + * * @see \OC\Repair\RepairMimeTypes */ class RepairInnoDB extends \Test\TestCase { diff --git a/tests/lib/repair/repairinvalidsharestest.php b/tests/lib/repair/repairinvalidsharestest.php index e8dcaa4da97d7201f36c2977ce69ec4def3bdcaf..9655e0eacbc5b14e835171ea1d4366f5777c010b 100644 --- a/tests/lib/repair/repairinvalidsharestest.php +++ b/tests/lib/repair/repairinvalidsharestest.php @@ -16,6 +16,8 @@ use Test\TestCase; /** * Tests for repairing invalid shares * + * @group DB + * * @see \OC\Repair\RepairInvalidShares */ class RepairInvalidSharesTest extends TestCase { diff --git a/tests/lib/repair/repairlegacystorage.php b/tests/lib/repair/repairlegacystorage.php index e1edf70442402bcb365e3cc1ed72587fd5e6d645..44afd6125abe75e778321d974cd5eb6427273726 100644 --- a/tests/lib/repair/repairlegacystorage.php +++ b/tests/lib/repair/repairlegacystorage.php @@ -15,6 +15,8 @@ use Test\TestCase; /** * Tests for the converting of legacy storages to home storages. * + * @group DB + * * @see \OC\Repair\RepairLegacyStorages */ class RepairLegacyStorages extends TestCase { diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php index a0697776e73ae14e5bee583d051c5608041ef068..1bdaa9a2dbf84e68518cf4ee496e34574966ac08 100644 --- a/tests/lib/repair/repairmimetypes.php +++ b/tests/lib/repair/repairmimetypes.php @@ -11,6 +11,8 @@ namespace Test\Repair; /** * Tests for the converting of legacy storages to home storages. * + * @group DB + * * @see \OC\Repair\RepairMimeTypes */ class RepairMimeTypes extends \Test\TestCase { diff --git a/tests/lib/repair/repairsqliteautoincrement.php b/tests/lib/repair/repairsqliteautoincrement.php index 375319bb64a65220774be7ae5e55bfe96c16bc60..e3bb110191bcd0b1df8f01773c1c3acd5c3bbe71 100644 --- a/tests/lib/repair/repairsqliteautoincrement.php +++ b/tests/lib/repair/repairsqliteautoincrement.php @@ -10,6 +10,8 @@ namespace Test\Repair; /** * Tests for fixing the SQLite id recycling + * + * @group DB */ class RepairSqliteAutoincrement extends \Test\TestCase { diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php index 092f9efdd18b7a3be972f0b31cbeb070ab6c709c..43b2f1cf9802fba2c221c9ec530d4d11b279d9d0 100644 --- a/tests/lib/security/certificatemanager.php +++ b/tests/lib/security/certificatemanager.php @@ -8,6 +8,11 @@ use \OC\Security\CertificateManager; +/** + * Class CertificateManagerTest + * + * @group DB + */ class CertificateManagerTest extends \Test\TestCase { /** @var CertificateManager */ diff --git a/tests/lib/server.php b/tests/lib/server.php index 96a476bd4d1a2d8794f03b0af20edef336c72699..b72bef820366011f48a7b10e2d246c5eab178d31 100644 --- a/tests/lib/server.php +++ b/tests/lib/server.php @@ -24,6 +24,13 @@ namespace Test; +/** + * Class Server + * + * @group DB + * + * @package Test + */ class Server extends \Test\TestCase { /** @var \OC\Server */ protected $server; diff --git a/tests/lib/share/hooktests.php b/tests/lib/share/hooktests.php index f980baf35742cc7f61b716579c10a42df17b66b7..7e6aaa259f237e12a672f2ae07e54bc450d926b6 100644 --- a/tests/lib/share/hooktests.php +++ b/tests/lib/share/hooktests.php @@ -25,6 +25,13 @@ namespace OC\Tests\Share; use Test\TestCase; +/** + * Class HookTests + * + * @group DB + * + * @package OC\Tests\Share + */ class HookTests extends TestCase { protected function setUp() { diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index e8127aefe8e9e7e681faa37ff994a8d6a2dffdf8..fa19577cb72a8e60ed75d8cfb8b16935fbf59c2e 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -19,6 +19,11 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ +/** + * Class Test_Share + * + * @group DB + */ class Test_Share extends \Test\TestCase { protected $itemType; diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php index 6216c5a4be89023598a2fbe21fbc0166591771b6..9b0975352807b10a4d7904b144b0f7edcfcbd7b1 100644 --- a/tests/lib/streamwrappers.php +++ b/tests/lib/streamwrappers.php @@ -20,6 +20,11 @@ * */ +/** + * Class Test_StreamWrappers + * + * @group DB + */ class Test_StreamWrappers extends \Test\TestCase { private static $trashBinStatus; diff --git a/tests/lib/tags.php b/tests/lib/tags.php index 1a13d64679d7e77234a8c3e4e2d93f436298f73c..a8f59ff16e447a21ca8164b15725e2a7943908d0 100644 --- a/tests/lib/tags.php +++ b/tests/lib/tags.php @@ -20,12 +20,17 @@ * */ +/** + * Class Test_Tags + * + * @group DB + */ class Test_Tags extends \Test\TestCase { protected $objectType; - /** @var \OC\IUser */ + /** @var \OCP\IUser */ protected $user; - /** @var \OC\IUserSession */ + /** @var \OCP\IUserSession */ protected $userSession; protected $backupGlobals = FALSE; /** @var \OC\Tagging\TagMapper */ diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index 8cfa2a7259830ef44467cc867bf1c1707da44551..5d88fa08a6dce84839c81b6d080bb6eb0e9d3bc4 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -25,14 +25,16 @@ namespace Test; use OC\Command\QueueBus; use OC\Files\Filesystem; use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\IDBConnection; use OCP\Security\ISecureRandom; abstract class TestCase extends \PHPUnit_Framework_TestCase { - /** - * @var \OC\Command\QueueBus - */ + /** @var \OC\Command\QueueBus */ private $commandBus; + /** @var IDBConnection */ + static private $realDatabase; + protected function getTestTraits() { $traits = []; $class = $this; @@ -49,6 +51,16 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { } protected function setUp() { + // detect database access + if (!$this->IsDatabaseAccessAllowed()) { + if (is_null(self::$realDatabase)) { + self::$realDatabase = \OC::$server->getDatabaseConnection(); + } + \OC::$server->registerService('DatabaseConnection', function () { + $this->fail('Your test case is not allowed to access the database.'); + }); + } + // overwrite the command bus with one we can run ourselves $this->commandBus = new QueueBus(); \OC::$server->registerService('AsyncCommandBus', function () { @@ -65,6 +77,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { } protected function tearDown() { + // restore database connection + if (!$this->IsDatabaseAccessAllowed()) { + \OC::$server->registerService('DatabaseConnection', function () { + return self::$realDatabase; + }); + } + + // further cleanup $hookExceptions = \OC_Hook::$thrownExceptions; \OC_Hook::$thrownExceptions = []; \OC::$server->getLockingProvider()->releaseAll(); @@ -316,4 +336,18 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { return true; } } + + private function IsDatabaseAccessAllowed() { + // on travis-ci.org we allow database access in any case - otherwise + // this will break all apps right away + if (true == getenv('TRAVIS')) { + return true; + } + $annotations = $this->getAnnotations(); + if (isset($annotations['class']['group']) && in_array('DB', $annotations['class']['group'])) { + return true; + } + + return false; + } } diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlGenerator.php similarity index 97% rename from tests/lib/urlgenerator.php rename to tests/lib/urlGenerator.php index a5ab483109ffd2a8aab1338f39ea779dcdb890a4..07103225baac664afa8d9e5485d2564318b6988d 100644 --- a/tests/lib/urlgenerator.php +++ b/tests/lib/urlGenerator.php @@ -6,7 +6,12 @@ * See the COPYING-README file. */ -class Test_Urlgenerator extends \Test\TestCase { +/** + * Class Test_UrlGenerator + * + * @group DB + */ +class Test_UrlGenerator extends \Test\TestCase { /** * @small diff --git a/tests/lib/user.php b/tests/lib/user.php index 3c068be28269716e53fbd95b59aaeca753cd919a..bc1ba063c8febd1f7751e4ddf66c4b7881c4311b 100644 --- a/tests/lib/user.php +++ b/tests/lib/user.php @@ -9,6 +9,13 @@ namespace Test; +/** + * Class User + * + * @group DB + * + * @package Test + */ class User extends TestCase { /** * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend @@ -70,4 +77,4 @@ class User extends TestCase { $this->assertEquals('newuser', $user->getUid()); } -} \ No newline at end of file +} diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php index 3a6be1ceee539540f6bd561987eef999257cb8a3..ba44d333a8cbddfb51b4e8595dfdca0d2e243727 100644 --- a/tests/lib/user/database.php +++ b/tests/lib/user/database.php @@ -20,6 +20,11 @@ * */ +/** + * Class Test_User_Database + * + * @group DB + */ class Test_User_Database extends Test_User_Backend { /** @var array */ private $users; diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php index df673f581c41b0e7e63934151e186a056f70c16e..90e2f67c995986172eaf04b1b7a97d6f72734e63 100644 --- a/tests/lib/user/manager.php +++ b/tests/lib/user/manager.php @@ -9,6 +9,13 @@ namespace Test\User; +/** + * Class Manager + * + * @group DB + * + * @package Test\User + */ class Manager extends \Test\TestCase { public function testGetBackends() { $userDummyBackend = $this->getMock('\Test\Util\User\Dummy'); @@ -441,11 +448,25 @@ class Manager extends \Test\TestCase { } public function testDeleteUser() { - $manager = new \OC\User\Manager(); + $config = $this->getMockBuilder('OCP\IConfig') + ->disableOriginalConstructor() + ->getMock(); + $config + ->expects($this->at(0)) + ->method('getUserValue') + ->with('foo', 'core', 'enabled') + ->will($this->returnValue(true)); + $config + ->expects($this->at(1)) + ->method('getUserValue') + ->with('foo', 'login', 'lastLogin') + ->will($this->returnValue(0)); + + $manager = new \OC\User\Manager($config); $backend = new \Test\Util\User\Dummy(); - $backend->createUser('foo', 'bar'); $manager->registerBackend($backend); + $backend->createUser('foo', 'bar'); $this->assertTrue($manager->userExists('foo')); $manager->get('foo')->delete(); $this->assertFalse($manager->userExists('foo')); diff --git a/tests/lib/util.php b/tests/lib/util.php index a328b1923e961566430ac9d79740d4e30ec0feb9..608c5f0c5016288020b597fdce3d8602ecb77190 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -166,55 +166,6 @@ class Test_Util extends \Test\TestCase { $this->assertSame(1, $matchesRegex); } - /** - * Tests that the home storage is not wrapped when no quota exists. - */ - function testHomeStorageWrapperWithoutQuota() { - $user1 = $this->getUniqueID(); - \OC_User::createUser($user1, 'test'); - \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', 'none'); - \OC_User::setUserId($user1); - - \OC_Util::setupFS($user1); - - $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/'); - $this->assertNotNull($userMount); - $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $userMount->getStorage()); - - // clean up - \OC_User::setUserId(''); - \OC_User::deleteUser($user1); - \OC::$server->getConfig()->deleteAllUserValues($user1); - \OC_Util::tearDownFS(); - } - - /** - * Tests that the home storage is not wrapped when no quota exists. - */ - function testHomeStorageWrapperWithQuota() { - $user1 = $this->getUniqueID(); - \OC_User::createUser($user1, 'test'); - \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', '1024'); - \OC_User::setUserId($user1); - - \OC_Util::setupFS($user1); - - $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/'); - $this->assertNotNull($userMount); - $this->assertTrue($userMount->getStorage()->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')); - - // ensure that root wasn't wrapped - $rootMount = \OC\Files\Filesystem::getMountManager()->find('/'); - $this->assertNotNull($rootMount); - $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $rootMount->getStorage()); - - // clean up - \OC_User::setUserId(''); - \OC_User::deleteUser($user1); - \OC::$server->getConfig()->deleteAllUserValues($user1); - \OC_Util::tearDownFS(); - } - /** * @dataProvider baseNameProvider */ diff --git a/tests/lib/utilcheckserver.php b/tests/lib/utilcheckserver.php index bb9b7a244528722057e4215e29a0c291de0eb593..a5ec529ff85acd81c74d525e02e0c0c0542c6204 100644 --- a/tests/lib/utilcheckserver.php +++ b/tests/lib/utilcheckserver.php @@ -8,6 +8,8 @@ /** * Tests for server check functions + * + * @group DB */ class Test_Util_CheckServer extends \Test\TestCase {