diff --git a/apps/dav/tests/unit/appinfo/applicationtest.php b/apps/dav/tests/unit/AppInfo/ApplicationTest.php similarity index 98% rename from apps/dav/tests/unit/appinfo/applicationtest.php rename to apps/dav/tests/unit/AppInfo/ApplicationTest.php index 05dd75b2c6..6b55fcaf96 100644 --- a/apps/dav/tests/unit/appinfo/applicationtest.php +++ b/apps/dav/tests/unit/AppInfo/ApplicationTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\AppInfo; +namespace OCA\DAV\Tests\unit\AppInfo; use OCA\DAV\AppInfo\Application; use OCP\Contacts\IManager; diff --git a/apps/dav/tests/unit/caldav/caldavbackendtest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php similarity index 99% rename from apps/dav/tests/unit/caldav/caldavbackendtest.php rename to apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index 89be5671ca..0252457e73 100644 --- a/apps/dav/tests/unit/caldav/caldavbackendtest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -18,7 +18,8 @@ * along with this program. If not, see * */ -namespace Tests\Connector\Sabre; + +namespace OCA\DAV\Tests\unit\CalDAV; use DateTime; use DateTimeZone; @@ -37,7 +38,7 @@ use Test\TestCase; * * @group DB * - * @package Tests\Connector\Sabre + * @package OCA\DAV\Tests\unit\CalDAV */ class CalDavBackendTest extends TestCase { diff --git a/apps/dav/tests/unit/caldav/calendartest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php similarity index 99% rename from apps/dav/tests/unit/caldav/calendartest.php rename to apps/dav/tests/unit/CalDAV/CalendarTest.php index f13edde608..cfaa2d8901 100644 --- a/apps/dav/tests/unit/caldav/calendartest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\CalDAV; +namespace OCA\DAV\Tests\unit\CalDAV; use OCA\DAV\CalDAV\BirthdayService; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/tests/unit/caldav/schedule/imipplugintest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php similarity index 98% rename from apps/dav/tests/unit/caldav/schedule/imipplugintest.php rename to apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php index fcbf4fde04..addb585e41 100644 --- a/apps/dav/tests/unit/caldav/schedule/imipplugintest.php +++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\CalDAV\Schedule; +namespace OCA\DAV\Tests\unit\CalDAV\Schedule; use OC\Mail\Mailer; use OCA\DAV\CalDAV\Schedule\IMipPlugin; diff --git a/apps/dav/tests/unit/carddav/addressbookimpltest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php similarity index 99% rename from apps/dav/tests/unit/carddav/addressbookimpltest.php rename to apps/dav/tests/unit/CardDAV/AddressBookImplTest.php index ba537a631b..25da92bbf2 100644 --- a/apps/dav/tests/unit/carddav/addressbookimpltest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php @@ -21,7 +21,7 @@ */ -namespace OCA\DAV\Tests\Unit\CardDAV; +namespace OCA\DAV\Tests\unit\CardDAV; use OCA\DAV\CardDAV\AddressBook; diff --git a/apps/dav/tests/unit/carddav/addressbooktest.php b/apps/dav/tests/unit/CardDAV/AddressBookTest.php similarity index 99% rename from apps/dav/tests/unit/carddav/addressbooktest.php rename to apps/dav/tests/unit/CardDAV/AddressBookTest.php index c5cf7e5f7b..7144c36140 100644 --- a/apps/dav/tests/unit/carddav/addressbooktest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\CardDAV; +namespace OCA\DAV\Tests\unit\CardDAV; use OCA\DAV\CardDAV\AddressBook; use OCA\DAV\CardDAV\CardDavBackend; diff --git a/apps/dav/tests/unit/carddav/birthdayservicetest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php similarity index 99% rename from apps/dav/tests/unit/carddav/birthdayservicetest.php rename to apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php index e15edd16c6..0162924064 100644 --- a/apps/dav/tests/unit/carddav/birthdayservicetest.php +++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\CardDAV; +namespace OCA\DAV\Tests\unit\CardDAV; use OCA\DAV\CalDAV\BirthdayService; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/tests/unit/carddav/carddavbackendtest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php similarity index 99% rename from apps/dav/tests/unit/carddav/carddavbackendtest.php rename to apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index 1ee09260c8..7cae76ae62 100644 --- a/apps/dav/tests/unit/carddav/carddavbackendtest.php +++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php @@ -21,7 +21,8 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\CardDAV; + +namespace OCA\DAV\Tests\unit\CardDAV; use InvalidArgumentException; use OCA\DAV\CardDAV\AddressBook; @@ -39,7 +40,7 @@ use Test\TestCase; * * @group DB * - * @package OCA\DAV\Tests\Unit\CardDAV + * @package OCA\DAV\Tests\unit\CardDAV */ class CardDavBackendTest extends TestCase { diff --git a/apps/dav/tests/unit/carddav/contactsmanagertest.php b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php similarity index 97% rename from apps/dav/tests/unit/carddav/contactsmanagertest.php rename to apps/dav/tests/unit/CardDAV/ContactsManagerTest.php index 5a384550df..775dc5d18a 100644 --- a/apps/dav/tests/unit/carddav/contactsmanagertest.php +++ b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\CardDAV; +namespace OCA\DAV\Tests\unit\CardDAV; use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\ContactsManager; diff --git a/apps/dav/tests/unit/carddav/convertertest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php similarity index 98% rename from apps/dav/tests/unit/carddav/convertertest.php rename to apps/dav/tests/unit/CardDAV/ConverterTest.php index ba71b75686..4b71d43cc4 100644 --- a/apps/dav/tests/unit/carddav/convertertest.php +++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php @@ -20,12 +20,12 @@ * */ -namespace OCA\DAV\Tests\Unit; +namespace OCA\DAV\Tests\unit\CardDAV; use OCA\DAV\CardDAV\Converter; use Test\TestCase; -class ConverterTests extends TestCase { +class ConverterTest extends TestCase { /** * @dataProvider providesNewUsers diff --git a/apps/dav/tests/unit/carddav/sharing/plugintest.php b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php similarity index 98% rename from apps/dav/tests/unit/carddav/sharing/plugintest.php rename to apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php index f7159c2d22..1cbececdb3 100644 --- a/apps/dav/tests/unit/carddav/sharing/plugintest.php +++ b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\CardDAV; +namespace OCA\DAV\Tests\unit\CardDAV\Sharing; use OCA\DAV\DAV\Sharing\IShareable; diff --git a/apps/dav/tests/unit/carddav/syncservicetest.php b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php similarity index 98% rename from apps/dav/tests/unit/carddav/syncservicetest.php rename to apps/dav/tests/unit/CardDAV/SyncServiceTest.php index e3ffaf472e..e5a2603c77 100644 --- a/apps/dav/tests/unit/carddav/syncservicetest.php +++ b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php @@ -19,8 +19,11 @@ * along with this program. If not, see * */ -namespace OCA\DAV\CardDAV; +namespace OCA\DAV\Tests\unit\CardDAV; + +use OCA\DAV\CardDAV\CardDavBackend; +use OCA\DAV\CardDAV\SyncService; use OCP\IUser; use OCP\IUserManager; use Test\TestCase; diff --git a/apps/dav/tests/unit/comments/commentnode.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php similarity index 99% rename from apps/dav/tests/unit/comments/commentnode.php rename to apps/dav/tests/unit/Comments/CommentsNodeTest.php index 8ebc5c2ff2..d812ad62cb 100644 --- a/apps/dav/tests/unit/comments/commentnode.php +++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php @@ -19,13 +19,13 @@ * */ -namespace OCA\DAV\Tests\Unit\Comments; +namespace OCA\DAV\Tests\unit\Comments; use OCA\DAV\Comments\CommentNode; use OCP\Comments\IComment; use OCP\Comments\MessageTooLongException; -class CommentsNode extends \Test\TestCase { +class CommentsNodeTest extends \Test\TestCase { protected $commentsManager; protected $comment; diff --git a/apps/dav/tests/unit/comments/commentsplugin.php b/apps/dav/tests/unit/Comments/CommentsPluginTest.php similarity index 99% rename from apps/dav/tests/unit/comments/commentsplugin.php rename to apps/dav/tests/unit/Comments/CommentsPluginTest.php index c909f6a61a..608717bd0a 100644 --- a/apps/dav/tests/unit/comments/commentsplugin.php +++ b/apps/dav/tests/unit/Comments/CommentsPluginTest.php @@ -20,14 +20,14 @@ * */ -namespace OCA\DAV\Tests\Unit\Comments; +namespace OCA\DAV\Tests\unit\Comments; use OC\Comments\Comment; use OCA\DAV\Comments\CommentsPlugin as CommentsPluginImplementation; use OCP\Comments\IComment; use Sabre\DAV\Exception\NotFound; -class CommentsPlugin extends \Test\TestCase { +class CommentsPluginTest extends \Test\TestCase { /** @var \Sabre\DAV\Server */ private $server; diff --git a/apps/dav/tests/unit/comments/entitycollection.php b/apps/dav/tests/unit/Comments/EntityCollectionTest.php similarity index 97% rename from apps/dav/tests/unit/comments/entitycollection.php rename to apps/dav/tests/unit/Comments/EntityCollectionTest.php index bc009e9254..157d58c9ec 100644 --- a/apps/dav/tests/unit/comments/entitycollection.php +++ b/apps/dav/tests/unit/Comments/EntityCollectionTest.php @@ -19,9 +19,9 @@ * */ -namespace OCA\DAV\Tests\Unit\Comments; +namespace OCA\DAV\Tests\unit\Comments; -class EntityCollection extends \Test\TestCase { +class EntityCollectionTest extends \Test\TestCase { /** @var \OCP\Comments\ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ protected $commentsManager; diff --git a/apps/dav/tests/unit/comments/entitytypecollection.php b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php similarity index 96% rename from apps/dav/tests/unit/comments/entitytypecollection.php rename to apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php index 96b1cad837..51db44380f 100644 --- a/apps/dav/tests/unit/comments/entitytypecollection.php +++ b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php @@ -19,11 +19,11 @@ * */ -namespace OCA\DAV\Tests\Unit\Comments; +namespace OCA\DAV\Tests\unit\Comments; use OCA\DAV\Comments\EntityCollection as EntityCollectionImplemantation; -class EntityTypeCollection extends \Test\TestCase { +class EntityTypeCollectionTest extends \Test\TestCase { /** @var \OCP\Comments\ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ protected $commentsManager; diff --git a/apps/dav/tests/unit/comments/rootcollection.php b/apps/dav/tests/unit/Comments/RootCollectionTest.php similarity index 98% rename from apps/dav/tests/unit/comments/rootcollection.php rename to apps/dav/tests/unit/Comments/RootCollectionTest.php index a59482fba7..8f3b83e426 100644 --- a/apps/dav/tests/unit/comments/rootcollection.php +++ b/apps/dav/tests/unit/Comments/RootCollectionTest.php @@ -19,13 +19,13 @@ * */ -namespace OCA\DAV\Tests\Unit\Comments; +namespace OCA\DAV\Tests\unit\Comments; use OCA\DAV\Comments\EntityTypeCollection as EntityTypeCollectionImplementation; use OCP\Comments\CommentsEntityEvent; use Symfony\Component\EventDispatcher\EventDispatcher; -class RootCollection extends \Test\TestCase { +class RootCollectionTest extends \Test\TestCase { /** @var \OCP\Comments\ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ protected $commentsManager; diff --git a/apps/dav/tests/unit/connector/publicauth.php b/apps/dav/tests/unit/Connector/PublicAuthTest.php similarity index 97% rename from apps/dav/tests/unit/connector/publicauth.php rename to apps/dav/tests/unit/Connector/PublicAuthTest.php index 76a6e1ac6a..f8d6e1b5d1 100644 --- a/apps/dav/tests/unit/connector/publicauth.php +++ b/apps/dav/tests/unit/Connector/PublicAuthTest.php @@ -1,6 +1,6 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; /** * Copyright (c) 2015 Vincent Petry @@ -27,7 +27,7 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre; * later. * See the COPYING-README file. */ -class CopyEtagPluginTest extends \Test\TestCase { +class CopyEtagHeaderPluginTest extends \Test\TestCase { /** * @var \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin diff --git a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php similarity index 97% rename from apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php rename to apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php index e0ba61e913..0ae6bb014a 100644 --- a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php +++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php @@ -19,7 +19,7 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; /** * Copyright (c) 2015 Vincent Petry @@ -33,9 +33,9 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre; * * @group DB * - * @package Tests\Connector\Sabre + * @package OCA\DAV\Tests\unit\Connector\Sabre */ -class CustomPropertiesBackend extends \Test\TestCase { +class CustomPropertiesBackendTest extends \Test\TestCase { /** * @var \Sabre\DAV\Server diff --git a/apps/dav/tests/unit/connector/sabre/directory.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php similarity index 99% rename from apps/dav/tests/unit/connector/sabre/directory.php rename to apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php index e25a82c487..66f0a80380 100644 --- a/apps/dav/tests/unit/connector/sabre/directory.php +++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php @@ -29,7 +29,7 @@ use OCP\Files\ForbiddenException; /** * @group DB */ -class Directory extends \Test\TestCase { +class DirectoryTest extends \Test\TestCase { /** @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject */ private $view; diff --git a/apps/dav/tests/unit/connector/sabre/DummyGetResponsePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php similarity index 95% rename from apps/dav/tests/unit/connector/sabre/DummyGetResponsePluginTest.php rename to apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php index 0ead617f46..125cb174c5 100644 --- a/apps/dav/tests/unit/connector/sabre/DummyGetResponsePluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\DummyGetResponsePlugin; use Test\TestCase; @@ -28,7 +28,7 @@ use Test\TestCase; /** * Class DummyGetResponsePluginTest * - * @package Test\Connector\Sabre + * @package OCA\DAV\Tests\unit\Connector\Sabre */ class DummyGetResponsePluginTest extends TestCase { /** @var DummyGetResponsePlugin */ diff --git a/apps/dav/tests/unit/connector/sabre/exception/forbiddentest.php b/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php similarity index 96% rename from apps/dav/tests/unit/connector/sabre/exception/forbiddentest.php rename to apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php index 36ea97df9f..44e9e17b69 100644 --- a/apps/dav/tests/unit/connector/sabre/exception/forbiddentest.php +++ b/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\Exception; +namespace OCA\DAV\Tests\unit\Connector\Sabre\Exception; use OCA\DAV\Connector\Sabre\Exception\Forbidden; diff --git a/apps/dav/tests/unit/connector/sabre/exception/invalidpathtest.php b/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php similarity index 96% rename from apps/dav/tests/unit/connector/sabre/exception/invalidpathtest.php rename to apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php index 431a0484d6..0e1224f596 100644 --- a/apps/dav/tests/unit/connector/sabre/exception/invalidpathtest.php +++ b/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\Exception; +namespace OCA\DAV\Tests\unit\Connector\Sabre\Exception; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; diff --git a/apps/dav/tests/unit/connector/sabre/exceptionloggerplugin.php b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php similarity index 95% rename from apps/dav/tests/unit/connector/sabre/exceptionloggerplugin.php rename to apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php index b76285be33..f6102fa4e9 100644 --- a/apps/dav/tests/unit/connector/sabre/exceptionloggerplugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin as PluginToTest; @@ -44,7 +44,7 @@ class TestLogger extends Log { } } -class ExceptionLoggerPlugin extends TestCase { +class ExceptionLoggerPluginTest extends TestCase { /** @var Server */ private $server; diff --git a/apps/dav/tests/unit/connector/sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/FakeLockerPluginTest.php rename to apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php index 30d2bf4181..98edfb3c5b 100644 --- a/apps/dav/tests/unit/connector/sabre/FakeLockerPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php @@ -19,7 +19,7 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\FakeLockerPlugin; use Sabre\HTTP\Response; @@ -28,7 +28,7 @@ use Test\TestCase; /** * Class FakeLockerPluginTest * - * @package OCA\DAV\Tests\Unit\Connector\Sabre + * @package OCA\DAV\Tests\unit\Connector\Sabre */ class FakeLockerPluginTest extends TestCase { /** @var FakeLockerPlugin */ diff --git a/apps/dav/tests/unit/connector/sabre/file.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php similarity index 99% rename from apps/dav/tests/unit/connector/sabre/file.php rename to apps/dav/tests/unit/Connector/Sabre/FileTest.php index eab7ece159..0f404a6a16 100644 --- a/apps/dav/tests/unit/connector/sabre/file.php +++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php @@ -22,7 +22,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OC\Files\Storage\Local; use OCP\Files\ForbiddenException; @@ -35,9 +35,9 @@ use OCP\Lock\ILockingProvider; * * @group DB * - * @package Test\Connector\Sabre + * @package OCA\DAV\Tests\unit\Connector\Sabre */ -class File extends \Test\TestCase { +class FileTest extends \Test\TestCase { /** * @var string diff --git a/apps/dav/tests/unit/connector/sabre/filesplugin.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php similarity index 99% rename from apps/dav/tests/unit/connector/sabre/filesplugin.php rename to apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index fb5d658b39..5a944e74fc 100644 --- a/apps/dav/tests/unit/connector/sabre/filesplugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php @@ -20,7 +20,7 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCP\Files\StorageNotAvailableException; use Sabre\DAV\PropFind; @@ -33,7 +33,7 @@ use Test\TestCase; * later. * See the COPYING-README file. */ -class FilesPlugin extends TestCase { +class FilesPluginTest extends TestCase { const GETETAG_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::GETETAG_PROPERTYNAME; const FILEID_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::FILEID_PROPERTYNAME; const INTERNAL_FILEID_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::INTERNAL_FILEID_PROPERTYNAME; diff --git a/apps/dav/tests/unit/connector/sabre/filesreportplugin.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php similarity index 99% rename from apps/dav/tests/unit/connector/sabre/filesreportplugin.php rename to apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php index ffe1a19ee5..d5bbbbcc99 100644 --- a/apps/dav/tests/unit/connector/sabre/filesreportplugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\FilesReportPlugin as FilesReportPluginImplementation; use Sabre\DAV\Exception\NotFound; @@ -30,7 +30,7 @@ use OCP\Files\Folder; use OCP\IGroupManager; use OCP\SystemTag\ISystemTagManager; -class FilesReportPlugin extends \Test\TestCase { +class FilesReportPluginTest extends \Test\TestCase { /** @var \Sabre\DAV\Server|\PHPUnit_Framework_MockObject_MockObject */ private $server; diff --git a/apps/dav/tests/unit/connector/sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php similarity index 95% rename from apps/dav/tests/unit/connector/sabre/MaintenancePluginTest.php rename to apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php index dea1e64db1..a95dcd69f4 100644 --- a/apps/dav/tests/unit/connector/sabre/MaintenancePluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\MaintenancePlugin; use Test\TestCase; @@ -28,7 +28,7 @@ use OCP\IConfig; /** * Class MaintenancePluginTest * - * @package Test\Connector\Sabre + * @package OCA\DAV\Tests\unit\Connector\Sabre */ class MaintenancePluginTest extends TestCase { /** @var IConfig */ diff --git a/apps/dav/tests/unit/connector/sabre/node.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php similarity index 97% rename from apps/dav/tests/unit/connector/sabre/node.php rename to apps/dav/tests/unit/Connector/Sabre/NodeTest.php index f70d1ee3fa..deb6ecf7f7 100644 --- a/apps/dav/tests/unit/connector/sabre/node.php +++ b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php @@ -21,15 +21,15 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; /** - * Class Node + * Class NodeTest * * @group DB - * @package OCA\DAV\Tests\Unit\Connector\Sabre + * @package OCA\DAV\Tests\unit\Connector\Sabre */ -class Node extends \Test\TestCase { +class NodeTest extends \Test\TestCase { public function davPermissionsProvider() { return array( array(\OCP\Constants::PERMISSION_ALL, 'file', false, false, 'RDNVW'), diff --git a/apps/dav/tests/unit/connector/sabre/objecttree.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/objecttree.php rename to apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php index e5e858ef17..4a5e43376c 100644 --- a/apps/dav/tests/unit/connector/sabre/objecttree.php +++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php @@ -23,7 +23,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OC\Files\FileInfo; @@ -59,13 +59,13 @@ class TestDoubleFileView extends \OC\Files\View { } /** - * Class ObjectTree + * Class ObjectTreeTest * * @group DB * * @package OCA\DAV\Tests\Unit\Connector\Sabre */ -class ObjectTree extends \Test\TestCase { +class ObjectTreeTest extends \Test\TestCase { /** * @dataProvider moveFailedProvider diff --git a/apps/dav/tests/unit/connector/sabre/principal.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/principal.php rename to apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php index 75076e9618..63717713a7 100644 --- a/apps/dav/tests/unit/connector/sabre/principal.php +++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php @@ -21,14 +21,14 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCP\IGroupManager; use \Sabre\DAV\PropPatch; use OCP\IUserManager; use Test\TestCase; -class Principal extends TestCase { +class PrincipalTest extends TestCase { /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */ private $userManager; /** @var \OCA\DAV\Connector\Sabre\Principal */ diff --git a/apps/dav/tests/unit/connector/sabre/quotaplugin.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/quotaplugin.php rename to apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php index b5a8bfef31..45fb1743d1 100644 --- a/apps/dav/tests/unit/connector/sabre/quotaplugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php @@ -20,14 +20,14 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; /** * Copyright (c) 2013 Thomas Müller * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. */ -class QuotaPlugin extends \Test\TestCase { +class QuotaPluginTest extends \Test\TestCase { /** * @var \Sabre\DAV\Server diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/auth.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/requesttest/auth.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php index b728a8f3bd..a8fcf55284 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/auth.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use Sabre\DAV\Auth\Backend\BackendInterface; use Sabre\HTTP\RequestInterface; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php similarity index 94% rename from apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php index 3d047399a1..1b296aaa24 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use OCP\AppFramework\Http; use OCP\Lock\ILockingProvider; @@ -30,7 +30,7 @@ use OCP\Lock\ILockingProvider; * * @group DB * - * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest + * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest */ class DownloadTest extends RequestTest { public function testDownload() { diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php similarity index 96% rename from apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php index c5c6d0da0c..1a593cb8d7 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use OC\Files\View; use Test\Traits\EncryptionTrait; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/exceptionplugin.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php similarity index 95% rename from apps/dav/tests/unit/connector/sabre/requesttest/exceptionplugin.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php index a6a0f9d3b8..42b8ef927f 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/exceptionplugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use Sabre\DAV\Exception; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/partfileinrootupload.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php similarity index 87% rename from apps/dav/tests/unit/connector/sabre/requesttest/partfileinrootupload.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php index 52790c5b00..2986db4a7f 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/partfileinrootupload.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php @@ -20,19 +20,19 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use OC\Files\View; use Test\Traits\EncryptionTrait; /** - * Class EncryptionUploadTest + * Class PartFileInRootUploadTest * * @group DB * - * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest + * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest */ -class PartFileInRootUpload extends UploadTest { +class PartFileInRootUploadTest extends UploadTest { protected function setUp() { $config = \OC::$server->getConfig(); $mockConfig = $this->getMock('\OCP\IConfig'); diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php index e3cdca5abf..1c951a2fbd 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php @@ -22,7 +22,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use OCA\DAV\Connector\Sabre\Server; use OCA\DAV\Connector\Sabre\ServerFactory; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/sapi.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php similarity index 97% rename from apps/dav/tests/unit/connector/sabre/requesttest/sapi.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php index 6407d9bc28..0f11ded89e 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/sapi.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use Sabre\HTTP\Request; use Sabre\HTTP\Response; diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php rename to apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php index ae30268e36..efb499b69c 100644 --- a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest; +namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; use OC\Connector\Sabre\Exception\FileLocked; use OCP\AppFramework\Http; @@ -31,7 +31,7 @@ use OCP\Lock\ILockingProvider; * * @group DB * - * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest + * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest */ class UploadTest extends RequestTest { public function testBasicUpload() { diff --git a/apps/dav/tests/unit/connector/sabre/sharesplugin.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php similarity index 98% rename from apps/dav/tests/unit/connector/sabre/sharesplugin.php rename to apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php index 42f1b53991..ff1f59e785 100644 --- a/apps/dav/tests/unit/connector/sabre/sharesplugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php @@ -18,9 +18,9 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; -class SharesPlugin extends \Test\TestCase { +class SharesPluginTest extends \Test\TestCase { const SHARETYPES_PROPERTYNAME = \OCA\DAV\Connector\Sabre\SharesPlugin::SHARETYPES_PROPERTYNAME; diff --git a/apps/dav/tests/unit/connector/sabre/tagsplugin.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php similarity index 99% rename from apps/dav/tests/unit/connector/sabre/tagsplugin.php rename to apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php index 95ba002e39..e48d9b3aa5 100644 --- a/apps/dav/tests/unit/connector/sabre/tagsplugin.php +++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php @@ -19,7 +19,7 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\Connector\Sabre; +namespace OCA\DAV\Tests\unit\Connector\Sabre; /** * Copyright (c) 2014 Vincent Petry @@ -27,7 +27,7 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre; * later. * See the COPYING-README file. */ -class TagsPlugin extends \Test\TestCase { +class TagsPluginTest extends \Test\TestCase { const TAGS_PROPERTYNAME = \OCA\DAV\Connector\Sabre\TagsPlugin::TAGS_PROPERTYNAME; const FAVORITE_PROPERTYNAME = \OCA\DAV\Connector\Sabre\TagsPlugin::FAVORITE_PROPERTYNAME; diff --git a/apps/dav/tests/unit/dav/browsererrorpageplugintest.php b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php similarity index 98% rename from apps/dav/tests/unit/dav/browsererrorpageplugintest.php rename to apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php index aeae0e1b15..c2ffd91ba3 100644 --- a/apps/dav/tests/unit/dav/browsererrorpageplugintest.php +++ b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php @@ -18,7 +18,8 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\DAV; + +namespace OCA\DAV\Tests\unit\DAV; use OCA\DAV\Files\BrowserErrorPagePlugin; use PHPUnit_Framework_MockObject_MockObject; diff --git a/apps/dav/tests/unit/dav/groupprincipaltest.php b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php similarity index 99% rename from apps/dav/tests/unit/dav/groupprincipaltest.php rename to apps/dav/tests/unit/DAV/GroupPrincipalTest.php index 9d01263931..7bfb89609e 100644 --- a/apps/dav/tests/unit/dav/groupprincipaltest.php +++ b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php @@ -18,7 +18,8 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit\DAV; + +namespace OCA\DAV\Tests\unit\DAV; use OCA\DAV\DAV\GroupPrincipalBackend; use OCP\IGroupManager; diff --git a/apps/dav/tests/unit/dav/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php similarity index 99% rename from apps/dav/tests/unit/dav/HookManagerTest.php rename to apps/dav/tests/unit/DAV/HookManagerTest.php index 5c36d0d785..25eb3b8c11 100644 --- a/apps/dav/tests/unit/dav/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\DAV\Tests\Unit\DAV; +namespace OCA\DAV\Tests\unit\DAV; use OCA\DAV\CalDAV\BirthdayService; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/tests/unit/dav/sharing/plugintest.php b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php similarity index 98% rename from apps/dav/tests/unit/dav/sharing/plugintest.php rename to apps/dav/tests/unit/DAV/Sharing/PluginTest.php index ce6c96f1bf..eccb59923f 100644 --- a/apps/dav/tests/unit/dav/sharing/plugintest.php +++ b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\DAV; +namespace OCA\DAV\Tests\unit\DAV\Sharing; use OCA\DAV\DAV\Sharing\IShareable; diff --git a/apps/dav/tests/unit/dav/systemprincipalbackendtest.php b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php similarity index 98% rename from apps/dav/tests/unit/dav/systemprincipalbackendtest.php rename to apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php index 26717f7509..a09b24fa8d 100644 --- a/apps/dav/tests/unit/dav/systemprincipalbackendtest.php +++ b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\DAV; +namespace OCA\DAV\Tests\unit\DAV; use OCA\DAV\DAV\SystemPrincipalBackend; use Test\TestCase; diff --git a/apps/dav/tests/unit/servertest.php b/apps/dav/tests/unit/ServerTest.php similarity index 97% rename from apps/dav/tests/unit/servertest.php rename to apps/dav/tests/unit/ServerTest.php index b25da3cc80..f52585ad20 100644 --- a/apps/dav/tests/unit/servertest.php +++ b/apps/dav/tests/unit/ServerTest.php @@ -19,7 +19,7 @@ * along with this program. If not, see * */ -namespace OCA\DAV\Tests\Unit; +namespace OCA\DAV\Tests\unit; use OCA\DAV\Server; use OCP\IRequest; @@ -40,4 +40,4 @@ class ServerTest extends \Test\TestCase { $s = new Server($r, '/'); $this->assertNotNull($s->server); } -} \ No newline at end of file +} diff --git a/apps/dav/tests/unit/systemtag/systemtagmappingnode.php b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php similarity index 97% rename from apps/dav/tests/unit/systemtag/systemtagmappingnode.php rename to apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php index f0e1c3bc56..28f8c93a61 100644 --- a/apps/dav/tests/unit/systemtag/systemtagmappingnode.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php @@ -19,14 +19,14 @@ * */ -namespace OCA\DAV\Tests\Unit\SystemTag; +namespace OCA\DAV\Tests\unit\SystemTag; use Sabre\DAV\Exception\NotFound; use OC\SystemTag\SystemTag; use OCP\SystemTag\TagNotFoundException; use OCP\SystemTag\ISystemTag; -class SystemTagMappingNode extends \Test\TestCase { +class SystemTagMappingNodeTest extends \Test\TestCase { /** * @var \OCP\SystemTag\ISystemTagManager diff --git a/apps/dav/tests/unit/systemtag/systemtagnode.php b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php similarity index 98% rename from apps/dav/tests/unit/systemtag/systemtagnode.php rename to apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php index d9e088a7d9..ff5f6d1aa0 100644 --- a/apps/dav/tests/unit/systemtag/systemtagnode.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\DAV\Tests\Unit\SystemTag; +namespace OCA\DAV\Tests\unit\SystemTag; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\MethodNotAllowed; @@ -30,7 +30,7 @@ use OCP\SystemTag\TagNotFoundException; use OCP\SystemTag\TagAlreadyExistsException; use OCP\SystemTag\ISystemTag; -class SystemTagNode extends \Test\TestCase { +class SystemTagNodeTest extends \Test\TestCase { /** * @var \OCP\SystemTag\ISystemTagManager diff --git a/apps/dav/tests/unit/systemtag/systemtagplugin.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php similarity index 99% rename from apps/dav/tests/unit/systemtag/systemtagplugin.php rename to apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php index da82bc8904..154aa61986 100644 --- a/apps/dav/tests/unit/systemtag/systemtagplugin.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php @@ -21,7 +21,7 @@ * */ -namespace OCA\DAV\Tests\Unit\SystemTag; +namespace OCA\DAV\Tests\unit\SystemTag; use OC\SystemTag\SystemTag; use OCP\IGroupManager; @@ -30,7 +30,7 @@ use OCP\SystemTag\TagAlreadyExistsException; use OCP\IUser; use OCP\SystemTag\ISystemTag; -class SystemTagPlugin extends \Test\TestCase { +class SystemTagPluginTest extends \Test\TestCase { const ID_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::ID_PROPERTYNAME; const DISPLAYNAME_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::DISPLAYNAME_PROPERTYNAME; diff --git a/apps/dav/tests/unit/systemtag/systemtagsbyidcollection.php b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php similarity index 98% rename from apps/dav/tests/unit/systemtag/systemtagsbyidcollection.php rename to apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php index 5aa28d1a25..7722ac08df 100644 --- a/apps/dav/tests/unit/systemtag/systemtagsbyidcollection.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php @@ -19,13 +19,13 @@ * */ -namespace OCA\DAV\Tests\Unit\SystemTag; +namespace OCA\DAV\Tests\unit\SystemTag; use OC\SystemTag\SystemTag; use OCP\SystemTag\TagNotFoundException; -class SystemTagsByIdCollection extends \Test\TestCase { +class SystemTagsByIdCollectionTest extends \Test\TestCase { /** * @var \OCP\SystemTag\ISystemTagManager diff --git a/apps/dav/tests/unit/systemtag/systemtagsobjectmappingcollection.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php similarity index 98% rename from apps/dav/tests/unit/systemtag/systemtagsobjectmappingcollection.php rename to apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php index 9adc5b88c4..63ab6032f7 100644 --- a/apps/dav/tests/unit/systemtag/systemtagsobjectmappingcollection.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php @@ -19,13 +19,13 @@ * */ -namespace OCA\DAV\Tests\Unit\SystemTag; +namespace OCA\DAV\Tests\unit\SystemTag; use OC\SystemTag\SystemTag; use OCP\SystemTag\TagNotFoundException; -class SystemTagsObjectMappingCollection extends \Test\TestCase { +class SystemTagsObjectMappingCollectionTest extends \Test\TestCase { /** * @var \OCP\SystemTag\ISystemTagManager @@ -33,7 +33,7 @@ class SystemTagsObjectMappingCollection extends \Test\TestCase { private $tagManager; /** - * @var \OCP\SystemTag\ISystemTagMapper + * @var \OCP\SystemTag\ISystemTagObjectMapper */ private $tagMapper; diff --git a/apps/dav/tests/unit/systemtag/systemtagsobjecttypecollection.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php similarity index 96% rename from apps/dav/tests/unit/systemtag/systemtagsobjecttypecollection.php rename to apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php index 1d4264f94f..036b415042 100644 --- a/apps/dav/tests/unit/systemtag/systemtagsobjecttypecollection.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php @@ -19,9 +19,9 @@ * */ -namespace OCA\DAV\Tests\Unit\SystemTag; +namespace OCA\DAV\Tests\unit\SystemTag; -class SystemTagsObjectTypeCollection extends \Test\TestCase { +class SystemTagsObjectTypeCollectionTest extends \Test\TestCase { /** * @var \OCA\DAV\SystemTag\SystemTagsObjectTypeCollection @@ -34,7 +34,7 @@ class SystemTagsObjectTypeCollection extends \Test\TestCase { private $tagManager; /** - * @var \OCP\SystemTag\ISystemTagMapper + * @var \OCP\SystemTag\ISystemTagObjectMapper */ private $tagMapper; diff --git a/apps/dav/tests/unit/upload/assemblystreamtest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php similarity index 91% rename from apps/dav/tests/unit/upload/assemblystreamtest.php rename to apps/dav/tests/unit/Upload/AssemblyStreamTest.php index 373d525a9d..b8fb1aa12e 100644 --- a/apps/dav/tests/unit/upload/assemblystreamtest.php +++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php @@ -1,6 +1,7 @@ mockFutureFile(); diff --git a/apps/dav/tests/unit/phpunit.xml b/apps/dav/tests/unit/phpunit.xml index 314855d863..e483515ca7 100644 --- a/apps/dav/tests/unit/phpunit.xml +++ b/apps/dav/tests/unit/phpunit.xml @@ -6,7 +6,7 @@ timeoutForLargeTests="900" > - . + .