diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-27 17:27:18 +0300 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-27 17:27:18 +0300 |
| commit | 3a7cf40aaa678bea1df143d2982d603b7a334eec (patch) | |
| tree | 63c1e3ad7f7f401d14411a4d44c523632906afc9 /tests | |
| parent | 0568b012672d650c6b5a49e72c4028dde5463c60 (diff) | |
Mode to modern phpunit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests')
217 files changed, 1094 insertions, 1046 deletions
diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php index f066eaba401..cbe6a816cd6 100644 --- a/tests/Core/Command/Apps/AppsDisableTest.php +++ b/tests/Core/Command/Apps/AppsDisableTest.php @@ -36,7 +36,7 @@ class AppsDisableTest extends TestCase { /** @var CommandTester */ private $commandTester; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $command = new Disable( diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php index a30bef59326..6c137dca44b 100644 --- a/tests/Core/Command/Apps/AppsEnableTest.php +++ b/tests/Core/Command/Apps/AppsEnableTest.php @@ -36,7 +36,7 @@ class AppsEnableTest extends TestCase { /** @var CommandTester */ private $commandTester; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $command = new Enable( diff --git a/tests/Core/Command/Config/System/SetConfigTest.php b/tests/Core/Command/Config/System/SetConfigTest.php index e3cfa89093d..9b34afed691 100644 --- a/tests/Core/Command/Config/System/SetConfigTest.php +++ b/tests/Core/Command/Config/System/SetConfigTest.php @@ -102,9 +102,10 @@ class SetConfigTest extends TestCase { /** * @dataProvider setUpdateOnlyProvider - * @expectedException \UnexpectedValueException */ public function testSetUpdateOnly($configNames, $existingData) { + $this->expectException(\UnexpectedValueException::class); + $this->systemConfig->expects($this->never()) ->method('setValue'); $this->systemConfig->method('getValue') @@ -169,9 +170,10 @@ class SetConfigTest extends TestCase { /** * @dataProvider castValueInvalidProvider - * @expectedException \InvalidArgumentException */ public function testCastValueInvalid($value, $type) { + $this->expectException(\InvalidArgumentException::class); + $this->invokePrivate($this->command, 'castValue', [$value, $type]); } diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index 0f56cf53fa8..d17050e7245 100644 --- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php +++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php @@ -63,7 +63,7 @@ class ChangeKeyStorageRootTest extends TestCase { /** @var \OCP\UserInterface | \PHPUnit_Framework_MockObject_MockObject */ protected $userInterface; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->view = $this->getMockBuilder(View::class)->getMock(); @@ -181,12 +181,13 @@ class ChangeKeyStorageRootTest extends TestCase { /** * @dataProvider dataTestPrepareNewRootException - * @expectedException \Exception * * @param bool $dirExists * @param bool $couldCreateFile */ public function testPrepareNewRootException($dirExists, $couldCreateFile) { + $this->expectException(\Exception::class); + $this->view->expects($this->once())->method('is_dir')->with('newRoot') ->willReturn($dirExists); $this->view->expects($this->any())->method('file_put_contents')->willReturn($couldCreateFile); @@ -370,10 +371,10 @@ class ChangeKeyStorageRootTest extends TestCase { ); } - /** - * @expectedException \Exception - */ + public function testTargetExistsException() { + $this->expectException(\Exception::class); + $this->view->expects($this->once())->method('file_exists')->with('path') ->willReturn(true); diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php index 7fa95351045..acdaff4bbab 100644 --- a/tests/Core/Command/Encryption/DecryptAllTest.php +++ b/tests/Core/Command/Encryption/DecryptAllTest.php @@ -54,7 +54,7 @@ class DecryptAllTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Encryption\DecryptAll */ protected $decryptAll; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) @@ -181,10 +181,10 @@ class DecryptAllTest extends TestCase { ]; } - /** - * @expectedException \Exception - */ + public function testExecuteFailure() { + $this->expectException(\Exception::class); + $instance = new DecryptAll( $this->encryptionManager, $this->appManager, diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php index 9c9818475f5..778d51fd8b8 100644 --- a/tests/Core/Command/Encryption/EncryptAllTest.php +++ b/tests/Core/Command/Encryption/EncryptAllTest.php @@ -128,10 +128,10 @@ class EncryptAllTest extends TestCase { ]; } - /** - * @expectedException \Exception - */ + public function testExecuteException() { + $this->expectException(\Exception::class); + $command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper); $this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(false); $this->encryptionManager->expects($this->never())->method('getEncryptionModule'); diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php index ea30a5d3d68..d4ba34246af 100644 --- a/tests/Core/Command/Group/AddTest.php +++ b/tests/Core/Command/Group/AddTest.php @@ -44,7 +44,7 @@ class AddTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php index 85288d9e29c..1ee2d2d3377 100644 --- a/tests/Core/Command/Group/AddUserTest.php +++ b/tests/Core/Command/Group/AddUserTest.php @@ -49,7 +49,7 @@ class AddUserTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php index 4c2acbbad94..69bdae99d63 100644 --- a/tests/Core/Command/Group/DeleteTest.php +++ b/tests/Core/Command/Group/DeleteTest.php @@ -44,7 +44,7 @@ class DeleteTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php index 71697d89401..21adb29924a 100644 --- a/tests/Core/Command/Group/ListCommandTest.php +++ b/tests/Core/Command/Group/ListCommandTest.php @@ -45,7 +45,7 @@ class ListCommandTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php index 7e835f58478..eda4886da3b 100644 --- a/tests/Core/Command/Group/RemoveUserTest.php +++ b/tests/Core/Command/Group/RemoveUserTest.php @@ -49,7 +49,7 @@ class RemoveUserTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Log/ManageTest.php b/tests/Core/Command/Log/ManageTest.php index 92907948fb2..d73bc7ed9c2 100644 --- a/tests/Core/Command/Log/ManageTest.php +++ b/tests/Core/Command/Log/ManageTest.php @@ -87,17 +87,17 @@ class ManageTest extends TestCase { self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testValidateBackend() { + $this->expectException(\InvalidArgumentException::class); + self::invokePrivate($this->command, 'validateBackend', ['notabackend']); } - /** - * @expectedException \Exception - */ + public function testValidateTimezone() { + $this->expectException(\Exception::class); + // this might need to be changed when humanity colonises Mars self::invokePrivate($this->command, 'validateTimezone', ['Mars/OlympusMons']); } @@ -123,10 +123,10 @@ class ManageTest extends TestCase { ); } - /** - * @expectedException \InvalidArgumentException - */ + public function testConvertLevelStringInvalid() { + $this->expectException(\InvalidArgumentException::class); + self::invokePrivate($this->command, 'convertLevelString', ['abc']); } @@ -149,10 +149,10 @@ class ManageTest extends TestCase { ); } - /** - * @expectedException \InvalidArgumentException - */ + public function testConvertLevelNumberInvalid() { + $this->expectException(\InvalidArgumentException::class); + self::invokePrivate($this->command, 'convertLevelNumber', [11]); } diff --git a/tests/Core/Command/TwoFactorAuth/DisableTest.php b/tests/Core/Command/TwoFactorAuth/DisableTest.php index 9741f5b2b52..fc0def50b90 100644 --- a/tests/Core/Command/TwoFactorAuth/DisableTest.php +++ b/tests/Core/Command/TwoFactorAuth/DisableTest.php @@ -45,7 +45,7 @@ class DisableTest extends TestCase { /** @var CommandTester */ private $command; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->providerManager = $this->createMock(ProviderManager::class); diff --git a/tests/Core/Command/TwoFactorAuth/EnableTest.php b/tests/Core/Command/TwoFactorAuth/EnableTest.php index bd74bde2e81..faf00ed1ded 100644 --- a/tests/Core/Command/TwoFactorAuth/EnableTest.php +++ b/tests/Core/Command/TwoFactorAuth/EnableTest.php @@ -45,7 +45,7 @@ class EnableTest extends TestCase { /** @var CommandTester */ private $command; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->providerManager = $this->createMock(ProviderManager::class); diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php index 00a4dd2b5fa..ceccf912285 100644 --- a/tests/Core/Controller/AppPasswordControllerTest.php +++ b/tests/Core/Controller/AppPasswordControllerTest.php @@ -64,7 +64,7 @@ class AppPasswordControllerTest extends TestCase { /** @var AppPasswordController */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->session = $this->createMock(ISession::class); diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php index d7feec28fd2..9135a6bc92f 100644 --- a/tests/Core/Controller/AvatarControllerTest.php +++ b/tests/Core/Controller/AvatarControllerTest.php @@ -121,7 +121,7 @@ class AvatarControllerTest extends \Test\TestCase { $this->avatarFile->method('getEtag')->willReturn('my etag'); } - public function tearDown(): void { + protected function tearDown(): void { parent::tearDown(); } diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/Core/Controller/ChangePasswordControllerTest.php index ac9d9d37993..a55b0bc232e 100644 --- a/tests/Core/Controller/ChangePasswordControllerTest.php +++ b/tests/Core/Controller/ChangePasswordControllerTest.php @@ -49,7 +49,7 @@ class ChangePasswordControllerTest extends \Test\TestCase { /** @var ChangePasswordController */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(\OC\User\Manager::class); diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php index ebe43ba560f..3932cb9e144 100644 --- a/tests/Core/Controller/ClientFlowLoginControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php @@ -74,7 +74,7 @@ class ClientFlowLoginControllerTest extends TestCase { /** @var ClientFlowLoginController */ private $clientFlowLoginController; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php index d8ce67b18f1..3c39a402f55 100644 --- a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php @@ -58,7 +58,7 @@ class ClientFlowLoginV2ControllerTest extends TestCase { /** @var ClientFlowLoginV2Controller */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index edee29cee57..c0d1ea42f41 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -48,7 +48,7 @@ class CssControllerTest extends TestCase { /** @var CssController */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 503e97d1c53..26df6d181ef 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -48,7 +48,7 @@ class JsControllerTest extends TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ private $request; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php index 6a8db74b0d3..b4f3663c0ba 100644 --- a/tests/Core/Controller/LoginControllerTest.php +++ b/tests/Core/Controller/LoginControllerTest.php @@ -83,7 +83,7 @@ class LoginControllerTest extends TestCase { /** @var IInitialStateService|MockObject */ private $initialStateService; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); $this->userManager = $this->createMock(\OC\User\Manager::class); diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index ce77d1d0684..4a4ad4b49e3 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -45,7 +45,7 @@ class NavigationControllerTest extends TestCase { /** @var NavigationController */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php index d1e7f2c4350..f0fbce86b8c 100644 --- a/tests/Core/Controller/OCSControllerTest.php +++ b/tests/Core/Controller/OCSControllerTest.php @@ -48,7 +48,7 @@ class OCSControllerTest extends TestCase { /** @var OCSController */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php index 145fb93f63a..65252561796 100644 --- a/tests/Core/Controller/PreviewControllerTest.php +++ b/tests/Core/Controller/PreviewControllerTest.php @@ -49,7 +49,7 @@ class PreviewControllerTest extends \Test\TestCase { /** @var PreviewController|\PHPUnit_Framework_MockObject_MockObject */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->rootFolder = $this->createMock(IRootFolder::class); diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index 489433f10b8..b5e43b2999d 100644 --- a/tests/Core/Controller/UserControllerTest.php +++ b/tests/Core/Controller/UserControllerTest.php @@ -38,7 +38,7 @@ class UserControllerTest extends TestCase { /** @var UserController */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); diff --git a/tests/Core/Controller/WipeControllerTest.php b/tests/Core/Controller/WipeControllerTest.php index ebbf6509009..73d16a63a6e 100644 --- a/tests/Core/Controller/WipeControllerTest.php +++ b/tests/Core/Controller/WipeControllerTest.php @@ -40,7 +40,7 @@ class WipeControllerTest extends TestCase { /** @var WipeController */ private $controller; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->remoteWipe = $this->createMock(RemoteWipe::class); diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php index 65db9733ab2..2198cc7d5b4 100644 --- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php +++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php @@ -162,10 +162,10 @@ class TwoFactorMiddlewareTest extends TestCase { $this->middleware->beforeController($this->controller, 'index'); } - /** - * @expectedException \OC\Authentication\Exceptions\TwoFactorAuthRequiredException - */ + public function testBeforeControllerTwoFactorAuthRequired() { + $this->expectException(\OC\Authentication\Exceptions\TwoFactorAuthRequiredException::class); + $user = $this->createMock(IUser::class); $this->reflector->expects($this->once()) @@ -190,10 +190,10 @@ class TwoFactorMiddlewareTest extends TestCase { $this->middleware->beforeController($this->controller, 'index'); } - /** - * @expectedException \OC\Authentication\Exceptions\UserAlreadyLoggedInException - */ + public function testBeforeControllerUserAlreadyLoggedIn() { + $this->expectException(\OC\Authentication\Exceptions\UserAlreadyLoggedInException::class); + $user = $this->createMock(IUser::class); $this->reflector diff --git a/tests/lib/Accounts/AccountsManagerTest.php b/tests/lib/Accounts/AccountsManagerTest.php index 3204eca8bbb..d727f05d1ef 100644 --- a/tests/lib/Accounts/AccountsManagerTest.php +++ b/tests/lib/Accounts/AccountsManagerTest.php @@ -51,7 +51,7 @@ class AccountsManagerTest extends TestCase { /** @var string accounts table name */ private $table = 'accounts'; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface') ->disableOriginalConstructor()->getMock(); @@ -59,7 +59,7 @@ class AccountsManagerTest extends TestCase { $this->jobList = $this->getMockBuilder(IJobList::class)->getMock(); } - public function tearDown(): void { + protected function tearDown(): void { parent::tearDown(); $query = $this->connection->getQueryBuilder(); $query->delete($this->table)->execute(); diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php index 1cffb1e265e..0d6ce3241d6 100644 --- a/tests/lib/Accounts/HooksTest.php +++ b/tests/lib/Accounts/HooksTest.php @@ -45,7 +45,7 @@ class HooksTest extends TestCase { /** @var Hooks | \PHPUnit_Framework_MockObject_MockObject */ private $hooks; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/Activity/ManagerTest.php b/tests/lib/Activity/ManagerTest.php index fed4bceb6a7..b52b12a7e8c 100644 --- a/tests/lib/Activity/ManagerTest.php +++ b/tests/lib/Activity/ManagerTest.php @@ -75,10 +75,10 @@ class ManagerTest extends TestCase { $this->assertNotEmpty($consumers); } - /** - * @expectedException \InvalidArgumentException - */ + public function testGetConsumersInvalidConsumer() { + $this->expectException(\InvalidArgumentException::class); + $this->activityManager->registerConsumer(function() { return new \stdClass(); }); @@ -98,13 +98,14 @@ class ManagerTest extends TestCase { } /** - * @expectedException \UnexpectedValueException * @dataProvider getUserFromTokenThrowInvalidTokenData * * @param string $token * @param array $users */ public function testGetUserFromTokenThrowInvalidToken($token, $users) { + $this->expectException(\UnexpectedValueException::class); + $this->mockRSSToken($token, $token, $users); self::invokePrivate($this->activityManager, 'getUserFromToken'); } @@ -163,37 +164,37 @@ class ManagerTest extends TestCase { ->willReturn($mockUser); } - /** - * @expectedException \BadMethodCallException - */ + public function testPublishExceptionNoApp() { + $this->expectException(\BadMethodCallException::class); + $event = $this->activityManager->generateEvent(); $this->activityManager->publish($event); } - /** - * @expectedException \BadMethodCallException - */ + public function testPublishExceptionNoType() { + $this->expectException(\BadMethodCallException::class); + $event = $this->activityManager->generateEvent(); $event->setApp('test'); $this->activityManager->publish($event); } - /** - * @expectedException \BadMethodCallException - */ + public function testPublishExceptionNoAffectedUser() { + $this->expectException(\BadMethodCallException::class); + $event = $this->activityManager->generateEvent(); $event->setApp('test') ->setType('test_type'); $this->activityManager->publish($event); } - /** - * @expectedException \BadMethodCallException - */ + public function testPublishExceptionNoSubject() { + $this->expectException(\BadMethodCallException::class); + $event = $this->activityManager->generateEvent(); $event->setApp('test') ->setType('test_type') diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php index f3d43ff4396..80ddcbbd354 100644 --- a/tests/lib/AllConfigTest.php +++ b/tests/lib/AllConfigTest.php @@ -137,17 +137,18 @@ class AllConfigTest extends \Test\TestCase { /** * @dataProvider dataSetUserValueUnexpectedValue * @param mixed $value - * @expectedException \UnexpectedValueException */ public function testSetUserValueUnexpectedValue($value) { + $this->expectException(\UnexpectedValueException::class); + $config = $this->getConfig(); $config->setUserValue('userSetBool', 'appSetBool', 'keySetBool', $value); } - /** - * @expectedException \OCP\PreConditionNotMetException - */ + public function testSetUserValueWithPreConditionFailure() { + $this->expectException(\OCP\PreConditionNotMetException::class); + $config = $this->getConfig(); $selectAllSQL = 'SELECT `userid`, `appid`, `configkey`, `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?'; diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index 0dc93174a67..b3437ad290c 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -248,10 +248,11 @@ class AppManagerTest extends TestCase { * * @param string $type * - * @expectedException \Exception - * @expectedExceptionMessage test can't be enabled for groups. */ public function testEnableAppForGroupsForbiddenTypes($type) { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('test can\'t be enabled for groups.'); + $group1 = $this->createMock(IGroup::class); $group1->method('getGID') ->willReturn('group1'); diff --git a/tests/lib/App/AppStore/Bundles/BundleBase.php b/tests/lib/App/AppStore/Bundles/BundleBase.php index 6b03940c9a9..2c566b0ea0a 100644 --- a/tests/lib/App/AppStore/Bundles/BundleBase.php +++ b/tests/lib/App/AppStore/Bundles/BundleBase.php @@ -37,7 +37,7 @@ abstract class BundleBase extends TestCase { /** @var array */ protected $bundleAppIds; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->l10n = $this->createMock(IL10N::class); $this->l10n->method('t') diff --git a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php index 27384953d3f..f453fbcb59a 100644 --- a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php +++ b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php @@ -36,7 +36,7 @@ class BundleFetcherTest extends TestCase { /** @var BundleFetcher */ private $bundleFetcher; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->l10n = $this->createMock(IL10N::class); @@ -69,11 +69,11 @@ class BundleFetcherTest extends TestCase { $this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle')); } - /** - * @expectedException \BadMethodCallException - * @expectedExceptionMessage Bundle with specified identifier does not exist - */ + public function testGetBundleByIdentifierWithException() { + $this->expectException(\BadMethodCallException::class); + $this->expectExceptionMessage('Bundle with specified identifier does not exist'); + $this->bundleFetcher->getBundleByIdentifier('NotExistingBundle'); } diff --git a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php b/tests/lib/App/AppStore/Bundles/CoreBundleTest.php index 01a449c8093..2ace537b938 100644 --- a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/CoreBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\CoreBundle; class CoreBundleTest extends BundleBase { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->bundle = new CoreBundle($this->l10n); $this->bundleIdentifier = 'CoreBundle'; diff --git a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php index e3da7f1f660..1c5d2a480e9 100644 --- a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\EducationBundle; class EducationBundleTest extends BundleBase { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->bundle = new EducationBundle($this->l10n); $this->bundleIdentifier = 'EducationBundle'; diff --git a/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php b/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php index 717c6151ed4..d24e8846f56 100644 --- a/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\EnterpriseBundle; class EnterpriseBundleTest extends BundleBase { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->bundle = new EnterpriseBundle($this->l10n); $this->bundleIdentifier = 'EnterpriseBundle'; diff --git a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php index 547e6e84ec8..88391a6382f 100644 --- a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\GroupwareBundle; class GroupwareBundleTest extends BundleBase { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->bundle = new GroupwareBundle($this->l10n); $this->bundleIdentifier = 'GroupwareBundle'; diff --git a/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php b/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php index 7f0e0f49302..17b2974b7c7 100644 --- a/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\SocialSharingBundle; class SocialSharingBundleTest extends BundleBase { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->bundle = new SocialSharingBundle($this->l10n); $this->bundleIdentifier = 'SocialSharingBundle'; diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index cf19b5aa355..9a118234049 100644 --- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php @@ -59,7 +59,7 @@ class AppFetcherTest extends TestCase { EOD; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); /** @var Factory|PHPUnit_Framework_MockObject_MockObject $factory */ diff --git a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php index 753a1bf88d3..8a82322b61c 100644 --- a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Fetcher; use OC\App\AppStore\Fetcher\CategoryFetcher; class CategoryFetcherTest extends FetcherBase { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->fileName = 'categories.json'; $this->endpoint = 'https://apps.nextcloud.com/api/v1/categories.json'; diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index 4f614d33101..84584e5432f 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -56,7 +56,7 @@ abstract class FetcherBase extends TestCase { /** @var string */ protected $endpoint; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->appDataFactory = $this->createMock(Factory::class); $this->appData = $this->createMock(AppData::class); diff --git a/tests/lib/App/AppStore/Version/VersionParserTest.php b/tests/lib/App/AppStore/Version/VersionParserTest.php index ea30f40d821..327c8cac779 100644 --- a/tests/lib/App/AppStore/Version/VersionParserTest.php +++ b/tests/lib/App/AppStore/Version/VersionParserTest.php @@ -29,7 +29,7 @@ class VersionParserTest extends TestCase { /** @var VersionParser */ private $versionParser; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->versionParser = new VersionParser(); } @@ -81,19 +81,19 @@ class VersionParserTest extends TestCase { $this->assertEquals($expected, $this->versionParser->getVersion($input)); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Version cannot be parsed: BogusVersion - */ + public function testGetVersionException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Version cannot be parsed: BogusVersion'); + $this->versionParser->getVersion('BogusVersion'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Version cannot be parsed: >=8.2 <=9.1a - */ + public function testGetVersionExceptionWithMultiple() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Version cannot be parsed: >=8.2 <=9.1a'); + $this->versionParser->getVersion('>=8.2 <=9.1a'); } } diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php index d6848971a84..943b53eee64 100644 --- a/tests/lib/App/DependencyAnalyzerTest.php +++ b/tests/lib/App/DependencyAnalyzerTest.php @@ -26,7 +26,7 @@ class DependencyAnalyzerTest extends TestCase { /** @var DependencyAnalyzer */ private $analyser; - public function setUp(): void { + protected function setUp(): void { $this->platformMock = $this->getMockBuilder(Platform::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/AppConfigTest.php b/tests/lib/AppConfigTest.php index 87f8142d4b9..14114e8fad7 100644 --- a/tests/lib/AppConfigTest.php +++ b/tests/lib/AppConfigTest.php @@ -26,7 +26,7 @@ class AppConfigTest extends TestCase { protected $originalConfig; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -111,7 +111,7 @@ class AppConfigTest extends TestCase { ])->execute(); } - public function tearDown(): void { + protected function tearDown(): void { $sql = $this->connection->getQueryBuilder(); $sql->delete('appconfig'); $sql->execute(); diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index d239cacf633..b1cb1ceab6f 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -94,10 +94,10 @@ class ControllerTest extends \Test\TestCase { $this->controller = new ChildController($this->app, $request); } - /** - * @expectedException \DomainException - */ + public function testFormatResonseInvalidFormat() { + $this->expectException(\DomainException::class); + $this->controller->buildResponse(null, 'test'); } diff --git a/tests/lib/AppFramework/Db/EntityTest.php b/tests/lib/AppFramework/Db/EntityTest.php index 3eb9f6eef51..c8ebda55a86 100644 --- a/tests/lib/AppFramework/Db/EntityTest.php +++ b/tests/lib/AppFramework/Db/EntityTest.php @@ -129,25 +129,25 @@ class EntityTest extends \Test\TestCase { } - /** - * @expectedException \BadFunctionCallException - */ + public function testCallShouldOnlyWorkForGetterSetter(){ + $this->expectException(\BadFunctionCallException::class); + $this->entity->something(); } - /** - * @expectedException \BadFunctionCallException - */ + public function testGetterShouldFailIfAttributeNotDefined(){ + $this->expectException(\BadFunctionCallException::class); + $this->entity->getTest(); } - /** - * @expectedException \BadFunctionCallException - */ + public function testSetterShouldFailIfAttributeNotDefined(){ + $this->expectException(\BadFunctionCallException::class); + $this->entity->setTest(); } @@ -245,10 +245,10 @@ class EntityTest extends \Test\TestCase { $this->assertThat($entity->isAnotherBool(), new IsType(IsType::TYPE_BOOL)); } - /** - * @expectedException BadFunctionCallException - */ + public function testIsGetterShoudFailForOtherType() { + $this->expectException(\BadFunctionCallException::class); + $entity = new TestEntity(); $entity->setName('hello'); $this->assertThat($entity->isName(), new IsType(IsType::TYPE_BOOL)); diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php index da4102396de..6fa0fe10d88 100644 --- a/tests/lib/AppFramework/Db/QBMapperTest.php +++ b/tests/lib/AppFramework/Db/QBMapperTest.php @@ -127,9 +127,7 @@ class QBMapperTest extends \Test\TestCase { $this->mapper = new QBTestMapper($this->db); } - /** - * - */ + public function testInsertEntityParameterTypeMapping() { $entity = new QBTestEntity(); $entity->setIntProp(123); @@ -166,9 +164,7 @@ class QBMapperTest extends \Test\TestCase { $this->mapper->insert($entity); } - /** - * - */ + public function testUpdateEntityParameterTypeMapping() { $entity = new QBTestEntity(); $entity->setId(789); @@ -214,9 +210,7 @@ class QBMapperTest extends \Test\TestCase { $this->mapper->update($entity); } - /** - * - */ + public function testGetParameterTypeForProperty() { $entity = new QBTestEntity(); diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php index a0783474df3..669063f4d18 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php +++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php @@ -56,7 +56,7 @@ class DIIntergrationTests extends TestCase { /** @var ServerContainer */ private $server; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->server = new ServerContainer(); diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php index 1f687b1f7cc..6acc21550d1 100644 --- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php @@ -21,7 +21,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase { /** @var ContentSecurityPolicy */ private $contentSecurityPolicy; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->contentSecurityPolicy = new ContentSecurityPolicy(); } diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php index 86de705a80c..c19caad23c7 100644 --- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php @@ -21,7 +21,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase { /** @var EmptyContentSecurityPolicy */ private $contentSecurityPolicy; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->contentSecurityPolicy = new EmptyContentSecurityPolicy(); } diff --git a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php index 0321d700cd7..1cebc9ef0f2 100644 --- a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php @@ -31,7 +31,7 @@ class EmptyFeaturePolicyTest extends \Test\TestCase { /** @var EmptyFeaturePolicy */ private $policy; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->policy = new EmptyFeaturePolicy(); } diff --git a/tests/lib/AppFramework/Http/FeaturePolicyTest.php b/tests/lib/AppFramework/Http/FeaturePolicyTest.php index 45d7ff0c558..af21457bf0a 100644 --- a/tests/lib/AppFramework/Http/FeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/FeaturePolicyTest.php @@ -31,7 +31,7 @@ class FeaturePolicyTest extends \Test\TestCase { /** @var EmptyFeaturePolicy */ private $policy; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->policy = new FeaturePolicy(); } diff --git a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php index d7c8b384bf5..5ca7635614c 100644 --- a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php +++ b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php @@ -34,7 +34,7 @@ class FileDisplayResponseTest extends \Test\TestCase { /** @var FileDisplayResponse */ private $response; - public function setUp(): void { + protected function setUp(): void { $this->file = $this->getMockBuilder('OCP\Files\File') ->getMock(); diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php index 4981313c32a..95d2e2a0a4c 100644 --- a/tests/lib/AppFramework/Http/JSONResponseTest.php +++ b/tests/lib/AppFramework/Http/JSONResponseTest.php @@ -89,11 +89,11 @@ class JSONResponseTest extends \Test\TestCase { $this->assertEquals($expected, $this->json->render()); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Could not json_encode due to invalid non UTF-8 characters in the array: array ( - */ + public function testRenderWithNonUtf8Encoding() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Could not json_encode due to invalid non UTF-8 characters in the array: array ('); + $params = ['test' => hex2bin('e9')]; $this->json->setData($params); $this->json->render(); diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index 7ca09cf33da..000a05f7913 100644 --- a/tests/lib/AppFramework/Http/RequestTest.php +++ b/tests/lib/AppFramework/Http/RequestTest.php @@ -103,10 +103,10 @@ class RequestTest extends \Test\TestCase { } - /** - * @expectedException \RuntimeException - */ + public function testImmutableArrayAccess() { + $this->expectException(\RuntimeException::class); + $vars = array( 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), 'method' => 'GET' @@ -123,10 +123,10 @@ class RequestTest extends \Test\TestCase { $request['nickname'] = 'Janey'; } - /** - * @expectedException \RuntimeException - */ + public function testImmutableMagicAccess() { + $this->expectException(\RuntimeException::class); + $vars = array( 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), 'method' => 'GET' @@ -143,10 +143,10 @@ class RequestTest extends \Test\TestCase { $request->{'nickname'} = 'Janey'; } - /** - * @expectedException \LogicException - */ + public function testGetTheMethodRight() { + $this->expectException(\LogicException::class); + $vars = array( 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), 'method' => 'GET', @@ -1246,11 +1246,11 @@ class RequestTest extends \Test\TestCase { $this->assertSame('www.owncloud.org', self::invokePrivate($request, 'getOverwriteHost')); } - /** - * @expectedException \Exception - * @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php') - */ + public function testGetPathInfoNotProcessible() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('The requested uri(/foo.php) cannot be processed by the script \'/var/www/index.php\')'); + $request = new Request( [ 'server' => [ @@ -1267,11 +1267,11 @@ class RequestTest extends \Test\TestCase { $request->getPathInfo(); } - /** - * @expectedException \Exception - * @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php') - */ + public function testGetRawPathInfoNotProcessible() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('The requested uri(/foo.php) cannot be processed by the script \'/var/www/index.php\')'); + $request = new Request( [ 'server' => [ diff --git a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php index 3174971032b..8971fe4df06 100644 --- a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php @@ -47,7 +47,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase { /** @var AdditionalScriptsMiddleware */ private $middleWare; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->dispatcher = $this->createMock(EventDispatcherInterface::class); diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php index 6d464a66177..f6ce5c27b22 100644 --- a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php @@ -40,7 +40,7 @@ class BruteForceMiddlewareTest extends TestCase { /** @var BruteForceMiddleware */ private $bruteForceMiddleware; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->reflector = $this->createMock(ControllerMethodReflector::class); diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php index e022770a8cf..1c12a4aa153 100644 --- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php @@ -102,9 +102,10 @@ class CORSMiddlewareTest extends \Test\TestCase { /** * @CORS - * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\SecurityException */ public function testCorsIgnoredIfWithCredentialsHeaderPresent() { + $this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\SecurityException::class); + $request = new Request( [ 'server' => [ @@ -171,9 +172,10 @@ class CORSMiddlewareTest extends \Test\TestCase { /** * @CORS - * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\SecurityException */ public function testCORSShouldFailIfPasswordLoginIsForbidden() { + $this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\SecurityException::class); + $request = new Request( ['server' => [ 'PHP_AUTH_USER' => 'user', @@ -196,9 +198,10 @@ class CORSMiddlewareTest extends \Test\TestCase { /** * @CORS - * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\SecurityException */ public function testCORSShouldNotAllowCookieAuth() { + $this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\SecurityException::class); + $request = new Request( ['server' => [ 'PHP_AUTH_USER' => 'user', @@ -251,11 +254,11 @@ class CORSMiddlewareTest extends \Test\TestCase { $this->assertEquals($expected, $response); } - /** - * @expectedException \Exception - * @expectedExceptionMessage A regular exception - */ + public function testAfterExceptionWithRegularException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('A regular exception'); + $request = new Request( ['server' => [ 'PHP_AUTH_USER' => 'user', diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php index 89e396fcee3..3a06531eefd 100644 --- a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php @@ -45,7 +45,7 @@ class RateLimitingMiddlewareTest extends TestCase { /** @var RateLimitingMiddleware */ private $rateLimitingMiddleware; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); @@ -229,11 +229,11 @@ class RateLimitingMiddlewareTest extends TestCase { $this->rateLimitingMiddleware->beforeController($controller, 'testMethod'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage My test exception - */ + public function testAfterExceptionWithOtherException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('My test exception'); + /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ $controller = $this->createMock(Controller::class); diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php index c30d2760886..6f3c3f32adc 100644 --- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php @@ -43,7 +43,7 @@ class SameSiteCookieMiddlewareTest extends TestCase { /** @var ControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */ private $reflector; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(Request::class); diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 26d09af9003..ae0e6ff484d 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -256,9 +256,10 @@ class SecurityMiddlewareTest extends \Test\TestCase { /** * @PublicPage - * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException */ public function testCsrfCheck(){ + $this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException::class); + $this->request->expects($this->once()) ->method('passesCSRFCheck') ->will($this->returnValue(false)); @@ -300,9 +301,10 @@ class SecurityMiddlewareTest extends \Test\TestCase { /** * @PublicPage - * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException */ public function testFailCsrfCheck(){ + $this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException::class); + $this->request->expects($this->once()) ->method('passesCSRFCheck') ->will($this->returnValue(false)); @@ -317,9 +319,10 @@ class SecurityMiddlewareTest extends \Test\TestCase { /** * @PublicPage * @StrictCookieRequired - * @expectedException \OC\Appframework\Middleware\Security\Exceptions\StrictCookieMissingException */ public function testStrictCookieRequiredCheck() { + $this->expectException(\OC\Appframework\Middleware\Security\Exceptions\StrictCookieMissingException::class); + $this->request->expects($this->never()) ->method('passesCSRFCheck'); $this->request->expects($this->once()) diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php index 559561a8ccd..1b7ab054a0f 100644 --- a/tests/lib/AppFramework/Routing/RoutingTest.php +++ b/tests/lib/AppFramework/Routing/RoutingTest.php @@ -122,11 +122,11 @@ class RoutingTest extends \Test\TestCase $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something'); } - /** - * @expectedException \UnexpectedValueException - */ + public function testSimpleRouteWithBrokenName() { + $this->expectException(\UnexpectedValueException::class); + $routes = array('routes' => array( array('name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete') )); @@ -144,10 +144,10 @@ class RoutingTest extends \Test\TestCase $config->register(); } - /** - * @expectedException \UnexpectedValueException - */ + public function testSimpleOCSRouteWithBrokenName() { + $this->expectException(\UnexpectedValueException::class); + $routes = ['ocs' => [ ['name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete'] ]]; diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/lib/AppFramework/Utility/SimpleContainerTest.php index cfd55d8d6d8..0341be14af9 100644 --- a/tests/lib/AppFramework/Utility/SimpleContainerTest.php +++ b/tests/lib/AppFramework/Utility/SimpleContainerTest.php @@ -61,7 +61,7 @@ class SimpleContainerTest extends \Test\TestCase { private $container; - public function setUp(): void { + protected function setUp(): void { $this->container = new SimpleContainer(); } @@ -72,18 +72,18 @@ class SimpleContainerTest extends \Test\TestCase { } - /** - * @expectedException \OCP\AppFramework\QueryException - */ + public function testNothingRegistered() { + $this->expectException(\OCP\AppFramework\QueryException::class); + $this->container->query('something really hard'); } - /** - * @expectedException \OCP\AppFramework\QueryException - */ + public function testNotAClass() { + $this->expectException(\OCP\AppFramework\QueryException::class); + $this->container->query('Test\AppFramework\Utility\TestInterface'); } @@ -189,10 +189,10 @@ class SimpleContainerTest extends \Test\TestCase { $this->assertEquals('abc', $this->container->query($query)); } - /** - * @expectedException \OCP\AppFramework\QueryException - */ + public function testConstructorComplexNoTestParameterFound() { + $this->expectException(\OCP\AppFramework\QueryException::class); + $object = $this->container->query( 'Test\AppFramework\Utility\ClassComplexConstructor' ); diff --git a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php index fb20558c95a..7060dc2a770 100644 --- a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php +++ b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php @@ -145,10 +145,10 @@ class DefaultTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - /** - * @expectedException \OCP\AppFramework\Db\DoesNotExistException - */ + public function testGetInvalidToken() { + $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); + $token = 'thisisaninvalidtokenthatisnotinthedatabase'; $this->mapper->getToken($token); @@ -175,17 +175,17 @@ class DefaultTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - /** - * @expectedException \OCP\AppFramework\Db\DoesNotExistException - */ + public function testGetTokenByIdNotFound() { + $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); + $this->mapper->getTokenById(-1); } - /** - * @expectedException \OCP\AppFramework\Db\DoesNotExistException - */ + public function testGetInvalidTokenById() { + $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); + $id = 42; $this->mapper->getToken($id); diff --git a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php index b90a9931937..b4e5e097847 100644 --- a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php +++ b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php @@ -159,10 +159,10 @@ class DefaultTokenProviderTest extends TestCase { $this->assertEquals('passme', $actual); } - /** - * @expectedException \OC\Authentication\Exceptions\PasswordlessTokenException - */ + public function testGetPasswordPasswordLessToken() { + $this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class); + $token = 'token1234'; $tk = new DefaultToken(); $tk->setPassword(null); @@ -170,10 +170,10 @@ class DefaultTokenProviderTest extends TestCase { $this->tokenProvider->getPassword($tk, $token); } - /** - * @expectedException \OC\Authentication\Exceptions\InvalidTokenException - */ + public function testGetPasswordDeletesInvalidToken() { + $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); + $token = 'token1234'; $tk = new DefaultToken(); $tk->setPassword('someencryptedvalue'); @@ -222,10 +222,10 @@ class DefaultTokenProviderTest extends TestCase { $this->assertEquals('encryptedpassword', $token->getPassword()); } - /** - * @expectedException \OC\Authentication\Exceptions\InvalidTokenException - */ + public function testSetPasswordInvalidToken() { + $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); + $token = $this->createMock(IToken::class); $tokenId = 'token123'; $password = '123456'; diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php index b58001ee7bb..58340b905c0 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php @@ -171,10 +171,10 @@ class PublicKeyTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - /** - * @expectedException \OCP\AppFramework\Db\DoesNotExistException - */ + public function testGetInvalidToken() { + $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); + $token = 'thisisaninvalidtokenthatisnotinthedatabase'; $this->mapper->getToken($token); @@ -203,17 +203,17 @@ class PublicKeyTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - /** - * @expectedException \OCP\AppFramework\Db\DoesNotExistException - */ + public function testGetTokenByIdNotFound() { + $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); + $this->mapper->getTokenById(-1); } - /** - * @expectedException \OCP\AppFramework\Db\DoesNotExistException - */ + public function testGetInvalidTokenById() { + $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); + $id = '42'; $this->mapper->getToken($id); diff --git a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php index aecbd969ee1..3fa7a92bb9b 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php @@ -145,10 +145,10 @@ class PublicKeyTokenProviderTest extends TestCase { $this->assertSame($password, $this->tokenProvider->getPassword($actual, $token)); } - /** - * @expectedException \OC\Authentication\Exceptions\PasswordlessTokenException - */ + public function testGetPasswordPasswordLessToken() { + $this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class); + $token = 'token1234'; $tk = new PublicKeyToken(); $tk->setPassword(null); @@ -156,10 +156,10 @@ class PublicKeyTokenProviderTest extends TestCase { $this->tokenProvider->getPassword($tk, $token); } - /** - * @expectedException \OC\Authentication\Exceptions\InvalidTokenException - */ + public function testGetPasswordInvalidToken() { + $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); + $token = 'token'; $uid = 'user'; $user = 'User'; @@ -205,10 +205,10 @@ class PublicKeyTokenProviderTest extends TestCase { $this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'token')); } - /** - * @expectedException \OC\Authentication\Exceptions\InvalidTokenException - */ + public function testSetPasswordInvalidToken() { + $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); + $token = $this->createMock(IToken::class); $tokenId = 'token123'; $password = '123456'; diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php index 634ab97a8bf..f3762976837 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php @@ -52,11 +52,11 @@ class ProviderLoaderTest extends TestCase { $this->loader = new ProviderLoader($this->appManager); } - /** - * @expectedException Exception - * @expectedExceptionMessage Could not load two-factor auth provider \OCA\MyFaulty2faApp\DoesNotExist - */ + public function testFailHardIfProviderCanNotBeLoaded() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Could not load two-factor auth provider \\OCA\\MyFaulty2faApp\\DoesNotExist'); + $this->appManager->expects($this->once()) ->method('getEnabledAppsForUser') ->with($this->user) diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php index f776e244c27..e34d844c3a4 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php @@ -59,10 +59,10 @@ class ProviderManagerTest extends TestCase { ); } - /** - * @expectedException \OC\Authentication\Exceptions\InvalidProviderException - */ + public function testTryEnableInvalidProvider() { + $this->expectException(\OC\Authentication\Exceptions\InvalidProviderException::class); + $user = $this->createMock(IUser::class); $this->providerManager->tryEnableProviderFor('none', $user); } @@ -105,10 +105,10 @@ class ProviderManagerTest extends TestCase { $this->assertTrue($res); } - /** - * @expectedException \OC\Authentication\Exceptions\InvalidProviderException - */ + public function testTryDisableInvalidProvider() { + $this->expectException(\OC\Authentication\Exceptions\InvalidProviderException::class); + $user = $this->createMock(IUser::class); $this->providerManager->tryDisableProviderFor('none', $user); } diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/lib/Avatar/AvatarManagerTest.php index 812802f8c5f..5351a1069fc 100644 --- a/tests/lib/Avatar/AvatarManagerTest.php +++ b/tests/lib/Avatar/AvatarManagerTest.php @@ -51,7 +51,7 @@ class AvatarManagerTest extends \Test\TestCase { /** @var AvatarManager | \PHPUnit_Framework_MockObject_MockObject */ private $avatarManager; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(Manager::class); @@ -69,11 +69,11 @@ class AvatarManagerTest extends \Test\TestCase { ); } - /** - * @expectedException \Exception - * @expectedExceptionMessage user does not exist - */ + public function testGetAvatarInvalidUser() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('user does not exist'); + $this->userManager ->expects($this->once()) ->method('get') diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php index 19be534e0ef..ff6c63df2a8 100644 --- a/tests/lib/Avatar/UserAvatarTest.php +++ b/tests/lib/Avatar/UserAvatarTest.php @@ -31,7 +31,7 @@ class UserAvatarTest extends \Test\TestCase { /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->folder = $this->createMock(SimpleFolder::class); diff --git a/tests/lib/Cache/CappedMemoryCacheTest.php b/tests/lib/Cache/CappedMemoryCacheTest.php index 3b8e5bd7fb0..00231004fe5 100644 --- a/tests/lib/Cache/CappedMemoryCacheTest.php +++ b/tests/lib/Cache/CappedMemoryCacheTest.php @@ -28,7 +28,7 @@ namespace Test\Cache; * @package Test\Cache */ class CappedMemoryCacheTest extends TestCache { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->instance = new \OC\Cache\CappedMemoryCache(); } diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php index f4222a83ef8..e7d519a7493 100644 --- a/tests/lib/CapabilitiesManagerTest.php +++ b/tests/lib/CapabilitiesManagerTest.php @@ -35,7 +35,7 @@ class CapabilitiesManagerTest extends TestCase { /** @var ILogger */ private $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->logger = $this->getMockBuilder(ILogger::class)->getMock(); $this->manager = new CapabilitiesManager($this->logger); @@ -81,10 +81,11 @@ class CapabilitiesManagerTest extends TestCase { /** * Test that we need something that implents ICapability - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage The given Capability (Test\NoCapability) does not implement the ICapability interface */ public function testNoICapability() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('The given Capability (Test\\NoCapability) does not implement the ICapability interface'); + $this->manager->registerCapability(function() { return new NoCapability(); }); diff --git a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php index d5a84e9b1b5..3d81134680a 100644 --- a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php @@ -60,7 +60,7 @@ class GroupPluginTest extends TestCase { /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ protected $user; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php index 40fee52f234..15dccf2c84c 100644 --- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php @@ -55,7 +55,7 @@ class LookupPluginTest extends TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userSession = $this->createMock(IUserSession::class); diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php index af5cb7d3036..9cf308cd414 100644 --- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php @@ -59,7 +59,7 @@ class MailPluginTest extends TestCase { /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ protected $userSession; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php index 03140ddc6eb..4ac2cc124ee 100644 --- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php +++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php @@ -57,7 +57,7 @@ class RemotePluginTest extends TestCase { /** @var SearchResult */ protected $searchResult; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); @@ -137,9 +137,10 @@ class RemotePluginTest extends TestCase { * @dataProvider dataTestSplitUserRemoteError * * @param string $id - * @expectedException \Exception */ public function testSplitUserRemoteError($id) { + $this->expectException(\Exception::class); + $this->instantiatePlugin(); $this->plugin->splitUserRemote($id); } diff --git a/tests/lib/Collaboration/Collaborators/SearchResultTest.php b/tests/lib/Collaboration/Collaborators/SearchResultTest.php index 717693e7592..43672345226 100644 --- a/tests/lib/Collaboration/Collaborators/SearchResultTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchResultTest.php @@ -39,7 +39,7 @@ class SearchResultTest extends TestCase { /** @var ISearch */ protected $search; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->container = $this->createMock(IContainer::class); diff --git a/tests/lib/Collaboration/Collaborators/SearchTest.php b/tests/lib/Collaboration/Collaborators/SearchTest.php index 9116352ef19..284d8270c49 100644 --- a/tests/lib/Collaboration/Collaborators/SearchTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchTest.php @@ -39,7 +39,7 @@ class SearchTest extends TestCase { /** @var ISearch */ protected $search; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->container = $this->createMock(IContainer::class); diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php index 57b9cbde856..3aeeaa3eecb 100644 --- a/tests/lib/Collaboration/Collaborators/UserPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/UserPluginTest.php @@ -62,7 +62,7 @@ class UserPluginTest extends TestCase { /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ protected $user; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Command/AsyncBusTest.php b/tests/lib/Command/AsyncBusTest.php index 59a80320f41..31f28bb88c9 100644 --- a/tests/lib/Command/AsyncBusTest.php +++ b/tests/lib/Command/AsyncBusTest.php @@ -89,7 +89,7 @@ abstract class AsyncBusTest extends TestCase { */ abstract protected function createBus(); - public function setUp(): void { + protected function setUp(): void { self::$lastCommand = ''; } diff --git a/tests/lib/Command/CronBusTest.php b/tests/lib/Command/CronBusTest.php index a28ed0fbed4..ea610a135d8 100644 --- a/tests/lib/Command/CronBusTest.php +++ b/tests/lib/Command/CronBusTest.php @@ -31,7 +31,7 @@ class CronBusTest extends AsyncBusTest { private $jobList; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->jobList = new DummyJobList(); diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/lib/Command/Integrity/SignAppTest.php index 689b046e24e..6fa86a2e855 100644 --- a/tests/lib/Command/Integrity/SignAppTest.php +++ b/tests/lib/Command/Integrity/SignAppTest.php @@ -39,7 +39,7 @@ class SignAppTest extends TestCase { /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ private $urlGenerator; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->checker = $this->createMock(Checker::class); $this->fileAccessHelper = $this->createMock(FileAccessHelper::class); diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/lib/Command/Integrity/SignCoreTest.php index 6f67b86f478..9bab016ec8f 100644 --- a/tests/lib/Command/Integrity/SignCoreTest.php +++ b/tests/lib/Command/Integrity/SignCoreTest.php @@ -36,7 +36,7 @@ class SignCoreTest extends TestCase { /** @var SignCore */ private $signCore; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->checker = $this->createMock(Checker::class); $this->fileAccessHelper = $this->createMock(FileAccessHelper::class); diff --git a/tests/lib/Comments/CommentTest.php b/tests/lib/Comments/CommentTest.php index 27d75193bc7..bd58d3fb156 100644 --- a/tests/lib/Comments/CommentTest.php +++ b/tests/lib/Comments/CommentTest.php @@ -51,10 +51,10 @@ class CommentTest extends TestCase { $this->assertSame($object['id'], $comment->getObjectId()); } - /** - * @expectedException \OCP\Comments\IllegalIDChangeException - */ + public function testSetIdIllegalInput() { + $this->expectException(\OCP\Comments\IllegalIDChangeException::class); + $comment = new Comment(); $comment->setId('c23'); @@ -86,9 +86,10 @@ class CommentTest extends TestCase { /** * @dataProvider simpleSetterProvider - * @expectedException \InvalidArgumentException */ public function testSimpleSetterInvalidInput($field, $input) { + $this->expectException(\InvalidArgumentException::class); + $comment = new Comment(); $setter = 'set' . $field; @@ -110,18 +111,19 @@ class CommentTest extends TestCase { /** * @dataProvider roleSetterProvider - * @expectedException \InvalidArgumentException */ public function testSetRoleInvalidInput($role, $type, $id){ + $this->expectException(\InvalidArgumentException::class); + $comment = new Comment(); $setter = 'set' . $role; $comment->$setter($type, $id); } - /** - * @expectedException \OCP\Comments\MessageTooLongException - */ + public function testSetUberlongMessage() { + $this->expectException(\OCP\Comments\MessageTooLongException::class); + $comment = new Comment(); $msg = str_pad('', IComment::MAX_MESSAGE_LENGTH + 1, 'x'); $comment->setMessage($msg); diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php index 8b7bf50f95c..93cafc0f933 100644 --- a/tests/lib/Comments/ManagerTest.php +++ b/tests/lib/Comments/ManagerTest.php @@ -21,7 +21,7 @@ class ManagerTest extends TestCase { /** @var IDBConnection */ private $connection; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -67,18 +67,18 @@ class ManagerTest extends TestCase { return $factory->getManager(); } - /** - * @expectedException \OCP\Comments\NotFoundException - */ + public function testGetCommentNotFound() { + $this->expectException(\OCP\Comments\NotFoundException::class); + $manager = $this->getManager(); $manager->get('22'); } - /** - * @expectedException \InvalidArgumentException - */ + public function testGetCommentNotFoundInvalidInput() { + $this->expectException(\InvalidArgumentException::class); + $manager = $this->getManager(); $manager->get('unexisting22'); } @@ -125,18 +125,18 @@ class ManagerTest extends TestCase { $this->assertEquals($comment->getLatestChildDateTime(), $latestChildDT); } - /** - * @expectedException \OCP\Comments\NotFoundException - */ + public function testGetTreeNotFound() { + $this->expectException(\OCP\Comments\NotFoundException::class); + $manager = $this->getManager(); $manager->getTree('22'); } - /** - * @expectedException \InvalidArgumentException - */ + public function testGetTreeNotFoundInvalidIpnut() { + $this->expectException(\InvalidArgumentException::class); + $manager = $this->getManager(); $manager->getTree('unexisting22'); } @@ -411,13 +411,14 @@ class ManagerTest extends TestCase { /** * @dataProvider invalidCreateArgsProvider - * @expectedException \InvalidArgumentException * @param string $aType * @param string $aId * @param string $oType * @param string $oId */ public function testCreateCommentInvalidArguments($aType, $aId, $oType, $oId) { + $this->expectException(\InvalidArgumentException::class); + $manager = $this->getManager(); $manager->create($aType, $aId, $oType, $oId); } @@ -436,10 +437,10 @@ class ManagerTest extends TestCase { $this->assertSame($comment->getObjectId(), $objectId); } - /** - * @expectedException \OCP\Comments\NotFoundException - */ + public function testDelete() { + $this->expectException(\OCP\Comments\NotFoundException::class); + $manager = $this->getManager(); $done = $manager->delete('404'); @@ -497,10 +498,10 @@ class ManagerTest extends TestCase { $this->assertSame($comment->getMessage(), $loadedComment->getMessage()); } - /** - * @expectedException \OCP\Comments\NotFoundException - */ + public function testSaveUpdateException() { + $this->expectException(\OCP\Comments\NotFoundException::class); + $manager = $this->getManager(); $comment = new Comment(); $comment @@ -516,10 +517,10 @@ class ManagerTest extends TestCase { $manager->save($comment); } - /** - * @expectedException \UnexpectedValueException - */ + public function testSaveIncomplete() { + $this->expectException(\UnexpectedValueException::class); + $manager = $this->getManager(); $comment = new Comment(); $comment->setMessage('from no one to nothing'); @@ -562,11 +563,12 @@ class ManagerTest extends TestCase { /** * @dataProvider invalidActorArgsProvider - * @expectedException \InvalidArgumentException * @param string $type * @param string $id */ public function testDeleteReferencesOfActorInvalidInput($type, $id) { + $this->expectException(\InvalidArgumentException::class); + $manager = $this->getManager(); $manager->deleteReferencesOfActor($type, $id); } @@ -630,11 +632,12 @@ class ManagerTest extends TestCase { /** * @dataProvider invalidObjectArgsProvider - * @expectedException \InvalidArgumentException * @param string $type * @param string $id */ public function testDeleteCommentsAtObjectInvalidInput($type, $id) { + $this->expectException(\InvalidArgumentException::class); + $manager = $this->getManager(); $manager->deleteCommentsAtObject($type, $id); } @@ -797,10 +800,10 @@ class ManagerTest extends TestCase { $this->assertSame('SOMBRERO', $manager->resolveDisplayName('galaxy', 'sombrero')); } - /** - * @expectedException \OutOfBoundsException - */ + public function testRegisterResolverDuplicate() { + $this->expectException(\OutOfBoundsException::class); + $manager = $this->getManager(); $planetClosure = function ($name) { @@ -810,10 +813,10 @@ class ManagerTest extends TestCase { $manager->registerDisplayNameResolver('planet', $planetClosure); } - /** - * @expectedException \InvalidArgumentException - */ + public function testRegisterResolverInvalidType() { + $this->expectException(\InvalidArgumentException::class); + $manager = $this->getManager(); $planetClosure = function ($name) { @@ -822,10 +825,10 @@ class ManagerTest extends TestCase { $manager->registerDisplayNameResolver(1337, $planetClosure); } - /** - * @expectedException \OutOfBoundsException - */ + public function testResolveDisplayNameUnregisteredType() { + $this->expectException(\OutOfBoundsException::class); + $manager = $this->getManager(); $planetClosure = function ($name) { @@ -847,10 +850,10 @@ class ManagerTest extends TestCase { $this->assertTrue(is_string($manager->resolveDisplayName('planet', 'neptune'))); } - /** - * @expectedException \InvalidArgumentException - */ + public function testResolveDisplayNameInvalidType() { + $this->expectException(\InvalidArgumentException::class); + $manager = $this->getManager(); $planetClosure = function () { diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php index 6460ef20d0c..10584812c41 100644 --- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php @@ -115,10 +115,10 @@ class ActionProviderStoreTest extends TestCase { $this->assertInstanceOf(EMailProvider::class, $providers[0]); } - /** - * @expectedException Exception - */ + public function testGetProvidersWithQueryException() { + $this->expectException(\Exception::class); + $user = $this->createMock(IUser::class); $this->appManager->expects($this->once()) ->method('getEnabledAppsForUser') diff --git a/tests/lib/DB/ConnectionTest.php b/tests/lib/DB/ConnectionTest.php index 4683c53d339..607674d7a38 100644 --- a/tests/lib/DB/ConnectionTest.php +++ b/tests/lib/DB/ConnectionTest.php @@ -42,12 +42,12 @@ class ConnectionTest extends \Test\TestCase { } } - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); } - public function tearDown(): void { + protected function tearDown(): void { parent::tearDown(); $this->connection->dropTable('table'); } @@ -157,10 +157,10 @@ class ConnectionTest extends \Test\TestCase { $this->assertEquals('bar', $this->getTextValueByIntergerField(1)); } - /** - * @expectedException \OCP\PreConditionNotMetException - */ + public function testSetValuesOverWritePreconditionFailed() { + $this->expectException(\OCP\PreConditionNotMetException::class); + $this->makeTestTable(); $this->connection->setValues('table', [ 'integerfield' => 1 @@ -335,10 +335,10 @@ class ConnectionTest extends \Test\TestCase { $this->assertEquals(0, $result); } - /** - * @expectedException \Doctrine\DBAL\Exception\UniqueConstraintViolationException - */ + public function testUniqueConstraintViolating() { + $this->expectException(\Doctrine\DBAL\Exception\UniqueConstraintViolationException::class); + $this->makeTestTable(); $testQuery = 'INSERT INTO `*PREFIX*table` (`integerfield`, `textfield`) VALUES(?, ?)'; diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php index 8f38b3addd0..58f775febb0 100644 --- a/tests/lib/DB/MigrationsTest.php +++ b/tests/lib/DB/MigrationsTest.php @@ -36,7 +36,7 @@ class MigrationsTest extends \Test\TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | IDBConnection $db */ private $db; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->db = $this->createMock(Connection::class); @@ -60,27 +60,27 @@ class MigrationsTest extends \Test\TestCase { $this->assertEquals('test_oc_migrations', $this->migrationService->getMigrationsTableName()); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Version 20170130180000 is unknown. - */ + public function testExecuteUnknownStep() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Version 20170130180000 is unknown.'); + $this->migrationService->executeStep('20170130180000'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage App not found - */ + public function testUnknownApp() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('App not found'); + $migrationService = new MigrationService('unknown-bloody-app', $this->db); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Migration step 'X' is unknown - */ + public function testExecuteStepWithUnknownClass() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Migration step \'X\' is unknown'); + $this->migrationService = $this->getMockBuilder(MigrationService::class) ->setMethods(['findMigrations']) ->setConstructorArgs(['testing', $this->db]) @@ -375,10 +375,10 @@ class MigrationsTest extends \Test\TestCase { self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testEnsureOracleIdentifierLengthLimitTooLongTableName() { + $this->expectException(\InvalidArgumentException::class); + $table = $this->createMock(Table::class); $table->expects($this->any()) ->method('getName') @@ -400,10 +400,10 @@ class MigrationsTest extends \Test\TestCase { self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testEnsureOracleIdentifierLengthLimitTooLongPrimaryWithDefault() { + $this->expectException(\InvalidArgumentException::class); + $defaultName = 'PRIMARY'; if ($this->db->getDatabasePlatform() instanceof PostgreSqlPlatform) { $defaultName = \str_repeat('a', 27) . '_' . \str_repeat('b', 30) . '_seq'; @@ -453,10 +453,10 @@ class MigrationsTest extends \Test\TestCase { self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testEnsureOracleIdentifierLengthLimitTooLongPrimaryWithName() { + $this->expectException(\InvalidArgumentException::class); + $index = $this->createMock(Index::class); $index->expects($this->any()) ->method('getName') @@ -496,10 +496,10 @@ class MigrationsTest extends \Test\TestCase { self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testEnsureOracleIdentifierLengthLimitTooLongColumnName() { + $this->expectException(\InvalidArgumentException::class); + $column = $this->createMock(Column::class); $column->expects($this->any()) ->method('getName') @@ -530,10 +530,10 @@ class MigrationsTest extends \Test\TestCase { self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testEnsureOracleIdentifierLengthLimitTooLongIndexName() { + $this->expectException(\InvalidArgumentException::class); + $index = $this->createMock(Index::class); $index->expects($this->any()) ->method('getName') @@ -567,10 +567,10 @@ class MigrationsTest extends \Test\TestCase { self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testEnsureOracleIdentifierLengthLimitTooLongForeignKeyName() { + $this->expectException(\InvalidArgumentException::class); + $foreignKey = $this->createMock(ForeignKeyConstraint::class); $foreignKey->expects($this->any()) ->method('getName') @@ -607,10 +607,10 @@ class MigrationsTest extends \Test\TestCase { self::invokePrivate($this->migrationService, 'ensureOracleIdentifierLengthLimit', [$sourceSchema, $schema, 3]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testEnsureOracleIdentifierLengthLimitTooLongSequenceName() { + $this->expectException(\InvalidArgumentException::class); + $sequence = $this->createMock(Sequence::class); $sequence->expects($this->any()) ->method('getName') diff --git a/tests/lib/DB/MigratorTest.php b/tests/lib/DB/MigratorTest.php index ca778fd4e2f..e5cc28654e4 100644 --- a/tests/lib/DB/MigratorTest.php +++ b/tests/lib/DB/MigratorTest.php @@ -102,10 +102,10 @@ class MigratorTest extends \Test\TestCase { return $this->connection->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver; } - /** - * @expectedException \OC\DB\MigrationException - */ + public function testDuplicateKeyUpgrade() { + $this->expectException(\OC\DB\MigrationException::class); + if ($this->isSQLite()) { $this->markTestSkipped('sqlite does not throw errors when creating a new key on existing data'); } diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php index e9878d33d85..a9542e2d616 100644 --- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php @@ -1152,7 +1152,7 @@ class QueryBuilderTest extends \Test\TestCase { $actual = $qB->getLastInsertId(); $this->assertNotNull($actual); - $this->assertInternalType('int', $actual); + $this->assertIsInt($actual); $this->assertEquals($this->connection->lastInsertId('*PREFIX*properties'), $actual); $qB->delete('properties') diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php index f7f6f6633cd..6cd8b572fcd 100644 --- a/tests/lib/DateTimeFormatterTest.php +++ b/tests/lib/DateTimeFormatterTest.php @@ -175,10 +175,10 @@ class DateTimeFormatterTest extends TestCase { $this->assertEquals($expected, (string) $this->formatter->formatDateTime($timestamp, 'long', 'long', $timeZone)); } - /** - * @expectedException \Exception - */ + function testFormatDateWithInvalidTZ() { + $this->expectException(\Exception::class); + $this->formatter->formatDate(1350129205, 'long', new \DateTimeZone('Mordor/Barad-dûr')); } } diff --git a/tests/lib/Diagnostics/EventLoggerTest.php b/tests/lib/Diagnostics/EventLoggerTest.php index 18009ea26fe..323ca5c20d7 100644 --- a/tests/lib/Diagnostics/EventLoggerTest.php +++ b/tests/lib/Diagnostics/EventLoggerTest.php @@ -29,7 +29,7 @@ class EventLoggerTest extends TestCase { /** @var \OC\Diagnostics\EventLogger */ private $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->logger = new EventLogger(); diff --git a/tests/lib/Diagnostics/QueryLoggerTest.php b/tests/lib/Diagnostics/QueryLoggerTest.php index 32c17064f1c..545a706c3cf 100644 --- a/tests/lib/Diagnostics/QueryLoggerTest.php +++ b/tests/lib/Diagnostics/QueryLoggerTest.php @@ -29,7 +29,7 @@ class QueryLoggerTest extends TestCase { /** @var \OC\Diagnostics\QueryLogger */ private $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->logger = new QueryLogger(); diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 75ea3f8ef53..e2c76db7ed9 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -67,7 +67,7 @@ class DecryptAllTest extends TestCase { /** @var DecryptAll */ protected $instance; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->getMockBuilder(IUserManager::class) diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php index 8e9e774347b..93987a8bb20 100644 --- a/tests/lib/Encryption/EncryptionWrapperTest.php +++ b/tests/lib/Encryption/EncryptionWrapperTest.php @@ -43,7 +43,7 @@ class EncryptionWrapperTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Memcache\ArrayCache */ private $arrayCache; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->arrayCache = $this->createMock(ArrayCache::class); diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php index 611044ba920..31936a4176b 100644 --- a/tests/lib/Encryption/Keys/StorageTest.php +++ b/tests/lib/Encryption/Keys/StorageTest.php @@ -42,7 +42,7 @@ class StorageTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject */ protected $config; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->util = $this->getMockBuilder('OC\Encryption\Util') diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php index 0919bda36b0..6e18cd296a3 100644 --- a/tests/lib/Encryption/ManagerTest.php +++ b/tests/lib/Encryption/ManagerTest.php @@ -35,7 +35,7 @@ class ManagerTest extends TestCase { /** @var ArrayCache|\PHPUnit_Framework_MockObject_MockObject */ private $arrayCache; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->logger = $this->createMock(ILogger::class); @@ -81,10 +81,11 @@ class ManagerTest extends TestCase { /** * @depends testModuleRegistration - * @expectedException \OC\Encryption\Exceptions\ModuleAlreadyExistsException - * @expectedExceptionMessage Id "ID0" already used by encryption module "TestDummyModule0" */ public function testModuleReRegistration($manager) { + $this->expectException(\OC\Encryption\Exceptions\ModuleAlreadyExistsException::class); + $this->expectExceptionMessage('Id "ID0" already used by encryption module "TestDummyModule0"'); + $this->addNewEncryptionModule($manager, 0); } @@ -98,11 +99,11 @@ class ManagerTest extends TestCase { } - /** - * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException - * @expectedExceptionMessage Module with ID: unknown does not exist. - */ + public function testGetEncryptionModuleUnknown() { + $this->expectException(\OC\Encryption\Exceptions\ModuleDoesNotExistsException::class); + $this->expectExceptionMessage('Module with ID: unknown does not exist.'); + $this->config->expects($this->any())->method('getAppValue')->willReturn(true); $this->addNewEncryptionModule($this->manager, 0); $this->assertCount(1, $this->manager->getEncryptionModules()); diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php index ee616d20793..e503da109a8 100644 --- a/tests/lib/Encryption/UtilTest.php +++ b/tests/lib/Encryption/UtilTest.php @@ -32,7 +32,7 @@ class UtilTest extends TestCase { /** @var \OC\Encryption\Util */ private $util; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->view = $this->getMockBuilder(View::class) ->disableOriginalConstructor() @@ -96,10 +96,10 @@ class UtilTest extends TestCase { ]; } - /** - * @expectedException \OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException - */ + public function testCreateHeaderFailed() { + $this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class); + $header = array('header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo'); diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/lib/Federation/CloudIdManagerTest.php index bd62a8ac026..224acadbde4 100644 --- a/tests/lib/Federation/CloudIdManagerTest.php +++ b/tests/lib/Federation/CloudIdManagerTest.php @@ -71,9 +71,10 @@ class CloudIdManagerTest extends TestCase { * * @param string $cloudId * - * @expectedException \InvalidArgumentException */ public function testInvalidCloudId($cloudId) { + $this->expectException(\InvalidArgumentException::class); + $this->cloudIdManager->resolveCloudId($cloudId); } diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/lib/Files/AppData/AppDataTest.php index 3932e308de0..1b3f705b9b6 100644 --- a/tests/lib/Files/AppData/AppDataTest.php +++ b/tests/lib/Files/AppData/AppDataTest.php @@ -42,7 +42,7 @@ class AppDataTest extends \Test\TestCase { /** @var IAppData */ private $appData; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->rootFolder = $this->createMock(IRootFolder::class); diff --git a/tests/lib/Files/AppData/FactoryTest.php b/tests/lib/Files/AppData/FactoryTest.php index ceed1f4ed3a..fec464d6e3a 100644 --- a/tests/lib/Files/AppData/FactoryTest.php +++ b/tests/lib/Files/AppData/FactoryTest.php @@ -37,7 +37,7 @@ class FactoryTest extends \Test\TestCase { /** @var Factory */ private $factory; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->rootFolder = $this->createMock(IRootFolder::class); diff --git a/tests/lib/Files/Cache/PropagatorTest.php b/tests/lib/Files/Cache/PropagatorTest.php index bbf36329461..ce6b84ee4d0 100644 --- a/tests/lib/Files/Cache/PropagatorTest.php +++ b/tests/lib/Files/Cache/PropagatorTest.php @@ -20,7 +20,7 @@ class PropagatorTest extends TestCase { /** @var IStorage */ private $storage; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->storage = new Temporary(); $this->storage->mkdir('foo/bar'); diff --git a/tests/lib/Files/Cache/QuerySearchHelperTest.php b/tests/lib/Files/Cache/QuerySearchHelperTest.php index 5a9d3022099..d5aad09a8fb 100644 --- a/tests/lib/Files/Cache/QuerySearchHelperTest.php +++ b/tests/lib/Files/Cache/QuerySearchHelperTest.php @@ -48,7 +48,7 @@ class QuerySearchHelperTest extends TestCase { /** @var integer */ private $numericStorageId; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->builder = \OC::$server->getDatabaseConnection()->getQueryBuilder(); $this->mimetypeLoader = $this->createMock(IMimeTypeLoader::class); @@ -83,7 +83,7 @@ class QuerySearchHelperTest extends TestCase { ->where($this->builder->expr()->eq('storage', new Literal($this->numericStorageId))); } - public function tearDown(): void { + protected function tearDown(): void { parent::tearDown(); $builder = \OC::$server->getDatabaseConnection()->getQueryBuilder(); diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php index 1c0a8b0e0e9..6a025410cc3 100644 --- a/tests/lib/Files/Cache/ScannerTest.php +++ b/tests/lib/Files/Cache/ScannerTest.php @@ -250,8 +250,8 @@ class ScannerTest extends \Test\TestCase { $this->cache->put('folder', array('mtime' => $this->storage->filemtime('folder'), 'storage_mtime' => $this->storage->filemtime('folder'))); $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_SIZE); $newData = $this->cache->get(''); - $this->assertInternalType('string', $oldData['etag']); - $this->assertInternalType('string', $newData['etag']); + $this->assertIsString($oldData['etag']); + $this->assertIsString($newData['etag']); $this->assertNotSame($oldData['etag'], $newData['etag']); $this->assertEquals($oldData['size'], $newData['size']); @@ -320,11 +320,11 @@ class ScannerTest extends \Test\TestCase { $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); /** @var CacheEntry $data0 */ $data0 = $this->cache->get('folder/bar.txt'); - $this->assertInternalType('string', $data0['etag']); + $this->assertIsString($data0['etag']); $data1 = $this->cache->get('folder'); - $this->assertInternalType('string', $data1['etag']); + $this->assertIsString($data1['etag']); $data2 = $this->cache->get(''); - $this->assertInternalType('string', $data2['etag']); + $this->assertIsString($data2['etag']); $data0['etag'] = ''; $this->cache->put('folder/bar.txt', $data0->getData()); @@ -333,7 +333,7 @@ class ScannerTest extends \Test\TestCase { // verify cache content $newData0 = $this->cache->get('folder/bar.txt'); - $this->assertInternalType('string', $newData0['etag']); + $this->assertIsString($newData0['etag']); $this->assertNotEmpty($newData0['etag']); } diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php index e20cfe2ac12..a3b1a428c28 100644 --- a/tests/lib/Files/Cache/UpdaterLegacyTest.php +++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php @@ -93,13 +93,13 @@ class UpdaterLegacyTest extends \Test\TestCase { Filesystem::file_put_contents('foo.txt', 'asd'); $cachedData = $this->cache->get('foo.txt'); $this->assertEquals(3, $cachedData['size']); - $this->assertInternalType('string', $fooCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($fooCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($fooCachedData['etag'], $cachedData['etag']); $cachedData = $this->cache->get(''); $this->assertEquals(2 * $textSize + $imageSize + 3, $cachedData['size']); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($rootCachedData['etag'], $cachedData['etag']); $rootCachedData = $cachedData; @@ -111,8 +111,8 @@ class UpdaterLegacyTest extends \Test\TestCase { $mtime = $cachedData['mtime']; $cachedData = $this->cache->get(''); $this->assertEquals(2 * $textSize + $imageSize + 2 * 3, $cachedData['size']); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($rootCachedData['etag'], $cachedData['etag']); $this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime); } @@ -133,13 +133,13 @@ class UpdaterLegacyTest extends \Test\TestCase { $mtime = $cachedData['mtime']; $cachedData = $cache2->get(''); - $this->assertInternalType('string', $substorageCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($substorageCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); $cachedData = $view->getFileInfo('folder'); - $this->assertInternalType('string', $folderCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($folderCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); } @@ -155,8 +155,8 @@ class UpdaterLegacyTest extends \Test\TestCase { $this->assertFalse($this->cache->inCache('foo.txt')); $cachedData = $this->cache->get(''); $this->assertEquals(2 * $textSize + $imageSize, $cachedData['size']); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); $this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']); $rootCachedData = $cachedData; @@ -164,16 +164,16 @@ class UpdaterLegacyTest extends \Test\TestCase { Filesystem::mkdir('bar_folder'); $this->assertTrue($this->cache->inCache('bar_folder')); $cachedData = $this->cache->get(''); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); $rootCachedData = $cachedData; $oldEtag = $rootCachedData['etag']; Filesystem::rmdir('bar_folder'); $this->assertFalse($this->cache->inCache('bar_folder')); $cachedData = $this->cache->get(''); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); $this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']); } @@ -192,14 +192,14 @@ class UpdaterLegacyTest extends \Test\TestCase { $this->assertFalse($cache2->inCache('foo.txt')); $cachedData = $cache2->get(''); - $this->assertInternalType('string', $substorageCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($substorageCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($substorageCachedData, $cachedData['etag']); $this->assertGreaterThanOrEqual($substorageCachedData['mtime'], $cachedData['mtime']); $cachedData = $view->getFileInfo('folder'); - $this->assertInternalType('string', $folderCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($folderCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); $this->assertGreaterThanOrEqual($folderCachedData['mtime'], $cachedData['mtime']); } @@ -221,8 +221,8 @@ class UpdaterLegacyTest extends \Test\TestCase { $mtime = $cachedData['mtime']; $cachedData = $this->cache->get(''); $this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($rootCachedData['etag'], $cachedData['etag']); } @@ -253,15 +253,15 @@ class UpdaterLegacyTest extends \Test\TestCase { $mtime = $cachedData['mtime']; $cachedData = $cache2->get(''); - $this->assertInternalType('string', $substorageCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($substorageCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); // rename can cause mtime change - invalid assert // $this->assertEquals($mtime, $cachedData['mtime']); $cachedData = $view->getFileInfo('folder'); - $this->assertInternalType('string', $folderCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($folderCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($oldEtag, $cachedData['etag']); // rename can cause mtime change - invalid assert // $this->assertEquals($mtime, $cachedData['mtime']); @@ -272,13 +272,13 @@ class UpdaterLegacyTest extends \Test\TestCase { $fooCachedData = $this->cache->get('foo.txt'); Filesystem::touch('foo.txt'); $cachedData = $this->cache->get('foo.txt'); - $this->assertInternalType('string', $fooCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($fooCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertGreaterThanOrEqual($fooCachedData['mtime'], $cachedData['mtime']); $cachedData = $this->cache->get(''); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($rootCachedData['etag'], $cachedData['etag']); $this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']); $rootCachedData = $cachedData; @@ -289,19 +289,19 @@ class UpdaterLegacyTest extends \Test\TestCase { $this->cache->put('', ['mtime' => $time - 100]); Filesystem::touch('folder/bar.txt', $time); $cachedData = $this->cache->get('folder/bar.txt'); - $this->assertInternalType('string', $barCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($barCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($barCachedData['etag'], $cachedData['etag']); $this->assertEquals($time, $cachedData['mtime']); $cachedData = $this->cache->get('folder'); - $this->assertInternalType('string', $folderCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($folderCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($folderCachedData['etag'], $cachedData['etag']); $cachedData = $this->cache->get(''); - $this->assertInternalType('string', $rootCachedData['etag']); - $this->assertInternalType('string', $cachedData['etag']); + $this->assertIsString($rootCachedData['etag']); + $this->assertIsString($cachedData['etag']); $this->assertNotSame($rootCachedData['etag'], $cachedData['etag']); $this->assertEquals($time, $cachedData['mtime']); } diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php index 744e132d2cc..9c1a8c14101 100644 --- a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php +++ b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php @@ -24,7 +24,7 @@ class CacheJailTest extends CacheTest { */ protected $sourceCache; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->storage->mkdir('foo'); $this->sourceCache = $this->cache; diff --git a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php index 0e2460f74e2..9883fc1da27 100644 --- a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php +++ b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php @@ -24,7 +24,7 @@ class CachePermissionsMaskTest extends CacheTest { */ protected $sourceCache; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->storage->mkdir('foo'); $this->sourceCache = $this->cache; diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php index ba1011aa68e..d63693a655b 100644 --- a/tests/lib/Files/Config/UserMountCacheTest.php +++ b/tests/lib/Files/Config/UserMountCacheTest.php @@ -42,7 +42,7 @@ class UserMountCacheTest extends TestCase { private $fileIds = []; - public function setUp(): void { + protected function setUp(): void { $this->fileIds = []; $this->connection = \OC::$server->getDatabaseConnection(); $this->userManager = new Manager($this->createMock(IConfig::class), $this->createMock(EventDispatcherInterface::class)); @@ -54,7 +54,7 @@ class UserMountCacheTest extends TestCase { $this->cache = new \OC\Files\Config\UserMountCache($this->connection, $this->userManager, $this->createMock(Log::class)); } - public function tearDown(): void { + protected function tearDown(): void { $builder = $this->connection->getQueryBuilder(); $builder->delete('mounts')->execute(); diff --git a/tests/lib/Files/FileInfoTest.php b/tests/lib/Files/FileInfoTest.php index 5c7c5cdc361..0037941b629 100644 --- a/tests/lib/Files/FileInfoTest.php +++ b/tests/lib/Files/FileInfoTest.php @@ -23,7 +23,7 @@ class FileInfoTest extends TestCase { private $config; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->createUser('foo', 'foo'); $this->config = $this->getMockBuilder(IConfig::class)->getMock(); diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index 6b6e3feda33..6d0362772ca 100644 --- a/tests/lib/Files/FilesystemTest.php +++ b/tests/lib/Files/FilesystemTest.php @@ -323,18 +323,19 @@ class FilesystemTest extends \Test\TestCase { /** * Tests that an exception is thrown when passed user does not exist. * - * @expectedException \OC\User\NoUserException */ public function testLocalMountWhenUserDoesNotExist() { + $this->expectException(\OC\User\NoUserException::class); + $userId = $this->getUniqueID('user_'); \OC\Files\Filesystem::initMountPoints($userId); } - /** - * @expectedException \OC\User\NoUserException - */ + public function testNullUserThrows() { + $this->expectException(\OC\User\NoUserException::class); + \OC\Files\Filesystem::initMountPoints(null); } diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php index 5cd517df3c9..278872b8728 100644 --- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php +++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php @@ -21,7 +21,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase { /** @var IStorageFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $loader; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Files/Node/FileTest.php b/tests/lib/Files/Node/FileTest.php index a17cc1d1a3a..2cdf9cbdc5a 100644 --- a/tests/lib/Files/Node/FileTest.php +++ b/tests/lib/Files/Node/FileTest.php @@ -59,10 +59,10 @@ class FileTest extends NodeTest { $this->assertEquals('bar', $node->getContent()); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testGetContentNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) @@ -105,10 +105,10 @@ class FileTest extends NodeTest { $node->putContent('bar'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testPutContentNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) @@ -213,10 +213,10 @@ class FileTest extends NodeTest { $this->assertEquals(2, $hooksCalled); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testFOpenReadNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $root = new \OC\Files\Node\Root( $this->manager, $this->view, @@ -238,10 +238,10 @@ class FileTest extends NodeTest { $node->fopen('r'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testFOpenReadWriteNoReadPermissions() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $root = new \OC\Files\Node\Root( $this->manager, $this->view, @@ -263,10 +263,10 @@ class FileTest extends NodeTest { $node->fopen('w'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testFOpenReadWriteNoWritePermissions() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $root = new \OC\Files\Node\Root( $this->manager, new $this->view, diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php index 3390d19feb7..d33fb4f68f8 100644 --- a/tests/lib/Files/Node/FolderTest.php +++ b/tests/lib/Files/Node/FolderTest.php @@ -176,10 +176,10 @@ class FolderTest extends NodeTest { $this->assertEquals($child, $result); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testNewFolderNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $manager = $this->createMock(Manager::class); /** * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view @@ -230,10 +230,10 @@ class FolderTest extends NodeTest { $this->assertEquals($child, $result); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testNewFileNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $manager = $this->createMock(Manager::class); /** * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view diff --git a/tests/lib/Files/Node/HookConnectorTest.php b/tests/lib/Files/Node/HookConnectorTest.php index 9c47df02f3b..4c747a562b8 100644 --- a/tests/lib/Files/Node/HookConnectorTest.php +++ b/tests/lib/Files/Node/HookConnectorTest.php @@ -53,7 +53,7 @@ class HookConnectorTest extends TestCase { */ private $userId; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userId = $this->getUniqueID(); $this->createUser($this->userId, 'pass'); @@ -71,7 +71,7 @@ class HookConnectorTest extends TestCase { $this->eventDispatcher = \OC::$server->getEventDispatcher(); } - public function tearDown(): void { + protected function tearDown(): void { parent::tearDown(); \OC_Hook::clear('OC_Filesystem'); \OC_Util::tearDownFS(); diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php index 14ae0b0ead3..7c8ddee6b5f 100644 --- a/tests/lib/Files/Node/NodeTest.php +++ b/tests/lib/Files/Node/NodeTest.php @@ -180,10 +180,10 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(2, $hooksRun); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testDeleteNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $this->root->expects($this->any()) ->method('getUser') ->will($this->returnValue($this->user)); @@ -437,10 +437,10 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(2, $hooksRun); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testTouchNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $this->root->expects($this->any()) ->method('getUser') ->will($this->returnValue($this->user)); @@ -454,10 +454,10 @@ abstract class NodeTest extends \Test\TestCase { $node->touch(100); } - /** - * @expectedException \OCP\Files\InvalidPathException - */ + public function testInvalidPath() { + $this->expectException(\OCP\Files\InvalidPathException::class); + $node = $this->createTestNode($this->root, $this->view, '/../foo'); $node->getFileInfo(); } @@ -488,10 +488,10 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(3, $target->getId()); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testCopyNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + /** * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage */ @@ -519,10 +519,10 @@ abstract class NodeTest extends \Test\TestCase { $node->copy('/bar/asd'); } - /** - * @expectedException \OCP\Files\NotFoundException - */ + public function testCopyNoParent() { + $this->expectException(\OCP\Files\NotFoundException::class); + $this->view->expects($this->never()) ->method('copy'); @@ -536,10 +536,10 @@ abstract class NodeTest extends \Test\TestCase { $node->copy('/bar/asd/foo'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testCopyParentIsFile() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $this->view->expects($this->never()) ->method('copy'); @@ -659,10 +659,10 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(4, $hooksRun); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testMoveNotPermitted() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $this->view->expects($this->any()) ->method('getFileInfo') ->will($this->returnValue($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_READ]))); @@ -681,10 +681,10 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - /** - * @expectedException \OCP\Files\NotFoundException - */ + public function testMoveNoParent() { + $this->expectException(\OCP\Files\NotFoundException::class); + /** * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage */ @@ -703,10 +703,10 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testMoveParentIsFile() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $this->view->expects($this->never()) ->method('rename'); @@ -721,10 +721,10 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testMoveFailed() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $this->view->expects($this->any()) ->method('rename') ->with('/bar/foo', '/bar/asd') @@ -744,10 +744,10 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testCopyFailed() { + $this->expectException(\OCP\Files\NotPermittedException::class); + $this->view->expects($this->any()) ->method('copy') ->with('/bar/foo', '/bar/asd') diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php index 70ffe1b25c4..5067236ec58 100644 --- a/tests/lib/Files/Node/RootTest.php +++ b/tests/lib/Files/Node/RootTest.php @@ -87,10 +87,10 @@ class RootTest extends \Test\TestCase { $this->assertInstanceOf('\OC\Files\Node\File', $node); } - /** - * @expectedException \OCP\Files\NotFoundException - */ + public function testGetNotFound() { + $this->expectException(\OCP\Files\NotFoundException::class); + /** * @var \OC\Files\Storage\Storage $storage */ @@ -121,10 +121,10 @@ class RootTest extends \Test\TestCase { $root->get('/bar/foo'); } - /** - * @expectedException \OCP\Files\NotPermittedException - */ + public function testGetInvalidPath() { + $this->expectException(\OCP\Files\NotPermittedException::class); + /** * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view */ @@ -143,10 +143,10 @@ class RootTest extends \Test\TestCase { $root->get('/../foo'); } - /** - * @expectedException \OCP\Files\NotFoundException - */ + public function testGetNoStorages() { + $this->expectException(\OCP\Files\NotFoundException::class); + /** * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view */ @@ -201,11 +201,11 @@ class RootTest extends \Test\TestCase { $this->assertEquals($folder, $root->getUserFolder('MyUserId')); } - /** - * @expectedException \OC\User\NoUserException - * @expectedExceptionMessage Backends provided no user object - */ + public function testGetUserFolderWithNoUserObj() { + $this->expectException(\OC\User\NoUserException::class); + $this->expectExceptionMessage('Backends provided no user object'); + $root = new \OC\Files\Node\Root( $this->createMock(Manager::class), $this->createMock(View::class), diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php index 02ea3df6cb6..18637daf9d7 100644 --- a/tests/lib/Files/PathVerificationTest.php +++ b/tests/lib/Files/PathVerificationTest.php @@ -30,11 +30,11 @@ class PathVerificationTest extends \Test\TestCase { $this->view = new View(); } - /** - * @expectedException \OCP\Files\InvalidPathException - * @expectedExceptionMessage File name is too long - */ + public function testPathVerificationFileNameTooLong() { + $this->expectException(\OCP\Files\InvalidPathException::class); + $this->expectExceptionMessage('File name is too long'); + $fileName = str_repeat('a', 500); $this->view->verifyPath('', $fileName); } @@ -42,10 +42,11 @@ class PathVerificationTest extends \Test\TestCase { /** * @dataProvider providesEmptyFiles - * @expectedException \OCP\Files\InvalidPathException - * @expectedExceptionMessage Empty filename is not allowed */ public function testPathVerificationEmptyFileName($fileName) { + $this->expectException(\OCP\Files\InvalidPathException::class); + $this->expectExceptionMessage('Empty filename is not allowed'); + $this->view->verifyPath('', $fileName); } @@ -58,10 +59,11 @@ class PathVerificationTest extends \Test\TestCase { /** * @dataProvider providesDotFiles - * @expectedException \OCP\Files\InvalidPathException - * @expectedExceptionMessage Dot files are not allowed */ public function testPathVerificationDotFiles($fileName) { + $this->expectException(\OCP\Files\InvalidPathException::class); + $this->expectExceptionMessage('Dot files are not allowed'); + $this->view->verifyPath('', $fileName); } @@ -107,9 +109,10 @@ class PathVerificationTest extends \Test\TestCase { /** * @dataProvider providesInvalidCharsPosix - * @expectedException \OCP\Files\InvalidCharacterInPathException */ public function testPathVerificationInvalidCharsPosix($fileName) { + $this->expectException(\OCP\Files\InvalidCharacterInPathException::class); + $storage = new Local(['datadir' => '']); $fileName = " 123{$fileName}456 "; diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php index ba8688fea01..07a7e79c7a3 100644 --- a/tests/lib/Files/SimpleFS/SimpleFileTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php @@ -36,7 +36,7 @@ class SimpleFileTest extends \Test\TestCase { /** @var SimpleFile */ private $simpleFile; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->file = $this->createMock(File::class); diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/lib/Files/SimpleFS/SimpleFolderTest.php index 9c55367f44f..9dcca32090f 100644 --- a/tests/lib/Files/SimpleFS/SimpleFolderTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFolderTest.php @@ -37,7 +37,7 @@ class SimpleFolderTest extends \Test\TestCase { /** @var SimpleFolder */ private $simpleFolder; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->folder = $this->createMock(Folder::class); diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/lib/Files/Storage/LocalTest.php index 3b83a349cfa..23738a25c2a 100644 --- a/tests/lib/Files/Storage/LocalTest.php +++ b/tests/lib/Files/Storage/LocalTest.php @@ -63,24 +63,24 @@ class LocalTest extends Storage { $this->assertNotEquals($etag1, $etag2); } - /** - * @expectedException \InvalidArgumentException - */ + public function testInvalidArgumentsEmptyArray() { + $this->expectException(\InvalidArgumentException::class); + new \OC\Files\Storage\Local([]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testInvalidArgumentsNoArray() { + $this->expectException(\InvalidArgumentException::class); + new \OC\Files\Storage\Local(null); } - /** - * @expectedException \OCP\Files\ForbiddenException - */ + public function testDisallowSymlinksOutsideDatadir() { + $this->expectException(\OCP\Files\ForbiddenException::class); + $subDir1 = $this->tmpDir . 'sub1'; $subDir2 = $this->tmpDir . 'sub2'; $sym = $this->tmpDir . 'sub1/sym'; diff --git a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php index e8eb49ec014..f36958ad552 100644 --- a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php +++ b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php @@ -35,7 +35,7 @@ class AvailabilityTest extends \Test\TestCase { /** @var Availability */ protected $wrapper; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->storageCache = $this->createMock(StorageCache::class); @@ -66,9 +66,10 @@ class AvailabilityTest extends \Test\TestCase { /** * Storage marked unavailable, TTL not expired * - * @expectedException \OCP\Files\StorageNotAvailableException */ public function testUnavailable() { + $this->expectException(\OCP\Files\StorageNotAvailableException::class); + $this->storage->expects($this->once()) ->method('getAvailability') ->willReturn(['available' => false, 'last_checked' => time()]); @@ -105,9 +106,10 @@ class AvailabilityTest extends \Test\TestCase { /** * Storage marked available, but throws StorageNotAvailableException * - * @expectedException \OCP\Files\StorageNotAvailableException */ public function testAvailableThrowStorageNotAvailable() { + $this->expectException(\OCP\Files\StorageNotAvailableException::class); + $this->storage->expects($this->once()) ->method('getAvailability') ->willReturn(['available' => true, 'last_checked' => 0]); @@ -146,9 +148,10 @@ class AvailabilityTest extends \Test\TestCase { * Storage available, but throws exception * Standard exception does not indicate storage unavailability * - * @expectedException \Exception */ public function testAvailableThrow() { + $this->expectException(\Exception::class); + $this->storage->expects($this->once()) ->method('getAvailability') ->willReturn(['available' => true, 'last_checked' => 0]); diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/lib/Files/Storage/Wrapper/EncodingTest.php index 5b4443eecfc..9060ca2dac3 100644 --- a/tests/lib/Files/Storage/Wrapper/EncodingTest.php +++ b/tests/lib/Files/Storage/Wrapper/EncodingTest.php @@ -18,7 +18,7 @@ class EncodingTest extends \Test\Files\Storage\Storage { */ private $sourceStorage; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->sourceStorage = new \OC\Files\Storage\Temporary([]); $this->instance = new \OC\Files\Storage\Wrapper\Encoding([ @@ -26,7 +26,7 @@ class EncodingTest extends \Test\Files\Storage\Storage { ]); } - public function tearDown(): void { + protected function tearDown(): void { $this->sourceStorage->cleanUp(); parent::tearDown(); } diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php index 1091809f96c..cb7003cb7ea 100644 --- a/tests/lib/Files/Storage/Wrapper/JailTest.php +++ b/tests/lib/Files/Storage/Wrapper/JailTest.php @@ -15,7 +15,7 @@ class JailTest extends \Test\Files\Storage\Storage { */ private $sourceStorage; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->sourceStorage = new \OC\Files\Storage\Temporary(array()); $this->sourceStorage->mkdir('foo'); @@ -25,7 +25,7 @@ class JailTest extends \Test\Files\Storage\Storage { )); } - public function tearDown(): void { + protected function tearDown(): void { // test that nothing outside our jail is touched $contents = array(); $dh = $this->sourceStorage->opendir(''); diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php index c9545ae3f28..bfdd3d3ddbb 100644 --- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php +++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php @@ -22,13 +22,13 @@ class PermissionsMaskTest extends \Test\Files\Storage\Storage { */ private $sourceStorage; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->sourceStorage = new \OC\Files\Storage\Temporary(array()); $this->instance = $this->getMaskedStorage(Constants::PERMISSION_ALL); } - public function tearDown(): void { + protected function tearDown(): void { $this->sourceStorage->cleanUp(); parent::tearDown(); } diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/lib/Files/Type/DetectionTest.php index c0cd2a24411..e522239f001 100644 --- a/tests/lib/Files/Type/DetectionTest.php +++ b/tests/lib/Files/Type/DetectionTest.php @@ -28,7 +28,7 @@ class DetectionTest extends \Test\TestCase { /** @var Detection */ private $detection; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->detection = new Detection( \OC::$server->getURLGenerator(), diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php index 9f057960b60..4af252735f6 100644 --- a/tests/lib/Files/Utils/ScannerTest.php +++ b/tests/lib/Files/Utils/ScannerTest.php @@ -157,11 +157,12 @@ class ScannerTest extends \Test\TestCase { /** * @dataProvider invalidPathProvider - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Invalid path to scan * @param string $invalidPath */ public function testInvalidPathScanning($invalidPath) { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Invalid path to scan'); + $scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), \OC::$server->getLogger()); $scanner->scan($invalidPath); } diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 1e564c69092..57050059375 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -242,10 +242,10 @@ class ViewTest extends \Test\TestCase { $this->assertEquals('/foo.txt', $folderView->getPath($id2)); } - /** - * @expectedException \OCP\Files\NotFoundException - */ + public function testGetPathNotExisting() { + $this->expectException(\OCP\Files\NotFoundException::class); + $storage1 = $this->getTestStorage(); Filesystem::mount($storage1, [], '/'); @@ -1049,9 +1049,10 @@ class ViewTest extends \Test\TestCase { /** * @dataProvider tooLongPathDataProvider - * @expectedException \OCP\Files\InvalidPathException */ public function testTooLongPath($operation, $param0 = null) { + $this->expectException(\OCP\Files\InvalidPathException::class); + $longPath = ''; // 4000 is the maximum path length in file_cache.path @@ -1242,10 +1243,11 @@ class ViewTest extends \Test\TestCase { /** * @dataProvider directoryTraversalProvider - * @expectedException \Exception * @param string $root */ public function testConstructDirectoryTraversalException($root) { + $this->expectException(\Exception::class); + new View($root); } @@ -1289,17 +1291,16 @@ class ViewTest extends \Test\TestCase { $this->assertNull($view->getRelativePath(null)); } - /** - * @expectedException \InvalidArgumentException - */ + public function testNullAsRoot() { + $this->expectException(\InvalidArgumentException::class); + new View(null); } /** * e.g. reading from a folder that's being renamed * - * @expectedException \OCP\Lock\LockedException * * @dataProvider dataLockPaths * @@ -1307,6 +1308,8 @@ class ViewTest extends \Test\TestCase { * @param string $pathPrefix */ public function testReadFromWriteLockedPath($rootPath, $pathPrefix) { + $this->expectException(\OCP\Lock\LockedException::class); + $rootPath = str_replace('{folder}', 'files', $rootPath); $pathPrefix = str_replace('{folder}', 'files', $pathPrefix); @@ -1339,7 +1342,6 @@ class ViewTest extends \Test\TestCase { /** * e.g. writing a file that's being downloaded * - * @expectedException \OCP\Lock\LockedException * * @dataProvider dataLockPaths * @@ -1347,6 +1349,8 @@ class ViewTest extends \Test\TestCase { * @param string $pathPrefix */ public function testWriteToReadLockedFile($rootPath, $pathPrefix) { + $this->expectException(\OCP\Lock\LockedException::class); + $rootPath = str_replace('{folder}', 'files', $rootPath); $pathPrefix = str_replace('{folder}', 'files', $pathPrefix); @@ -1507,11 +1511,12 @@ class ViewTest extends \Test\TestCase { /** * @dataProvider pathRelativeToFilesProviderExceptionCases - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage $absolutePath must be relative to "files" * @param string $path */ public function testGetPathRelativeToFilesWithInvalidArgument($path) { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('$absolutePath must be relative to "files"'); + $view = new View(); $view->getPathRelativeToFiles($path); } @@ -2141,9 +2146,10 @@ class ViewTest extends \Test\TestCase { * simulate a failed copy operation. * We expect that we catch the exception, free the lock and re-throw it. * - * @expectedException \Exception */ public function testLockFileCopyException() { + $this->expectException(\Exception::class); + $view = new View('/' . $this->user . '/files/'); /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/lib/GlobalScale/ConfigTest.php index 4ceb34dc02f..5aaed1ed5bd 100644 --- a/tests/lib/GlobalScale/ConfigTest.php +++ b/tests/lib/GlobalScale/ConfigTest.php @@ -31,7 +31,7 @@ class ConfigTest extends TestCase { /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php index 1a240d5bc98..61e4b39c8f3 100644 --- a/tests/lib/Group/GroupTest.php +++ b/tests/lib/Group/GroupTest.php @@ -21,7 +21,7 @@ class GroupTest extends \Test\TestCase { /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->dispatcher = $this->createMock(EventDispatcherInterface::class); } diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php index 86665ee0879..d5f8baa3fa1 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -409,7 +409,7 @@ class ManagerTest extends TestCase { $this->assertCount(2, $groups); foreach ($groups as $group) { - $this->assertInternalType('string', $group); + $this->assertIsString($group); } } diff --git a/tests/lib/Group/MetaDataTest.php b/tests/lib/Group/MetaDataTest.php index c53a7eb2adf..4332a6f036f 100644 --- a/tests/lib/Group/MetaDataTest.php +++ b/tests/lib/Group/MetaDataTest.php @@ -34,7 +34,7 @@ class MetaDataTest extends \Test\TestCase { /** @var bool */ private $isAdmin = true; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->groupManager = $this->getMockBuilder('\OC\Group\Manager') ->disableOriginalConstructor() diff --git a/tests/lib/Hooks/BasicEmitterTest.php b/tests/lib/Hooks/BasicEmitterTest.php index 948659faaba..1f88dee1032 100644 --- a/tests/lib/Hooks/BasicEmitterTest.php +++ b/tests/lib/Hooks/BasicEmitterTest.php @@ -50,28 +50,28 @@ class BasicEmitterTest extends \Test\TestCase { throw new EmittedException; } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testAnonymousFunction() { + $this->expectException(\Test\Hooks\EmittedException::class); + $this->emitter->listen('Test', 'test', function () { throw new EmittedException; }); $this->emitter->emitEvent('Test', 'test'); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testStaticCallback() { + $this->expectException(\Test\Hooks\EmittedException::class); + $this->emitter->listen('Test', 'test', array('\Test\Hooks\BasicEmitterTest', 'staticCallBack')); $this->emitter->emitEvent('Test', 'test'); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testNonStaticCallback() { + $this->expectException(\Test\Hooks\EmittedException::class); + $this->emitter->listen('Test', 'test', array($this, 'nonStaticCallBack')); $this->emitter->emitEvent('Test', 'test'); } @@ -125,10 +125,10 @@ class BasicEmitterTest extends \Test\TestCase { $this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2'); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testArguments() { + $this->expectException(\Test\Hooks\EmittedException::class); + $this->emitter->listen('Test', 'test', function ($foo, $bar) { if ($foo == 'foo' and $bar == 'bar') { throw new EmittedException; @@ -137,10 +137,10 @@ class BasicEmitterTest extends \Test\TestCase { $this->emitter->emitEvent('Test', 'test', array('foo', 'bar')); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testNamedArguments() { + $this->expectException(\Test\Hooks\EmittedException::class); + $this->emitter->listen('Test', 'test', function ($foo, $bar) { if ($foo == 'foo' and $bar == 'bar') { throw new EmittedException; @@ -216,10 +216,10 @@ class BasicEmitterTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testRemoveKeepOtherCallback() { + $this->expectException(\Test\Hooks\EmittedException::class); + $listener1 = function () { throw new EmittedException; }; @@ -234,10 +234,10 @@ class BasicEmitterTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testRemoveKeepOtherMethod() { + $this->expectException(\Test\Hooks\EmittedException::class); + $listener = function () { throw new EmittedException; }; @@ -249,10 +249,10 @@ class BasicEmitterTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testRemoveKeepOtherScope() { + $this->expectException(\Test\Hooks\EmittedException::class); + $listener = function () { throw new EmittedException; }; @@ -264,10 +264,10 @@ class BasicEmitterTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException \Test\Hooks\EmittedException - */ + public function testRemoveNonExistingName() { + $this->expectException(\Test\Hooks\EmittedException::class); + $listener = function () { throw new EmittedException; }; diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php index 0f91769d25e..2a7bd6a185d 100644 --- a/tests/lib/Http/Client/ClientTest.php +++ b/tests/lib/Http/Client/ClientTest.php @@ -29,7 +29,7 @@ class ClientTest extends \Test\TestCase { /** @var array */ private $defaultRequestOptions; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->guzzleClient = $this->getMockBuilder(\GuzzleHttp\Client::class) diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/lib/Http/Client/ResponseTest.php index 9707e955bcb..963a3eb8179 100644 --- a/tests/lib/Http/Client/ResponseTest.php +++ b/tests/lib/Http/Client/ResponseTest.php @@ -19,7 +19,7 @@ class ResponseTest extends \Test\TestCase { /** @var GuzzleResponse */ private $guzzleResponse; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->guzzleResponse = new GuzzleResponse(1337); } diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php index 509dfdb66ab..fd21a1ae082 100644 --- a/tests/lib/InstallerTest.php +++ b/tests/lib/InstallerTest.php @@ -159,11 +159,11 @@ class InstallerTest extends TestCase { $this->assertSame($updateAvailable, $installer->isUpdateAvailable('files'), 'Cached result should be returned and fetcher should be only called once'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Certificate "4112" has been revoked - */ + public function testDownloadAppWithRevokedCertificate() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Certificate "4112" has been revoked'); + $appArray = [ [ 'id' => 'news', @@ -203,11 +203,11 @@ gLgK8d8sKL60JMmKHN3boHrsThKBVA== $installer->downloadApp('news'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage App with id news has a certificate not issued by a trusted Code Signing Authority - */ + public function testDownloadAppWithNotNextcloudCertificate() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('App with id news has a certificate not issued by a trusted Code Signing Authority'); + $appArray = [ [ 'id' => 'news', @@ -246,11 +246,11 @@ YSu356M= $installer->downloadApp('news'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage App with id news has a cert issued to passman - */ + public function testDownloadAppWithDifferentCN() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('App with id news has a cert issued to passman'); + $appArray = [ [ 'id' => 'news', @@ -289,11 +289,11 @@ u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ $installer->downloadApp('news'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage App with id passman has invalid signature - */ + public function testDownloadAppWithInvalidSignature() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('App with id passman has invalid signature'); + $appArray = [ [ 'id' => 'passman', @@ -357,11 +357,11 @@ u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ $installer->downloadApp('passman'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Extracted app testapp has more than 1 folder - */ + public function testDownloadAppWithMoreThanOneFolderDownloaded() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Extracted app testapp has more than 1 folder'); + $appArray = [ [ 'id' => 'testapp', @@ -441,11 +441,11 @@ YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=', $installer->downloadApp('testapp'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage App for id testapp has a wrong app ID in info.xml: testapp1 - */ + public function testDownloadAppWithMismatchingIdentifier() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('App for id testapp has a wrong app ID in info.xml: testapp1'); + $appArray = [ [ 'id' => 'testapp', @@ -606,11 +606,11 @@ MPLX6f5V9tCJtlH6ztmEcDROfvuVc0U3rEhqx2hphoyo+MZrPFpdcJL8KkIdMKbY $this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/')); } - /** - * @expectedException \Exception - * @expectedExceptionMessage App for id testapp has version 0.9 and tried to update to lower version 0.8 - */ + public function testDownloadAppWithDowngrade() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('App for id testapp has version 0.9 and tried to update to lower version 0.8'); + $appArray = [ [ 'id' => 'testapp', diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php index e7553aeac1f..586a42ff547 100644 --- a/tests/lib/IntegrityCheck/CheckerTest.php +++ b/tests/lib/IntegrityCheck/CheckerTest.php @@ -51,7 +51,7 @@ class CheckerTest extends TestCase { /** @var \OC\Files\Type\Detection|\PHPUnit_Framework_MockObject_MockObject */ private $mimeTypeDetector; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->environmentHelper = $this->createMock(EnvironmentHelper::class); $this->fileAccessHelper = $this->createMock(FileAccessHelper::class); @@ -82,11 +82,11 @@ class CheckerTest extends TestCase { ); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Exception message - */ + public function testWriteAppSignatureOfNotExistingApp() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Exception message'); + $this->fileAccessHelper ->expects($this->at(0)) ->method('assertDirectoryExists') @@ -107,11 +107,11 @@ class CheckerTest extends TestCase { $this->checker->writeAppSignature('NotExistingApp', $x509, $rsa); } - /** - * @expectedException \Exception - * @expectedExceptionMessageRegExp /[a-zA-Z\/_-]+ is not writable/ - */ + public function testWriteAppSignatureWrongPermissions() { + $this->expectException(\Exception::class); + $this->expectExceptionMessageRegExp('/[a-zA-Z\\/_-]+ is not writable/'); + $this->fileAccessHelper ->expects($this->once()) ->method('file_put_contents') @@ -480,11 +480,11 @@ class CheckerTest extends TestCase { $this->assertSame([], $this->checker->verifyAppSignature('SomeApp')); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Exception message - */ + public function testWriteCoreSignatureWithException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Exception message'); + $this->fileAccessHelper ->expects($this->at(0)) ->method('assertDirectoryExists') @@ -504,11 +504,11 @@ class CheckerTest extends TestCase { $this->checker->writeCoreSignature($x509, $rsa, __DIR__); } - /** - * @expectedException \Exception - * @expectedExceptionMessageRegExp /[a-zA-Z\/_-]+ is not writable/ - */ + public function testWriteCoreSignatureWrongPermissions() { + $this->expectException(\Exception::class); + $this->expectExceptionMessageRegExp('/[a-zA-Z\\/_-]+ is not writable/'); + $this->fileAccessHelper ->expects($this->at(0)) ->method('assertDirectoryExists') diff --git a/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php b/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php index 333b29f826c..cf5899b663b 100644 --- a/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php +++ b/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php @@ -28,7 +28,7 @@ class AppLocatorTest extends TestCase { /** @var AppLocator */ private $locator; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->locator = new AppLocator(); } @@ -37,11 +37,11 @@ class AppLocatorTest extends TestCase { $this->assertSame(\OC_App::getAppPath('files'), $this->locator->getAppPath('files')); } - /** - * @expectedException \Exception - * @expectedExceptionMessage App not found - */ + public function testGetAppPathNotExistentApp() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('App not found'); + $this->locator->getAppPath('aTotallyNotExistingApp'); } diff --git a/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php b/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php index 079baaafe9f..767cdf3aaab 100644 --- a/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php +++ b/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php @@ -28,7 +28,7 @@ class EnvironmentHelperTest extends TestCase { /** @var EnvironmentHelper */ private $environmentHelper; - public function setUp(): void { + protected function setUp(): void { $this->environmentHelper = new EnvironmentHelper(); parent::setUp(); } diff --git a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php index 87c064a8458..c4d724a3654 100644 --- a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php +++ b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php @@ -28,7 +28,7 @@ class FileAccessHelperTest extends TestCase { /** @var FileAccessHelper */ private $fileAccessHelper; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->fileAccessHelper = new FileAccessHelper(); } @@ -42,11 +42,11 @@ class FileAccessHelperTest extends TestCase { $this->assertSame($data, $this->fileAccessHelper->file_get_contents($filePath)); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Failed to write into /anabsolutelynotexistingfolder/on/the/system.txt - */ + public function testFile_put_contentsWithException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Failed to write into /anabsolutelynotexistingfolder/on/the/system.txt'); + $this->fileAccessHelper->file_put_contents('/anabsolutelynotexistingfolder/on/the/system.txt', 'MyFiles'); } @@ -55,11 +55,11 @@ class FileAccessHelperTest extends TestCase { $this->assertTrue($this->fileAccessHelper->is_writable(\OC::$server->getTempManager()->getTemporaryFile('MyFile'))); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Directory /anabsolutelynotexistingfolder/on/the/system does not exist. - */ + public function testAssertDirectoryExistsWithException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Directory /anabsolutelynotexistingfolder/on/the/system does not exist.'); + $this->fileAccessHelper->assertDirectoryExists('/anabsolutelynotexistingfolder/on/the/system'); } diff --git a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php index 081d2b5cb01..370b50a56e2 100644 --- a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php +++ b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php @@ -28,7 +28,7 @@ class ExcludeFileByNameFilterIteratorTest extends TestCase { /** @var ExcludeFileByNameFilterIterator|\PHPUnit\Framework\MockObject\MockObject */ protected $filter; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->filter = $this->getMockBuilder(ExcludeFileByNameFilterIterator::class) ->disableOriginalConstructor() diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php index 9235542b199..c75bfba5b99 100644 --- a/tests/lib/L10N/FactoryTest.php +++ b/tests/lib/L10N/FactoryTest.php @@ -36,7 +36,7 @@ class FactoryTest extends TestCase { /** @var string */ protected $serverRoot; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/lib/L10N/LanguageIteratorTest.php b/tests/lib/L10N/LanguageIteratorTest.php index f0ba1bc0aeb..9223db716f4 100644 --- a/tests/lib/L10N/LanguageIteratorTest.php +++ b/tests/lib/L10N/LanguageIteratorTest.php @@ -36,7 +36,7 @@ class LanguageIteratorTest extends TestCase { /** @var LanguageIterator */ protected $iterator; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->user = $this->createMock(IUser::class); diff --git a/tests/lib/LargeFileHelperTest.php b/tests/lib/LargeFileHelperTest.php index bfe26246918..3cc9d13d74c 100644 --- a/tests/lib/LargeFileHelperTest.php +++ b/tests/lib/LargeFileHelperTest.php @@ -37,10 +37,10 @@ class LargeFileHelperTest extends TestCase { ); } - /** - * @expectedException \UnexpectedValueException - */ + public function testFormatUnsignedIntegerStringException() { + $this->expectException(\UnexpectedValueException::class); + $this->helper->formatUnsignedInteger('900ABCD254740993'); } } diff --git a/tests/lib/LegacyHelperTest.php b/tests/lib/LegacyHelperTest.php index b86c4893676..21d5dbc8bab 100644 --- a/tests/lib/LegacyHelperTest.php +++ b/tests/lib/LegacyHelperTest.php @@ -15,11 +15,11 @@ class LegacyHelperTest extends \Test\TestCase { /** @var string */ private $originalWebRoot; - public function setUp(): void { + protected function setUp(): void { $this->originalWebRoot = \OC::$WEBROOT; } - public function tearDown(): void { + protected function tearDown(): void { // Reset webRoot \OC::$WEBROOT = $this->originalWebRoot; } diff --git a/tests/lib/Lock/DBLockingProviderTest.php b/tests/lib/Lock/DBLockingProviderTest.php index b7929aee476..73a7b6c3f83 100644 --- a/tests/lib/Lock/DBLockingProviderTest.php +++ b/tests/lib/Lock/DBLockingProviderTest.php @@ -49,7 +49,7 @@ class DBLockingProviderTest extends LockingProvider { protected $currentTime; - public function setUp(): void { + protected function setUp(): void { $this->currentTime = time(); $this->timeFactory = $this->createMock(ITimeFactory::class); $this->timeFactory->expects($this->any()) @@ -68,7 +68,7 @@ class DBLockingProviderTest extends LockingProvider { return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger(), $this->timeFactory, 3600); } - public function tearDown(): void { + protected function tearDown(): void { $this->connection->executeQuery('DELETE FROM `*PREFIX*file_locks`'); parent::tearDown(); } diff --git a/tests/lib/Lock/LockingProvider.php b/tests/lib/Lock/LockingProvider.php index 75117657bf2..93eba367af2 100644 --- a/tests/lib/Lock/LockingProvider.php +++ b/tests/lib/Lock/LockingProvider.php @@ -73,10 +73,10 @@ abstract class LockingProvider extends TestCase { $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED)); } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testDoubleExclusiveLock() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE); $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE)); $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE); @@ -90,10 +90,10 @@ abstract class LockingProvider extends TestCase { $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE); } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testExclusiveLockAfterShared() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED); $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED)); $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE); @@ -164,10 +164,10 @@ abstract class LockingProvider extends TestCase { } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testSharedLockAfterExclusive() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE); $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE)); $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED); @@ -211,41 +211,41 @@ abstract class LockingProvider extends TestCase { $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED)); } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testChangeLockToExclusiveDoubleShared() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED); $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED); $this->instance->changeLock('foo', ILockingProvider::LOCK_EXCLUSIVE); } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testChangeLockToExclusiveNoShared() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->changeLock('foo', ILockingProvider::LOCK_EXCLUSIVE); } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testChangeLockToExclusiveFromExclusive() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE); $this->instance->changeLock('foo', ILockingProvider::LOCK_EXCLUSIVE); } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testChangeLockToSharedNoExclusive() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->changeLock('foo', ILockingProvider::LOCK_SHARED); } - /** - * @expectedException \OCP\Lock\LockedException - */ + public function testChangeLockToSharedFromShared() { + $this->expectException(\OCP\Lock\LockedException::class); + $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED); $this->instance->changeLock('foo', ILockingProvider::LOCK_SHARED); } diff --git a/tests/lib/Lock/MemcacheLockingProviderTest.php b/tests/lib/Lock/MemcacheLockingProviderTest.php index 6d37aaa5367..7b7c649c886 100644 --- a/tests/lib/Lock/MemcacheLockingProviderTest.php +++ b/tests/lib/Lock/MemcacheLockingProviderTest.php @@ -38,7 +38,7 @@ class MemcacheLockingProviderTest extends LockingProvider { return new \OC\Lock\MemcacheLockingProvider($this->memcache); } - public function tearDown(): void { + protected function tearDown(): void { $this->memcache->clear(); parent::tearDown(); } diff --git a/tests/lib/Lockdown/Filesystem/NoFSTest.php b/tests/lib/Lockdown/Filesystem/NoFSTest.php index eaaa7b12955..28bdb08c4a4 100644 --- a/tests/lib/Lockdown/Filesystem/NoFSTest.php +++ b/tests/lib/Lockdown/Filesystem/NoFSTest.php @@ -34,7 +34,7 @@ use Test\Traits\UserTrait; class NoFSTest extends \Test\TestCase { use UserTrait; - public function tearDown(): void { + protected function tearDown(): void { $token = new DefaultToken(); $token->setScope([ 'filesystem' => true @@ -43,7 +43,7 @@ class NoFSTest extends \Test\TestCase { parent::tearDown(); } - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $token = new DefaultToken(); $token->setScope([ diff --git a/tests/lib/Lockdown/Filesystem/NullCacheTest.php b/tests/lib/Lockdown/Filesystem/NullCacheTest.php index f9c6fb3ff6c..67d44c430f5 100644 --- a/tests/lib/Lockdown/Filesystem/NullCacheTest.php +++ b/tests/lib/Lockdown/Filesystem/NullCacheTest.php @@ -34,7 +34,7 @@ class NulLCacheTest extends \Test\TestCase { /** @var NullCache */ private $cache; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->cache = new NullCache(); diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/lib/Lockdown/Filesystem/NullStorageTest.php index 97a5b775d06..5bdf3b44ba0 100644 --- a/tests/lib/Lockdown/Filesystem/NullStorageTest.php +++ b/tests/lib/Lockdown/Filesystem/NullStorageTest.php @@ -36,7 +36,7 @@ class NullStorageTest extends TestCase { /** @var NullStorage */ private $storage; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->storage = new NullStorage([]); diff --git a/tests/lib/Lockdown/LockdownManagerTest.php b/tests/lib/Lockdown/LockdownManagerTest.php index 2f1c794d4d7..7b52994d381 100644 --- a/tests/lib/Lockdown/LockdownManagerTest.php +++ b/tests/lib/Lockdown/LockdownManagerTest.php @@ -29,7 +29,7 @@ use Test\TestCase; class LockdownManagerTest extends TestCase { private $sessionCallback; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->sessionCallback = function() { diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php index 60d7d2bbbf8..d48826ff5c5 100644 --- a/tests/lib/Mail/EMailTemplateTest.php +++ b/tests/lib/Mail/EMailTemplateTest.php @@ -39,7 +39,7 @@ class EMailTemplateTest extends TestCase { /** @var EMailTemplate */ private $emailTemplate; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->defaults = $this->createMock(Defaults::class); diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index 911e5708296..3a08cd9acf2 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -31,7 +31,7 @@ class MailerTest extends TestCase { /** @var Mailer */ private $mailer; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); @@ -126,10 +126,10 @@ class MailerTest extends TestCase { $this->assertInstanceOf('\OC\Mail\Message', $this->mailer->createMessage()); } - /** - * @expectedException \Exception - */ + public function testSendInvalidMailException() { + $this->expectException(\Exception::class); + $message = $this->getMockBuilder('\OC\Mail\Message') ->disableOriginalConstructor()->getMock(); $message->expects($this->once()) diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php index 729178d328d..e0a0f468a50 100644 --- a/tests/lib/Mail/MessageTest.php +++ b/tests/lib/Mail/MessageTest.php @@ -31,7 +31,7 @@ class MessageTest extends TestCase { ); } - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->swiftMessage = $this->getMockBuilder('\Swift_Message') diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/lib/Memcache/FactoryTest.php index 971b22d69b2..cf4da7839c4 100644 --- a/tests/lib/Memcache/FactoryTest.php +++ b/tests/lib/Memcache/FactoryTest.php @@ -127,9 +127,10 @@ class FactoryTest extends \Test\TestCase { /** * @dataProvider cacheUnavailableProvider - * @expectedException \OC\HintException */ public function testCacheNotAvailableException($localCache, $distributedCache) { + $this->expectException(\OC\HintException::class); + $logger = $this->getMockBuilder(ILogger::class)->getMock(); new \OC\Memcache\Factory('abc', $logger, $localCache, $distributedCache); } diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/lib/Migration/BackgroundRepairTest.php index 3b94c22fd50..8c467d58269 100644 --- a/tests/lib/Migration/BackgroundRepairTest.php +++ b/tests/lib/Migration/BackgroundRepairTest.php @@ -68,7 +68,7 @@ class BackgroundRepairTest extends TestCase { /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject $dispatcher */ private $dispatcher; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->jobList = $this->getMockBuilder('OC\BackgroundJob\JobList') diff --git a/tests/lib/Notification/ActionTest.php b/tests/lib/Notification/ActionTest.php index 5103babd0e2..1923f2305e1 100644 --- a/tests/lib/Notification/ActionTest.php +++ b/tests/lib/Notification/ActionTest.php @@ -30,7 +30,7 @@ class ActionTest extends TestCase { /** @var IAction */ protected $action; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->action = new Action(); } @@ -64,9 +64,10 @@ class ActionTest extends TestCase { * @dataProvider dataSetLabelInvalid * @param mixed $label * - * @expectedException \InvalidArgumentException */ public function testSetLabelInvalid($label) { + $this->expectException(\InvalidArgumentException::class); + $this->action->setLabel($label); } @@ -98,9 +99,10 @@ class ActionTest extends TestCase { * @dataProvider dataSetParsedLabelInvalid * @param mixed $label * - * @expectedException \InvalidArgumentException */ public function testSetParsedLabelInvalid($label) { + $this->expectException(\InvalidArgumentException::class); + $this->action->setParsedLabel($label); } @@ -141,9 +143,10 @@ class ActionTest extends TestCase { * @param mixed $link * @param mixed $type * - * @expectedException \InvalidArgumentException */ public function testSetLinkInvalid($link, $type) { + $this->expectException(\InvalidArgumentException::class); + $this->action->setLink($link, $type); } diff --git a/tests/lib/Notification/ManagerTest.php b/tests/lib/Notification/ManagerTest.php index 5de0b572607..6ca83b4b367 100644 --- a/tests/lib/Notification/ManagerTest.php +++ b/tests/lib/Notification/ManagerTest.php @@ -40,7 +40,7 @@ class ManagerTest extends TestCase { /** @var ILogger|MockObject */ protected $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->validator = $this->createMock(IValidator::class); $this->logger = $this->createMock(ILogger::class); @@ -119,10 +119,10 @@ class ManagerTest extends TestCase { $manager->notify($notification); } - /** - * @expectedException \InvalidArgumentException - */ + public function testNotifyInvalid() { + $this->expectException(\InvalidArgumentException::class); + /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ $notification = $this->getMockBuilder(INotification::class) ->disableOriginalConstructor() diff --git a/tests/lib/Notification/NotificationTest.php b/tests/lib/Notification/NotificationTest.php index 6b021ceb6d3..c70fa1ec7df 100644 --- a/tests/lib/Notification/NotificationTest.php +++ b/tests/lib/Notification/NotificationTest.php @@ -35,7 +35,7 @@ class NotificationTest extends TestCase { /** @var IValidator|\PHPUnit_Framework_MockObject_MockObject */ protected $validator; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->validator = $this->createMock(IValidator::class); $this->notification = new Notification($this->validator); @@ -85,9 +85,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetAppInvalid * @param mixed $app * - * @expectedException \InvalidArgumentException */ public function testSetAppInvalid($app) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setApp($app); } @@ -114,9 +115,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetUserInvalid * @param mixed $user * - * @expectedException \InvalidArgumentException */ public function testSetUserInvalid($user) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setUser($user); } @@ -156,10 +158,11 @@ class NotificationTest extends TestCase { * @dataProvider dataSetDateTimeZero * @param \DateTime $dateTime * - * @expectedException \InvalidArgumentException * @expectedMessage 'The given date time is invalid' */ public function testSetDateTimeZero($dateTime) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setDateTime($dateTime); } @@ -198,10 +201,11 @@ class NotificationTest extends TestCase { * @dataProvider dataSetObjectIdInvalid * @param mixed $id * - * @expectedException \InvalidArgumentException * @expectedMessage 'The given object id is invalid' */ public function testSetObjectIdInvalid($id) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setObject('object', $id); } @@ -234,9 +238,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetSubjectInvalidSubject * @param mixed $subject * - * @expectedException \InvalidArgumentException */ public function testSetSubjectInvalidSubject($subject) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setSubject($subject, []); } @@ -262,9 +267,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetParsedSubjectInvalid * @param mixed $subject * - * @expectedException \InvalidArgumentException */ public function testSetParsedSubjectInvalid($subject) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setParsedSubject($subject); } @@ -297,9 +303,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetMessageInvalidMessage * @param mixed $message * - * @expectedException \InvalidArgumentException */ public function testSetMessageInvalidMessage($message) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setMessage($message, []); } @@ -325,9 +332,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetParsedMessageInvalid * @param mixed $message * - * @expectedException \InvalidArgumentException */ public function testSetParsedMessageInvalid($message) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setParsedMessage($message); } @@ -353,9 +361,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetLinkInvalid * @param mixed $link * - * @expectedException \InvalidArgumentException */ public function testSetLinkInvalid($link) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setLink($link); } @@ -381,9 +390,10 @@ class NotificationTest extends TestCase { * @dataProvider dataSetIconInvalid * @param mixed $icon * - * @expectedException \InvalidArgumentException */ public function testSetIconInvalid($icon) { + $this->expectException(\InvalidArgumentException::class); + $this->notification->setIcon($icon); } @@ -407,10 +417,10 @@ class NotificationTest extends TestCase { $this->assertEquals([], $this->notification->getParsedActions()); } - /** - * @expectedException \InvalidArgumentException - */ + public function testAddActionInvalid() { + $this->expectException(\InvalidArgumentException::class); + /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->once()) @@ -453,10 +463,10 @@ class NotificationTest extends TestCase { $this->assertEquals([], $this->notification->getActions()); } - /** - * @expectedException \InvalidArgumentException - */ + public function testAddParsedActionInvalid() { + $this->expectException(\InvalidArgumentException::class); + /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->once()) diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/lib/OCS/DiscoveryServiceTest.php index cbdde7bc313..710d683841f 100644 --- a/tests/lib/OCS/DiscoveryServiceTest.php +++ b/tests/lib/OCS/DiscoveryServiceTest.php @@ -39,7 +39,7 @@ class DiscoveryServiceTest extends TestCase { /** @var IDiscoveryService */ private $discoveryService; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->cacheFactory = $this->getMockBuilder(ICacheFactory::class)->getMock(); diff --git a/tests/lib/OCS/ProviderTest.php b/tests/lib/OCS/ProviderTest.php index 4f962f7f791..7ee802e54fb 100644 --- a/tests/lib/OCS/ProviderTest.php +++ b/tests/lib/OCS/ProviderTest.php @@ -31,7 +31,7 @@ class ProviderTest extends \Test\TestCase { /** @var Provider */ private $ocsProvider; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->getMockBuilder('\\OCP\\IRequest')->getMock(); diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php index 65e30df4a15..09c4a16f87a 100644 --- a/tests/lib/Preview/BackgroundCleanupJobTest.php +++ b/tests/lib/Preview/BackgroundCleanupJobTest.php @@ -61,7 +61,7 @@ class BackgroundCleanupJobTest extends \Test\TestCase { /** @var IRootFolder */ private $rootFolder; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userId = $this->getUniqueID(); @@ -87,7 +87,7 @@ class BackgroundCleanupJobTest extends \Test\TestCase { $this->rootFolder = \OC::$server->getRootFolder(); } - public function tearDown(): void { + protected function tearDown(): void { if ($this->trashEnabled) { $appManager = \OC::$server->getAppManager(); $appManager->enableApp('files_trashbin'); diff --git a/tests/lib/Preview/BitmapTest.php b/tests/lib/Preview/BitmapTest.php index 63f9c6a013e..952f72b276a 100644 --- a/tests/lib/Preview/BitmapTest.php +++ b/tests/lib/Preview/BitmapTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class BitmapTest extends Provider { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $fileName = 'testimage.eps'; diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php index 167f6aba1b7..cfb78a05da5 100644 --- a/tests/lib/Preview/GeneratorTest.php +++ b/tests/lib/Preview/GeneratorTest.php @@ -58,7 +58,7 @@ class GeneratorTest extends \Test\TestCase { /** @var Generator */ private $generator; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php index 2b4c63098b5..f75ae3192a1 100644 --- a/tests/lib/Preview/HEICTest.php +++ b/tests/lib/Preview/HEICTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class HEICTest extends Provider { - public function setUp(): void { + protected function setUp(): void { if ( !in_array("HEIC", \Imagick::queryFormats("HEI*")) ) { $this->markTestSkipped('ImageMagick is not HEIC aware. Skipping tests'); } else { diff --git a/tests/lib/Preview/ImageTest.php b/tests/lib/Preview/ImageTest.php index 200deef3866..40267538804 100644 --- a/tests/lib/Preview/ImageTest.php +++ b/tests/lib/Preview/ImageTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class ImageTest extends Provider { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $fileName = 'testimage.jpg'; diff --git a/tests/lib/Preview/MP3Test.php b/tests/lib/Preview/MP3Test.php index 5e0764a8ed7..15915ac2578 100644 --- a/tests/lib/Preview/MP3Test.php +++ b/tests/lib/Preview/MP3Test.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class MP3Test extends Provider { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $fileName = 'testimage.mp3'; diff --git a/tests/lib/Preview/MovieTest.php b/tests/lib/Preview/MovieTest.php index 7437ff3567a..2415102a83d 100644 --- a/tests/lib/Preview/MovieTest.php +++ b/tests/lib/Preview/MovieTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class MovieTest extends Provider { - public function setUp(): void { + protected function setUp(): void { $avconvBinary = \OC_Helper::findBinaryPath('avconv'); $ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg'); diff --git a/tests/lib/Preview/OfficeTest.php b/tests/lib/Preview/OfficeTest.php index 62981f2f003..555b3f77747 100644 --- a/tests/lib/Preview/OfficeTest.php +++ b/tests/lib/Preview/OfficeTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class OfficeTest extends Provider { - public function setUp(): void { + protected function setUp(): void { $libreofficeBinary = \OC_Helper::findBinaryPath('libreoffice'); $openofficeBinary = ($libreofficeBinary) ? null : \OC_Helper::findBinaryPath('openoffice'); diff --git a/tests/lib/Preview/SVGTest.php b/tests/lib/Preview/SVGTest.php index ccfeede75e6..73ccbc0b136 100644 --- a/tests/lib/Preview/SVGTest.php +++ b/tests/lib/Preview/SVGTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class SVGTest extends Provider { - public function setUp(): void { + protected function setUp(): void { $checkImagick = new \Imagick(); if (count($checkImagick->queryFormats('SVG')) === 1) { parent::setUp(); diff --git a/tests/lib/Preview/TXTTest.php b/tests/lib/Preview/TXTTest.php index f2cdb72cdd1..e4c6e76c47f 100644 --- a/tests/lib/Preview/TXTTest.php +++ b/tests/lib/Preview/TXTTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class TXTTest extends Provider { - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $fileName = 'lorem-big.txt'; diff --git a/tests/lib/Remote/Api/OCSTest.php b/tests/lib/Remote/Api/OCSTest.php index af0b570c091..43e7c61a4cd 100644 --- a/tests/lib/Remote/Api/OCSTest.php +++ b/tests/lib/Remote/Api/OCSTest.php @@ -67,11 +67,11 @@ class OCSTest extends TestCase { $this->assertEquals('user', $user->getUserId()); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Invalid user response, expected field email not found - */ + public function testGetUserInvalidResponse() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Invalid user response, expected field email not found'); + $client = $this->getOCSClient(); $this->expectGetRequest($this->getOCSUrl('cloud/users/user'), @@ -81,10 +81,10 @@ class OCSTest extends TestCase { $client->getUser('user'); } - /** - * @expectedException \OC\ForbiddenException - */ + public function testInvalidPassword() { + $this->expectException(\OC\ForbiddenException::class); + $client = $this->getOCSClient(); $this->expectGetRequest($this->getOCSUrl('cloud/users/user'), diff --git a/tests/lib/Remote/InstanceTest.php b/tests/lib/Remote/InstanceTest.php index 7253228f231..0adb608d875 100644 --- a/tests/lib/Remote/InstanceTest.php +++ b/tests/lib/Remote/InstanceTest.php @@ -73,11 +73,11 @@ class InstanceTest extends TestCase { $this->assertEquals(false, $instance2->isActive()); } - /** - * @expectedException \Exception - * @expectedExceptionMessage refusing to connect to remote instance(example.com) over http that was previously accessible over https - */ + public function testPreventDowngradeAttach() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('refusing to connect to remote instance(example.com) over http that was previously accessible over https'); + $instance = new Instance('example.com', $this->cache, $this->getClientService()); $this->expectGetRequest('https://example.com/status.php', '{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"13.0.0.5","versionstring":"13.0.0 alpha","edition":"","productname":"Nextcloud"}'); diff --git a/tests/lib/Repair/NC11/FixMountStoragesTest.php b/tests/lib/Repair/NC11/FixMountStoragesTest.php index 891f7d600e5..1d5af18a8a3 100644 --- a/tests/lib/Repair/NC11/FixMountStoragesTest.php +++ b/tests/lib/Repair/NC11/FixMountStoragesTest.php @@ -43,7 +43,7 @@ class FixMountStoragesTest extends TestCase { /** @var FixMountStorages */ private $repair; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->db = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/RepairStepTest.php b/tests/lib/RepairStepTest.php index 53b743cf13c..433a161e8fa 100644 --- a/tests/lib/RepairStepTest.php +++ b/tests/lib/RepairStepTest.php @@ -39,7 +39,7 @@ class RepairTest extends TestCase { /** @var string[] */ private $outputArray; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $dispatcher = new EventDispatcher(); $this->repair = new \OC\Repair([], $dispatcher); diff --git a/tests/lib/RichObjectStrings/DefinitionsTest.php b/tests/lib/RichObjectStrings/DefinitionsTest.php index e0d400bff2c..829689704e7 100644 --- a/tests/lib/RichObjectStrings/DefinitionsTest.php +++ b/tests/lib/RichObjectStrings/DefinitionsTest.php @@ -36,11 +36,11 @@ class DefinitionsTest extends TestCase { return $testsuite; } - /** - * @expectedException \OCP\RichObjectStrings\InvalidObjectExeption - * @expectedExceptionMessage Object type is undefined - */ + public function testGetDefinitionNotExisting() { + $this->expectException(\OCP\RichObjectStrings\InvalidObjectExeption::class); + $this->expectExceptionMessage('Object type is undefined'); + $definitions = new Definitions(); $definitions->getDefinition('NotExistingType'); } diff --git a/tests/lib/Security/Bruteforce/CapabilitiesTest.php b/tests/lib/Security/Bruteforce/CapabilitiesTest.php index 001d9983617..60873236e44 100644 --- a/tests/lib/Security/Bruteforce/CapabilitiesTest.php +++ b/tests/lib/Security/Bruteforce/CapabilitiesTest.php @@ -36,7 +36,7 @@ class CapabilitiesTest extends TestCase { /** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */ private $throttler; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/Security/Bruteforce/ThrottlerTest.php b/tests/lib/Security/Bruteforce/ThrottlerTest.php index 7fbcd763ce6..048540fb5a5 100644 --- a/tests/lib/Security/Bruteforce/ThrottlerTest.php +++ b/tests/lib/Security/Bruteforce/ThrottlerTest.php @@ -44,7 +44,7 @@ class ThrottlerTest extends TestCase { /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - public function setUp(): void { + protected function setUp(): void { $this->dbConnection = $this->createMock(IDBConnection::class); $this->logger = $this->createMock(ILogger::class); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php index e96111a06df..009613fbe32 100644 --- a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php +++ b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php @@ -37,7 +37,7 @@ class ContentSecurityPolicyManagerTest extends TestCase { /** @var ContentSecurityPolicyManager */ private $contentSecurityPolicyManager; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->dispatcher = \OC::$server->query(IEventDispatcher::class); $this->contentSecurityPolicyManager = new ContentSecurityPolicyManager($this->dispatcher); diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php index cb2a8f0d931..346ace943d9 100644 --- a/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php +++ b/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php @@ -35,7 +35,7 @@ class ContentSecurityPolicyNonceManagerTest extends TestCase { /** @var ContentSecurityPolicyNonceManager */ private $nonceManager; - public function setUp(): void { + protected function setUp(): void { $this->csrfTokenManager = $this->createMock(CsrfTokenManager::class); $this->request = $this->createMock(Request::class); $this->nonceManager = new ContentSecurityPolicyNonceManager( diff --git a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php index 314902fb725..5ab15c73bf2 100644 --- a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php +++ b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php @@ -27,7 +27,7 @@ class CsrfTokenGeneratorTest extends \Test\TestCase { /** @var \OC\Security\CSRF\CsrfTokenGenerator */ private $csrfTokenGenerator; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->random = $this->getMockBuilder('\OCP\Security\ISecureRandom') ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Security/CSRF/CsrfTokenManagerTest.php b/tests/lib/Security/CSRF/CsrfTokenManagerTest.php index 0f9755c2251..29fbbfe3b26 100644 --- a/tests/lib/Security/CSRF/CsrfTokenManagerTest.php +++ b/tests/lib/Security/CSRF/CsrfTokenManagerTest.php @@ -29,7 +29,7 @@ class CsrfTokenManagerTest extends \Test\TestCase { /** @var \OC\Security\CSRF\TokenStorage\SessionStorage */ private $storageInterface; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->tokenGenerator = $this->getMockBuilder('\OC\Security\CSRF\CsrfTokenGenerator') ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php index 19b13f76d86..8d4a966efea 100644 --- a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php +++ b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php @@ -29,7 +29,7 @@ class SessionStorageTest extends \Test\TestCase { /** @var \OC\Security\CSRF\TokenStorage\SessionStorage */ private $sessionStorage; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->session = $this->getMockBuilder(ISession::class) ->disableOriginalConstructor()->getMock(); @@ -54,10 +54,11 @@ class SessionStorageTest extends \Test\TestCase { * @param string $token * @dataProvider getTokenDataProvider * - * @expectedException \Exception - * @expectedExceptionMessage Session does not contain a requesttoken */ public function testGetTokenWithEmptyToken($token) { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Session does not contain a requesttoken'); + $this->session ->expects($this->once()) ->method('get') diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php index e7d15e65c52..136c3160413 100644 --- a/tests/lib/Security/CertificateManagerTest.php +++ b/tests/lib/Security/CertificateManagerTest.php @@ -93,11 +93,11 @@ class CertificateManagerTest extends \Test\TestCase { $this->assertEqualsArrays($certificateStore, $this->certificateManager->listCertificates()); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Certificate could not get parsed. - */ + function testAddInvalidCertificate() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Certificate could not get parsed.'); + $this->certificateManager->addCertificate('InvalidCertificate', 'invalidCertificate'); } @@ -113,12 +113,13 @@ class CertificateManagerTest extends \Test\TestCase { } /** - * @expectedException \Exception - * @expectedExceptionMessage Filename is not valid * @dataProvider dangerousFileProvider * @param string $filename */ function testAddDangerousFile($filename) { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Filename is not valid'); + $this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), $filename); } diff --git a/tests/lib/Security/CertificateTest.php b/tests/lib/Security/CertificateTest.php index c9d6ea90bd6..986554cf967 100644 --- a/tests/lib/Security/CertificateTest.php +++ b/tests/lib/Security/CertificateTest.php @@ -43,20 +43,20 @@ class CertificateTest extends \Test\TestCase { $this->expiredCertificate = new Certificate($expiredCertificate, 'ExpiredCertificate'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Certificate could not get parsed. - */ + public function testBogusData() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Certificate could not get parsed.'); + $certificate = new Certificate('foo', 'bar'); $certificate->getIssueDate(); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Certificate could not get parsed. - */ + function testCertificateStartingWithFileReference() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Certificate could not get parsed.'); + new Certificate('file://'.__DIR__ . '/../../data/certificates/goodCertificate.crt', 'bar'); } diff --git a/tests/lib/Security/CryptoTest.php b/tests/lib/Security/CryptoTest.php index b0032a555fd..a2c8055750b 100644 --- a/tests/lib/Security/CryptoTest.php +++ b/tests/lib/Security/CryptoTest.php @@ -37,11 +37,11 @@ class CryptoTest extends \Test\TestCase { $this->assertEquals($stringToEncrypt, $this->crypto->decrypt($ciphertext)); } - /** - * @expectedException \Exception - * @expectedExceptionMessage HMAC does not match. - */ + function testWrongPassword() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('HMAC does not match.'); + $stringToEncrypt = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt.'; $ciphertext = $this->crypto->encrypt($stringToEncrypt); $this->crypto->decrypt($ciphertext, 'A wrong password!'); @@ -53,20 +53,20 @@ class CryptoTest extends \Test\TestCase { $this->assertEquals($stringToEncrypt, $this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd')); } - /** - * @expectedException \Exception - * @expectedExceptionMessage HMAC does not match. - */ + function testWrongIV() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('HMAC does not match.'); + $encryptedString = '560f5436ba864b9f12f7f7ca6d41c327554a6f2c0a160a03316b202af07c65163274993f3a46e7547c07ba89304f00594a2f3bd99f83859097c58049c39d0d4ade10e0de914ff0604961e7c849d0271ed6c0b23f984ba16e7d033e3305fb0910e7b6a2a65c988d17dbee71d8f953684d|d2kdFUspVjC0o0sr|1a5feacf87eaa6869a6abdfba9a296e7bbad45b6ad89f7dce67cdc98e2da5dc4379cc672cc655e52bbf19599bf59482fbea13a73937697fa656bf10f3fc4f1aa'; $this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd'); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Authenticated ciphertext could not be decoded. - */ + function testWrongParameters() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Authenticated ciphertext could not be decoded.'); + $encryptedString = '1|2'; $this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd'); } diff --git a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php index ec8ffbee77b..179bd6630ba 100644 --- a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php +++ b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php @@ -42,7 +42,7 @@ class FeaturePolicyManagerTest extends TestCase { /** @var FeaturePolicyManager */ private $manager; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->dispatcher = \OC::$server->query(IEventDispatcher::class); $this->manager = new FeaturePolicyManager($this->dispatcher); diff --git a/tests/lib/Security/IdentityProof/KeyTest.php b/tests/lib/Security/IdentityProof/KeyTest.php index 34493df9878..ae5f77f1609 100644 --- a/tests/lib/Security/IdentityProof/KeyTest.php +++ b/tests/lib/Security/IdentityProof/KeyTest.php @@ -30,7 +30,7 @@ class KeyTest extends TestCase { /** @var Key */ private $key; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->key = new Key('public', 'private'); diff --git a/tests/lib/Security/IdentityProof/ManagerTest.php b/tests/lib/Security/IdentityProof/ManagerTest.php index 9e58ac5c00f..aff6d3ed5c7 100644 --- a/tests/lib/Security/IdentityProof/ManagerTest.php +++ b/tests/lib/Security/IdentityProof/ManagerTest.php @@ -50,7 +50,7 @@ class ManagerTest extends TestCase { /** @var ILogger|MockObject */ private $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ @@ -219,10 +219,10 @@ class ManagerTest extends TestCase { } - /** - * @expectedException \RuntimeException - */ + public function testGetSystemKeyFailure() { + $this->expectException(\RuntimeException::class); + $manager = $this->getManager(['retrieveKey']); /** @var Key|\PHPUnit_Framework_MockObject_MockObject $key */ diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/lib/Security/IdentityProof/SignerTest.php index 850ae08d4f0..884065e6a1a 100644 --- a/tests/lib/Security/IdentityProof/SignerTest.php +++ b/tests/lib/Security/IdentityProof/SignerTest.php @@ -89,7 +89,7 @@ gQIDAQAB /** @var Signer */ private $signer; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->key = new Key($this->public, $this->private); diff --git a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php index d117f7d8c70..e4df424c2ca 100644 --- a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php +++ b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php @@ -37,7 +37,7 @@ class MemoryCacheTest extends TestCase { /** @var MemoryCache */ private $memoryCache; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->cacheFactory = $this->createMock(ICacheFactory::class); diff --git a/tests/lib/Security/RateLimiting/LimiterTest.php b/tests/lib/Security/RateLimiting/LimiterTest.php index 1e72f8e4960..20b35029050 100644 --- a/tests/lib/Security/RateLimiting/LimiterTest.php +++ b/tests/lib/Security/RateLimiting/LimiterTest.php @@ -38,7 +38,7 @@ class LimiterTest extends TestCase { /** @var Limiter */ private $limiter; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->timeFactory = $this->createMock(ITimeFactory::class); @@ -50,11 +50,11 @@ class LimiterTest extends TestCase { ); } - /** - * @expectedException \OC\Security\RateLimiting\Exception\RateLimitExceededException - * @expectedExceptionMessage Rate limit exceeded - */ + public function testRegisterAnonRequestExceeded() { + $this->expectException(\OC\Security\RateLimiting\Exception\RateLimitExceededException::class); + $this->expectExceptionMessage('Rate limit exceeded'); + $this->backend ->expects($this->once()) ->method('getAttempts') @@ -94,11 +94,11 @@ class LimiterTest extends TestCase { $this->limiter->registerAnonRequest('MyIdentifier', 100, 100, '127.0.0.1'); } - /** - * @expectedException \OC\Security\RateLimiting\Exception\RateLimitExceededException - * @expectedExceptionMessage Rate limit exceeded - */ + public function testRegisterUserRequestExceeded() { + $this->expectException(\OC\Security\RateLimiting\Exception\RateLimitExceededException::class); + $this->expectExceptionMessage('Rate limit exceeded'); + /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ $user = $this->createMock(IUser::class); $user diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php index 54eaa159d1d..fbedad61fd7 100644 --- a/tests/lib/ServerTest.php +++ b/tests/lib/ServerTest.php @@ -38,7 +38,7 @@ class ServerTest extends \Test\TestCase { protected $server; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $config = new \OC\Config(\OC::$configDir); $this->server = new \OC\Server('', $config); diff --git a/tests/lib/Session/MemoryTest.php b/tests/lib/Session/MemoryTest.php index 7b60e0197f4..79053ccb1c8 100644 --- a/tests/lib/Session/MemoryTest.php +++ b/tests/lib/Session/MemoryTest.php @@ -16,10 +16,10 @@ class MemoryTest extends Session { $this->instance = new \OC\Session\Memory($this->getUniqueID()); } - /** - * @expectedException \OCP\Session\Exceptions\SessionNotAvailableException - */ + public function testThrowsExceptionOnGetId() { + $this->expectException(\OCP\Session\Exceptions\SessionNotAvailableException::class); + $this->instance->getId(); } diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php index f82a623b3d5..b6870068660 100644 --- a/tests/lib/Settings/ManagerTest.php +++ b/tests/lib/Settings/ManagerTest.php @@ -51,7 +51,7 @@ class ManagerTest extends TestCase { /** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */ private $container; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 93c04ce8449..7ab3eb78539 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -120,11 +120,11 @@ class SetupTest extends \Test\TestCase { $this->assertSame($expectedResult, $result); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Supported databases are not properly configured. - */ + public function testGetSupportedDatabaseException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Supported databases are not properly configured.'); + $this->config ->expects($this->once()) ->method('getValue') diff --git a/tests/lib/Share/HelperTest.php b/tests/lib/Share/HelperTest.php index 02118bf0e2e..dc2d26509e3 100644 --- a/tests/lib/Share/HelperTest.php +++ b/tests/lib/Share/HelperTest.php @@ -122,9 +122,10 @@ class HelperTest extends \Test\TestCase { * @dataProvider dataTestSplitUserRemoteError * * @param string $id - * @expectedException \OC\HintException */ public function testSplitUserRemoteError($id) { + $this->expectException(\OC\HintException::class); + \OC\Share\Helper::splitUserRemote($id); } diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 0f0e77c3207..ff3cafbdf7c 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -73,7 +73,7 @@ class DefaultShareProviderTest extends \Test\TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */ protected $urlGenerator; - public function setUp(): void { + protected function setUp(): void { $this->dbConn = \OC::$server->getDatabaseConnection(); $this->userManager = $this->createMock(IUserManager::class); $this->groupManager = $this->createMock(IGroupManager::class); @@ -100,7 +100,7 @@ class DefaultShareProviderTest extends \Test\TestCase { ); } - public function tearDown(): void { + protected function tearDown(): void { $this->dbConn->getQueryBuilder()->delete('share')->execute(); $this->dbConn->getQueryBuilder()->delete('filecache')->execute(); $this->dbConn->getQueryBuilder()->delete('storages')->execute(); @@ -143,10 +143,10 @@ class DefaultShareProviderTest extends \Test\TestCase { - /** - * @expectedException \OCP\Share\Exceptions\ShareNotFound - */ + public function testGetShareByIdNotExist() { + $this->expectException(\OCP\Share\Exceptions\ShareNotFound::class); + $this->provider->getShareById(1); } @@ -835,10 +835,10 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->assertSame(null, $share->getSharedWith()); } - /** - * @expectedException \OCP\Share\Exceptions\ShareNotFound - */ + public function testGetShareByTokenNotFound() { + $this->expectException(\OCP\Share\Exceptions\ShareNotFound::class); + $this->provider->getShareByToken('invalidtoken'); } @@ -1538,11 +1538,11 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->assertEquals('user2', $share2['share_with']); } - /** - * @expectedException \OC\Share20\Exception\ProviderException - * @expectedExceptionMessage Recipient not in receiving group - */ + public function testDeleteFromSelfGroupUserNotInGroup() { + $this->expectException(\OC\Share20\Exception\ProviderException::class); + $this->expectExceptionMessage('Recipient not in receiving group'); + $qb = $this->dbConn->getQueryBuilder(); $stmt = $qb->insert('share') ->values([ @@ -1583,11 +1583,11 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->provider->deleteFromSelf($share, 'user2'); } - /** - * @expectedException \OC\Share20\Exception\ProviderException - * @expectedExceptionMessage Group "group" does not exist - */ + public function testDeleteFromSelfGroupDoesNotExist() { + $this->expectException(\OC\Share20\Exception\ProviderException::class); + $this->expectExceptionMessage('Group "group" does not exist'); + $qb = $this->dbConn->getQueryBuilder(); $stmt = $qb->insert('share') ->values([ @@ -1674,11 +1674,11 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->assertCount(0, $shares); } - /** - * @expectedException \OC\Share20\Exception\ProviderException - * @expectedExceptionMessage Recipient does not match - */ + public function testDeleteFromSelfUserNotRecipient() { + $this->expectException(\OC\Share20\Exception\ProviderException::class); + $this->expectExceptionMessage('Recipient does not match'); + $qb = $this->dbConn->getQueryBuilder(); $stmt = $qb->insert('share') ->values([ @@ -1717,11 +1717,11 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->provider->deleteFromSelf($share, $user3); } - /** - * @expectedException \OC\Share20\Exception\ProviderException - * @expectedExceptionMessage Invalid shareType - */ + public function testDeleteFromSelfLink() { + $this->expectException(\OC\Share20\Exception\ProviderException::class); + $this->expectExceptionMessage('Invalid shareType'); + $qb = $this->dbConn->getQueryBuilder(); $stmt = $qb->insert('share') ->values([ diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php index d761d011794..14fe32323c1 100644 --- a/tests/lib/Share20/LegacyHooksTest.php +++ b/tests/lib/Share20/LegacyHooksTest.php @@ -42,7 +42,7 @@ class LegacyHooksTest extends TestCase { /** @var Manager */ private $manager; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->eventDispatcher = new EventDispatcher(); diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index a7e2ef7d604..c4cc335dd5e 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -101,7 +101,7 @@ class ManagerTest extends \Test\TestCase { /** @var \OC_Defaults|MockObject */ protected $defaults; - public function setUp(): void { + protected function setUp(): void { $this->logger = $this->createMock(ILogger::class); $this->config = $this->createMock(IConfig::class); @@ -172,10 +172,10 @@ class ManagerTest extends \Test\TestCase { ]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testDeleteNoShareId() { + $this->expectException(\InvalidArgumentException::class); + $share = $this->manager->newShare(); $this->manager->deleteShare($share); @@ -445,10 +445,10 @@ class ManagerTest extends \Test\TestCase { $this->assertEquals($share, $this->manager->getShareById('default:42')); } - /** - * @expectedException \OCP\Share\Exceptions\ShareNotFound - */ + public function testGetExpiredShareById() { + $this->expectException(\OCP\Share\Exceptions\ShareNotFound::class); + $manager = $this->createManagerMock() ->setMethods(['deleteShare']) ->getMock(); @@ -472,11 +472,11 @@ class ManagerTest extends \Test\TestCase { $manager->getShareById('default:42'); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Passwords are enforced for link shares - */ + public function testVerifyPasswordNullButEnforced() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Passwords are enforced for link shares'); + $this->config->method('getAppValue')->will($this->returnValueMap([ ['core', 'shareapi_enforce_links_password', 'no', 'yes'], ])); @@ -510,11 +510,11 @@ class ManagerTest extends \Test\TestCase { $this->assertNull($result); } - /** - * @expectedException \Exception - * @expectedExceptionMessage password not accepted - */ + public function testVerifyPasswordHookFails() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('password not accepted'); + $this->config->method('getAppValue')->will($this->returnValueMap([ ['core', 'shareapi_enforce_links_password', 'no', 'no'], ])); @@ -719,11 +719,11 @@ class ManagerTest extends \Test\TestCase { $this->assertSame($exception, $thrown); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage You can’t share your root folder - */ + public function testGeneralCheckShareRoot() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('You can’t share your root folder'); + $thrown = null; $this->userManager->method('userExists')->will($this->returnValueMap([ @@ -745,11 +745,11 @@ class ManagerTest extends \Test\TestCase { self::invokePrivate($this->manager, 'generalCreateChecks', [$share]); } - /** - * @expectedException \OCP\Share\Exceptions\GenericShareException - * @expectedExceptionMessage Expiration date is in the past - */ + public function testvalidateExpirationDateInPast() { + $this->expectException(\OCP\Share\Exceptions\GenericShareException::class); + $this->expectExceptionMessage('Expiration date is in the past'); + // Expire date in the past $past = new \DateTime(); @@ -761,11 +761,11 @@ class ManagerTest extends \Test\TestCase { self::invokePrivate($this->manager, 'validateExpirationDate', [$share]); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Expiration date is enforced - */ + public function testvalidateExpirationDateEnforceButNotSet() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Expiration date is enforced'); + $share = $this->manager->newShare(); $share->setProviderId('foo')->setId('bar'); @@ -950,11 +950,11 @@ class ManagerTest extends \Test\TestCase { $this->assertEquals($save, $share->getExpirationDate()); } - /** - * @expectedException \Exception - * @expectedExceptionMessage Invalid date! - */ + public function testValidateExpirationDateHookException() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Invalid date!'); + $nextWeek = new \DateTime(); $nextWeek->add(new \DateInterval('P7D')); $nextWeek->setTime(0,0,0); @@ -988,11 +988,11 @@ class ManagerTest extends \Test\TestCase { $this->assertEquals(null, $share->getExpirationDate()); } - /** - * @expectedException Exception - * @expectedExceptionMessage Sharing is only allowed with group members - */ + public function testUserCreateChecksShareWithGroupMembersOnlyDifferentGroups() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Sharing is only allowed with group members'); + $share = $this->manager->newShare(); $sharedBy = $this->createMock(IUser::class); @@ -1061,11 +1061,11 @@ class ManagerTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException Exception - * @expectedExceptionMessage Path is already shared with this user - */ + public function testUserCreateChecksIdenticalShareExists() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Path is already shared with this user'); + $share = $this->manager->newShare(); $share2 = $this->manager->newShare(); @@ -1086,11 +1086,11 @@ class ManagerTest extends \Test\TestCase { self::invokePrivate($this->manager, 'userCreateChecks', [$share]); } - /** - * @expectedException Exception - * @expectedExceptionMessage Path is already shared with this user - */ + public function testUserCreateChecksIdenticalPathSharedViaGroup() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Path is already shared with this user'); + $share = $this->manager->newShare(); $sharedWith = $this->createMock(IUser::class); @@ -1197,11 +1197,11 @@ class ManagerTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException Exception - * @expectedExceptionMessage Group sharing is now allowed - */ + public function testGroupCreateChecksShareWithGroupMembersGroupSharingNotAllowed() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Group sharing is now allowed'); + $share = $this->manager->newShare(); $this->config @@ -1213,11 +1213,11 @@ class ManagerTest extends \Test\TestCase { self::invokePrivate($this->manager, 'groupCreateChecks', [$share]); } - /** - * @expectedException Exception - * @expectedExceptionMessage Sharing is only allowed within your own groups - */ + public function testGroupCreateChecksShareWithGroupMembersOnlyNotInGroup() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Sharing is only allowed within your own groups'); + $share = $this->manager->newShare(); $user = $this->createMock(IUser::class); @@ -1239,11 +1239,11 @@ class ManagerTest extends \Test\TestCase { self::invokePrivate($this->manager, 'groupCreateChecks', [$share]); } - /** - * @expectedException Exception - * @expectedExceptionMessage Sharing is only allowed within your own groups - */ + public function testGroupCreateChecksShareWithGroupMembersOnlyNullGroup() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Sharing is only allowed within your own groups'); + $share = $this->manager->newShare(); $user = $this->createMock(IUser::class); @@ -1292,11 +1292,11 @@ class ManagerTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException Exception - * @expectedExceptionMessage Path is already shared with this group - */ + public function testGroupCreateChecksPathAlreadySharedWithSameGroup() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Path is already shared with this group'); + $share = $this->manager->newShare(); $path = $this->createMock(Node::class); @@ -1348,11 +1348,11 @@ class ManagerTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException Exception - * @expectedExceptionMessage Link sharing is not allowed - */ + public function testLinkCreateChecksNoLinkSharesAllowed() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Link sharing is not allowed'); + $share = $this->manager->newShare(); $this->config @@ -1364,11 +1364,11 @@ class ManagerTest extends \Test\TestCase { self::invokePrivate($this->manager, 'linkCreateChecks', [$share]); } - /** - * @expectedException Exception - * @expectedExceptionMessage Link shares can’t have reshare permissions - */ + public function testLinkCreateChecksSharePermissions() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Link shares can’t have reshare permissions'); + $share = $this->manager->newShare(); $share->setPermissions(\OCP\Constants::PERMISSION_SHARE); @@ -1382,11 +1382,11 @@ class ManagerTest extends \Test\TestCase { self::invokePrivate($this->manager, 'linkCreateChecks', [$share]); } - /** - * @expectedException Exception - * @expectedExceptionMessage Public upload is not allowed - */ + public function testLinkCreateChecksNoPublicUpload() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Public upload is not allowed'); + $share = $this->manager->newShare(); $share->setPermissions(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE); @@ -1433,11 +1433,11 @@ class ManagerTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Path contains files shared with you - */ + public function testPathCreateChecksContainsSharedMount() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Path contains files shared with you'); + $path = $this->createMock(Folder::class); $path->method('getPath')->willReturn('path'); @@ -1924,11 +1924,11 @@ class ManagerTest extends \Test\TestCase { $this->assertEquals('token', $share->getToken()); } - /** - * @expectedException Exception - * @expectedExceptionMessage I won't let you share - */ + public function testCreateShareHookError() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('I won\'t let you share'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -2311,11 +2311,11 @@ class ManagerTest extends \Test\TestCase { $this->assertSame($share, $ret); } - /** - * @expectedException \OCP\Share\Exceptions\ShareNotFound - * @expectedExceptionMessage The requested share does not exist anymore - */ + public function testGetShareByTokenExpired() { + $this->expectException(\OCP\Share\Exceptions\ShareNotFound::class); + $this->expectExceptionMessage('The requested share does not exist anymore'); + $this->config ->expects($this->once()) ->method('getAppValue') @@ -2370,10 +2370,10 @@ class ManagerTest extends \Test\TestCase { $this->assertSame($share, $res); } - /** - * @expectedException \OCP\Share\Exceptions\ShareNotFound - */ + public function testGetShareByTokenWithPublicLinksDisabled() { + $this->expectException(\OCP\Share\Exceptions\ShareNotFound::class); + $this->config ->expects($this->once()) ->method('getAppValue') @@ -2466,11 +2466,11 @@ class ManagerTest extends \Test\TestCase { $this->assertTrue($this->manager->checkPassword($share, 'password')); } - /** - * @expectedException Exception - * @expectedExceptionMessage Can’t change share type - */ + public function testUpdateShareCantChangeShareType() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Can’t change share type'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -2492,11 +2492,11 @@ class ManagerTest extends \Test\TestCase { $manager->updateShare($share); } - /** - * @expectedException Exception - * @expectedExceptionMessage Can only update recipient on user shares - */ + public function testUpdateShareCantChangeRecipientForGroupShare() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Can only update recipient on user shares'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -2520,11 +2520,11 @@ class ManagerTest extends \Test\TestCase { $manager->updateShare($share); } - /** - * @expectedException Exception - * @expectedExceptionMessage Can’t share with the share owner - */ + public function testUpdateShareCantShareWithOwner() { + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Can’t share with the share owner'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -2889,11 +2889,11 @@ class ManagerTest extends \Test\TestCase { $manager->updateShare($share); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password - */ + public function testUpdateShareMailEnableSendPasswordByTalkWithNoPassword() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -2961,11 +2961,11 @@ class ManagerTest extends \Test\TestCase { $manager->updateShare($share); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password - */ + public function testUpdateShareMailEnableSendPasswordByTalkRemovingPassword() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -3033,11 +3033,11 @@ class ManagerTest extends \Test\TestCase { $manager->updateShare($share); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password - */ + public function testUpdateShareMailEnableSendPasswordByTalkRemovingPasswordWithEmptyString() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -3105,11 +3105,11 @@ class ManagerTest extends \Test\TestCase { $manager->updateShare($share); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Can’t enable sending the password by Talk without setting a new password - */ + public function testUpdateShareMailEnableSendPasswordByTalkWithPreviousPassword() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Can’t enable sending the password by Talk without setting a new password'); + $manager = $this->createManagerMock() ->setMethods([ 'canShare', @@ -3247,11 +3247,11 @@ class ManagerTest extends \Test\TestCase { $manager->updateShare($share); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Can’t change target of link share - */ + public function testMoveShareLink() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Can’t change target of link share'); + $share = $this->manager->newShare(); $share->setShareType(\OCP\Share::SHARE_TYPE_LINK); @@ -3260,11 +3260,11 @@ class ManagerTest extends \Test\TestCase { $this->manager->moveShare($share, $recipient); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Invalid recipient - */ + public function testMoveShareUserNotRecipient() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Invalid recipient'); + $share = $this->manager->newShare(); $share->setShareType(\OCP\Share::SHARE_TYPE_USER); @@ -3287,11 +3287,11 @@ class ManagerTest extends \Test\TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Invalid recipient - */ + public function testMoveShareGroupNotRecipient() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Invalid recipient'); + $share = $this->manager->newShare(); $share->setShareType(\OCP\Share::SHARE_TYPE_GROUP); @@ -3307,11 +3307,11 @@ class ManagerTest extends \Test\TestCase { $this->manager->moveShare($share, 'recipient'); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Group "shareWith" does not exist - */ + public function testMoveShareGroupNull() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Group "shareWith" does not exist'); + $share = $this->manager->newShare(); $share->setShareType(\OCP\Share::SHARE_TYPE_GROUP); $share->setSharedWith('shareWith'); diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php index 2562f16e2a4..d2f5cd79284 100644 --- a/tests/lib/Share20/ShareHelperTest.php +++ b/tests/lib/Share20/ShareHelperTest.php @@ -37,7 +37,7 @@ class ShareHelperTest extends TestCase { /** @var ShareHelper */ private $helper; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->manager = $this->createMock(IManager::class); diff --git a/tests/lib/Share20/ShareTest.php b/tests/lib/Share20/ShareTest.php index 45975d5996c..f7ea479350d 100644 --- a/tests/lib/Share20/ShareTest.php +++ b/tests/lib/Share20/ShareTest.php @@ -36,17 +36,17 @@ class ShareTest extends \Test\TestCase { /** @var \OCP\Share\IShare */ protected $share; - public function setUp(): void { + protected function setUp(): void { $this->rootFolder = $this->createMock(IRootFolder::class); $this->userManager = $this->createMock(IUserManager::class); $this->share = new \OC\Share20\Share($this->rootFolder, $this->userManager); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage String expected. - */ + public function testSetIdInvalid() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('String expected.'); + $this->share->setId(1.2); } @@ -61,20 +61,20 @@ class ShareTest extends \Test\TestCase { $this->assertEquals('foo', $this->share->getId()); } - /** - * @expectedException \OCP\Share\Exceptions\IllegalIDChangeException - * @expectedExceptionMessage Not allowed to assign a new internal id to a share - */ + public function testSetIdOnce() { + $this->expectException(\OCP\Share\Exceptions\IllegalIDChangeException::class); + $this->expectExceptionMessage('Not allowed to assign a new internal id to a share'); + $this->share->setId('foo'); $this->share->setId('bar'); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage String expected. - */ + public function testSetProviderIdInt() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('String expected.'); + $this->share->setProviderId(42); } @@ -85,11 +85,11 @@ class ShareTest extends \Test\TestCase { $this->assertEquals('foo:bar', $this->share->getFullId()); } - /** - * @expectedException \OCP\Share\Exceptions\IllegalIDChangeException - * @expectedExceptionMessage Not allowed to assign a new provider id to a share - */ + public function testSetProviderIdOnce() { + $this->expectException(\OCP\Share\Exceptions\IllegalIDChangeException::class); + $this->expectExceptionMessage('Not allowed to assign a new provider id to a share'); + $this->share->setProviderId('foo'); $this->share->setProviderId('bar'); } diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 67d4bd1eb2b..b2c15894391 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -41,7 +41,7 @@ class SubAdminTest extends \Test\TestCase { /** @var \OCP\IGroup[] */ private $groups; - public function setUp(): void { + protected function setUp(): void { $this->users = []; $this->groups = []; @@ -83,7 +83,7 @@ class SubAdminTest extends \Test\TestCase { ->execute(); } - public function tearDown(): void { + protected function tearDown(): void { foreach($this->users as $user) { $user->delete(); } diff --git a/tests/lib/Support/Subscription/RegistryTest.php b/tests/lib/Support/Subscription/RegistryTest.php index a2246bf1b1f..3793026be0f 100644 --- a/tests/lib/Support/Subscription/RegistryTest.php +++ b/tests/lib/Support/Subscription/RegistryTest.php @@ -46,10 +46,10 @@ class RegistryTest extends TestCase { $this->addToAssertionCount(1); } - /** - * @expectedException \OCP\Support\Subscription\Exception\AlreadyRegisteredException - */ + public function testDoubleRegistration() { + $this->expectException(\OCP\Support\Subscription\Exception\AlreadyRegisteredException::class); + /* @var ISubscription $subscription1 */ $subscription1 = $this->createMock(ISubscription::class); /* @var ISubscription $subscription2 */ diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php index 2eb52889ab0..a5a54fce09f 100644 --- a/tests/lib/SystemTag/SystemTagManagerTest.php +++ b/tests/lib/SystemTag/SystemTagManagerTest.php @@ -49,7 +49,7 @@ class SystemTagManagerTest extends TestCase { */ private $dispatcher; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -67,7 +67,7 @@ class SystemTagManagerTest extends TestCase { $this->pruneTagsTables(); } - public function tearDown(): void { + protected function tearDown(): void { $this->pruneTagsTables(); parent::tearDown(); } @@ -249,9 +249,10 @@ class SystemTagManagerTest extends TestCase { /** * @dataProvider oneTagMultipleFlagsProvider - * @expectedException \OCP\SystemTag\TagAlreadyExistsException */ public function testCreateDuplicate($name, $userVisible, $userAssignable) { + $this->expectException(\OCP\SystemTag\TagAlreadyExistsException::class); + try { $this->tagManager->createTag($name, $userVisible, $userAssignable); } catch (\Exception $e) { @@ -282,25 +283,25 @@ class SystemTagManagerTest extends TestCase { $this->assertSameTag($tag2, $tagList[$tag2->getId()]); } - /** - * @expectedException \OCP\SystemTag\TagNotFoundException - */ + public function testGetNonExistingTag() { + $this->expectException(\OCP\SystemTag\TagNotFoundException::class); + $this->tagManager->getTag('nonexist', false, false); } - /** - * @expectedException \OCP\SystemTag\TagNotFoundException - */ + public function testGetNonExistingTagsById() { + $this->expectException(\OCP\SystemTag\TagNotFoundException::class); + $tag1 = $this->tagManager->createTag('one', true, false); $this->tagManager->getTagsByIds([$tag1->getId(), 100, 101]); } - /** - * @expectedException \InvalidArgumentException - */ + public function testGetInvalidTagIdFormat() { + $this->expectException(\InvalidArgumentException::class); + $tag1 = $this->tagManager->createTag('one', true, false); $this->tagManager->getTagsByIds([$tag1->getId() . 'suffix']); } @@ -359,9 +360,10 @@ class SystemTagManagerTest extends TestCase { /** * @dataProvider updateTagProvider - * @expectedException \OCP\SystemTag\TagAlreadyExistsException */ public function testUpdateTagDuplicate($tagCreate, $tagUpdated) { + $this->expectException(\OCP\SystemTag\TagAlreadyExistsException::class); + $this->tagManager->createTag( $tagCreate[0], $tagCreate[1], @@ -391,10 +393,10 @@ class SystemTagManagerTest extends TestCase { $this->assertEmpty($this->tagManager->getAllTags()); } - /** - * @expectedException \OCP\SystemTag\TagNotFoundException - */ + public function testDeleteNonExistingTag() { + $this->expectException(\OCP\SystemTag\TagNotFoundException::class); + $this->tagManager->deleteTags([100]); } diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php index 9c0545c241d..f0e535b0f67 100644 --- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php +++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php @@ -64,7 +64,7 @@ class SystemTagObjectMapperTest extends TestCase { */ private $tag3; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -108,7 +108,7 @@ class SystemTagObjectMapperTest extends TestCase { $this->tagMapper->assignTags('3', 'anothertype', $this->tag1->getId()); } - public function tearDown(): void { + protected function tearDown(): void { $this->pruneTagsTables(); parent::tearDown(); } @@ -166,10 +166,10 @@ class SystemTagObjectMapperTest extends TestCase { ], $objectIds); } - /** - * @expectedException \InvalidArgumentException - */ + public function testGetObjectsForTagsLimitWithMultipleTags() { + $this->expectException(\InvalidArgumentException::class); + $this->tagMapper->getObjectIdsForTags( [$this->tag1->getId(), $this->tag2->getId(), $this->tag3->getId()], 'testtype', @@ -190,10 +190,10 @@ class SystemTagObjectMapperTest extends TestCase { ], $objectIds); } - /** - * @expectedException \OCP\SystemTag\TagNotFoundException - */ + public function testGetObjectsForNonExistingTag() { + $this->expectException(\OCP\SystemTag\TagNotFoundException::class); + $this->tagMapper->getObjectIdsForTags( [100], 'testtype' @@ -228,10 +228,10 @@ class SystemTagObjectMapperTest extends TestCase { $this->assertTrue(true, 'No error when reassigning/unassigning'); } - /** - * @expectedException \OCP\SystemTag\TagNotFoundException - */ + public function testAssignNonExistingTags() { + $this->expectException(\OCP\SystemTag\TagNotFoundException::class); + $this->tagMapper->assignTags('1', 'testtype', [100]); } @@ -255,10 +255,10 @@ class SystemTagObjectMapperTest extends TestCase { ], $tagIdMapping, 'None of the tags got assigned'); } - /** - * @expectedException \OCP\SystemTag\TagNotFoundException - */ + public function testUnassignNonExistingTags() { + $this->expectException(\OCP\SystemTag\TagNotFoundException::class); + $this->tagMapper->unassignTags('1', 'testtype', [100]); } @@ -386,10 +386,10 @@ class SystemTagObjectMapperTest extends TestCase { ); } - /** - * @expectedException \OCP\SystemTag\TagNotFoundException - */ + public function testHaveTagNonExisting() { + $this->expectException(\OCP\SystemTag\TagNotFoundException::class); + $this->tagMapper->haveTag( ['1'], 'testtype', diff --git a/tests/lib/Updater/ChangesCheckTest.php b/tests/lib/Updater/ChangesCheckTest.php index b5aab5be65f..a979007573d 100644 --- a/tests/lib/Updater/ChangesCheckTest.php +++ b/tests/lib/Updater/ChangesCheckTest.php @@ -49,7 +49,7 @@ class ChangesCheckTest extends TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->clientService = $this->createMock(IClientService::class); diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php index 911e883e99b..b25557d5569 100644 --- a/tests/lib/Updater/VersionCheckTest.php +++ b/tests/lib/Updater/VersionCheckTest.php @@ -33,7 +33,7 @@ class VersionCheckTest extends \Test\TestCase { /** @var VersionCheck | \PHPUnit_Framework_MockObject_MockObject*/ private $updater; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index 2df235b3840..1732cf4c1cf 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -40,7 +40,7 @@ class UpdaterTest extends TestCase { /** @var Installer|\PHPUnit_Framework_MockObject_MockObject */ private $installer; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php index 0582a7120b8..afde88e3995 100644 --- a/tests/lib/UrlGeneratorTest.php +++ b/tests/lib/UrlGeneratorTest.php @@ -28,7 +28,7 @@ class UrlGeneratorTest extends \Test\TestCase { /** @var string */ private $originalWebRoot; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->cacheFactory = $this->createMock(ICacheFactory::class); @@ -41,7 +41,7 @@ class UrlGeneratorTest extends \Test\TestCase { $this->originalWebRoot = \OC::$WEBROOT; } - public function tearDown(): void { + protected function tearDown(): void { // Reset webRoot \OC::$WEBROOT = $this->originalWebRoot; } diff --git a/tests/lib/User/DatabaseTest.php b/tests/lib/User/DatabaseTest.php index 202a8225f94..65d483734d9 100644 --- a/tests/lib/User/DatabaseTest.php +++ b/tests/lib/User/DatabaseTest.php @@ -82,11 +82,11 @@ class DatabaseTest extends Backend { $this->assertSame($user, $this->backend->checkPassword($user, 'newpass')); } - /** - * @expectedException \OC\HintException - * @expectedExceptionMessage password change failed - */ + public function testVerifyPasswordEventFail() { + $this->expectException(\OC\HintException::class); + $this->expectExceptionMessage('password change failed'); + $user = $this->getUser(); $this->backend->createUser($user, 'pass1'); diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index 4d70e30273a..58a6b550658 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -30,7 +30,7 @@ class ManagerTest extends TestCase { /** @var EventDispatcherInterface */ private $dispatcher; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); @@ -367,10 +367,10 @@ class ManagerTest extends TestCase { $this->assertEquals('foo', $user->getUID()); } - /** - * @expectedException \Exception - */ + public function testCreateUserSingleBackendExists() { + $this->expectException(\Exception::class); + /** * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend */ @@ -420,11 +420,11 @@ class ManagerTest extends TestCase { $this->assertFalse($manager->createUser('foo', 'bar')); } - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Could not create user - */ + public function testCreateUserFromBackendWithBackendError() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Could not create user'); + /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */ $config = $this->createMock(IConfig::class); /** @var \Test\Util\User\Dummy|\PHPUnit_Framework_MockObject_MockObject $backend */ @@ -439,10 +439,10 @@ class ManagerTest extends TestCase { $manager->createUserFromBackend('MyUid', 'MyPassword', $backend); } - /** - * @expectedException \Exception - */ + public function testCreateUserTwoBackendExists() { + $this->expectException(\Exception::class); + /** * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 */ diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php index a9d466e5408..3567aa9cf62 100644 --- a/tests/lib/User/SessionTest.php +++ b/tests/lib/User/SessionTest.php @@ -271,10 +271,10 @@ class SessionTest extends \Test\TestCase { $this->assertEquals($user, $userSession->getUser()); } - /** - * @expectedException \OC\User\LoginException - */ + public function testLoginValidPasswordDisabled() { + $this->expectException(\OC\User\LoginException::class); + $session = $this->getMockBuilder(Memory::class)->setConstructorArgs([''])->getMock(); $session->expects($this->never()) ->method('set'); @@ -404,10 +404,10 @@ class SessionTest extends \Test\TestCase { $userSession->login('foo', 'bar'); } - /** - * @expectedException \OC\Authentication\Exceptions\PasswordLoginForbiddenException - */ + public function testLogClientInNoTokenPasswordWith2fa() { + $this->expectException(\OC\Authentication\Exceptions\PasswordLoginForbiddenException::class); + $manager = $this->createMock(Manager::class); $session = $this->createMock(ISession::class); $request = $this->createMock(IRequest::class); @@ -508,10 +508,10 @@ class SessionTest extends \Test\TestCase { $this->assertTrue($userSession->logClientIn('john', 'I-AM-AN-APP-PASSWORD', $request, $this->throttler)); } - /** - * @expectedException \OC\Authentication\Exceptions\PasswordLoginForbiddenException - */ + public function testLogClientInNoTokenPasswordNo2fa() { + $this->expectException(\OC\Authentication\Exceptions\PasswordLoginForbiddenException::class); + $manager = $this->createMock(Manager::class); $session = $this->createMock(ISession::class); $request = $this->createMock(IRequest::class); @@ -973,10 +973,10 @@ class SessionTest extends \Test\TestCase { $this->assertFalse($userSession->createSessionToken($request, $uid, $loginName, $password)); } - /** - * @expectedException \OC\User\LoginException - */ + public function testTryTokenLoginWithDisabledUser() { + $this->expectException(\OC\User\LoginException::class); + $manager = $this->getMockBuilder('\OC\User\Manager') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index b4964e28206..0bf582727ff 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -33,7 +33,7 @@ class UserTest extends TestCase { /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->dispatcher = $this->createMock(EventDispatcherInterface::class); } |