diff options
Diffstat (limited to 'tests/lib/App/AppStore')
11 files changed, 23 insertions, 23 deletions
diff --git a/tests/lib/App/AppStore/Bundles/BundleBase.php b/tests/lib/App/AppStore/Bundles/BundleBase.php index 23af1cda927..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() { + 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 350f6654e08..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() { + 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 235e2ec84fe..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() { + 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 589f35db215..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() { + 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 b3182ff00c8..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() { + 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 ccff5dcbd34..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() { + 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 3d8bccf1935..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() { + 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 214f652742b..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() { + 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 f4b8c320c51..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() { + 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 851773a6506..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() { + 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 ebfa98ade39..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() { + 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'); } } |