diff options
Diffstat (limited to 'apps/files/tests')
-rw-r--r-- | apps/files/tests/Activity/Filter/GenericTest.php | 28 | ||||
-rw-r--r-- | apps/files/tests/Activity/ProviderTest.php | 8 | ||||
-rw-r--r-- | apps/files/tests/Activity/Setting/GenericTest.php | 32 | ||||
-rw-r--r-- | apps/files/tests/AdvancedCapabilitiesTest.php | 4 | ||||
-rw-r--r-- | apps/files/tests/Command/DeleteOrphanedFilesTest.php | 2 | ||||
-rw-r--r-- | apps/files/tests/Controller/ApiControllerTest.php | 6 | ||||
-rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 4 | ||||
-rw-r--r-- | apps/files/tests/HelperTest.php | 4 | ||||
-rw-r--r-- | apps/files/tests/Service/TagServiceTest.php | 2 |
9 files changed, 25 insertions, 65 deletions
diff --git a/apps/files/tests/Activity/Filter/GenericTest.php b/apps/files/tests/Activity/Filter/GenericTest.php index f37a1cb2c9e..40e2f9848b5 100644 --- a/apps/files/tests/Activity/Filter/GenericTest.php +++ b/apps/files/tests/Activity/Filter/GenericTest.php @@ -27,35 +27,27 @@ class GenericTest extends TestCase { ]; } - /** - * @dataProvider dataFilters - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')] public function testImplementsInterface(string $filterClass): void { $filter = Server::get($filterClass); $this->assertInstanceOf(IFilter::class, $filter); } - /** - * @dataProvider dataFilters - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')] public function testGetIdentifier(string $filterClass): void { /** @var IFilter $filter */ $filter = Server::get($filterClass); $this->assertIsString($filter->getIdentifier()); } - /** - * @dataProvider dataFilters - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')] public function testGetName(string $filterClass): void { /** @var IFilter $filter */ $filter = Server::get($filterClass); $this->assertIsString($filter->getName()); } - /** - * @dataProvider dataFilters - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')] public function testGetPriority(string $filterClass): void { /** @var IFilter $filter */ $filter = Server::get($filterClass); @@ -65,9 +57,7 @@ class GenericTest extends TestCase { $this->assertLessThanOrEqual(100, $priority); } - /** - * @dataProvider dataFilters - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')] public function testGetIcon(string $filterClass): void { /** @var IFilter $filter */ $filter = Server::get($filterClass); @@ -75,18 +65,14 @@ class GenericTest extends TestCase { $this->assertStringStartsWith('http', $filter->getIcon()); } - /** - * @dataProvider dataFilters - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')] public function testFilterTypes(string $filterClass): void { /** @var IFilter $filter */ $filter = Server::get($filterClass); $this->assertIsArray($filter->filterTypes([])); } - /** - * @dataProvider dataFilters - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')] public function testAllowedApps(string $filterClass): void { /** @var IFilter $filter */ $filter = Server::get($filterClass); diff --git a/apps/files/tests/Activity/ProviderTest.php b/apps/files/tests/Activity/ProviderTest.php index ed52c76ba28..b6ba095ecfe 100644 --- a/apps/files/tests/Activity/ProviderTest.php +++ b/apps/files/tests/Activity/ProviderTest.php @@ -90,9 +90,7 @@ class ProviderTest extends TestCase { ]; } - /** - * @dataProvider dataGetFile - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataGetFile')] public function testGetFile(array|string $parameter, ?int $eventId, string $id, string $name, string $path): void { $provider = $this->getProvider(); @@ -136,9 +134,7 @@ class ProviderTest extends TestCase { ]; } - /** - * @dataProvider dataGetUser - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataGetUser')] public function testGetUser(string $uid, ?string $userDisplayName, ?array $cloudIdData, array $expected): void { $provider = $this->getProvider(); diff --git a/apps/files/tests/Activity/Setting/GenericTest.php b/apps/files/tests/Activity/Setting/GenericTest.php index 7e549ce9dc0..df6b1e0f6d4 100644 --- a/apps/files/tests/Activity/Setting/GenericTest.php +++ b/apps/files/tests/Activity/Setting/GenericTest.php @@ -22,35 +22,27 @@ class GenericTest extends TestCase { ]; } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testImplementsInterface(string $settingClass): void { $setting = Server::get($settingClass); $this->assertInstanceOf(ISetting::class, $setting); } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testGetIdentifier(string $settingClass): void { /** @var ISetting $setting */ $setting = Server::get($settingClass); $this->assertIsString($setting->getIdentifier()); } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testGetName(string $settingClass): void { /** @var ISetting $setting */ $setting = Server::get($settingClass); $this->assertIsString($setting->getName()); } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testGetPriority(string $settingClass): void { /** @var ISetting $setting */ $setting = Server::get($settingClass); @@ -60,36 +52,28 @@ class GenericTest extends TestCase { $this->assertLessThanOrEqual(100, $priority); } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testCanChangeStream(string $settingClass): void { /** @var ISetting $setting */ $setting = Server::get($settingClass); $this->assertIsBool($setting->canChangeStream()); } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testIsDefaultEnabledStream(string $settingClass): void { /** @var ISetting $setting */ $setting = Server::get($settingClass); $this->assertIsBool($setting->isDefaultEnabledStream()); } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testCanChangeMail(string $settingClass): void { /** @var ISetting $setting */ $setting = Server::get($settingClass); $this->assertIsBool($setting->canChangeMail()); } - /** - * @dataProvider dataSettings - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')] public function testIsDefaultEnabledMail(string $settingClass): void { /** @var ISetting $setting */ $setting = Server::get($settingClass); diff --git a/apps/files/tests/AdvancedCapabilitiesTest.php b/apps/files/tests/AdvancedCapabilitiesTest.php index 8f4a845b708..f39ac1c873f 100644 --- a/apps/files/tests/AdvancedCapabilitiesTest.php +++ b/apps/files/tests/AdvancedCapabilitiesTest.php @@ -23,9 +23,7 @@ class AdvancedCapabilitiesTest extends TestCase { $this->capabilities = new AdvancedCapabilities($this->service); } - /** - * @dataProvider dataGetCapabilities - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataGetCapabilities')] public function testGetCapabilities(bool $wcf): void { $this->service ->expects(self::once()) diff --git a/apps/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php index 54b5ac6c12f..a488915e0cb 100644 --- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php +++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php @@ -117,7 +117,7 @@ class DeleteOrphanedFilesTest extends TestCase { $output ->expects($this->exactly(3)) ->method('writeln') - ->willReturnCallback(function (string $message) use (&$calls) { + ->willReturnCallback(function (string $message) use (&$calls): void { $expected = array_shift($calls); $this->assertSame($expected, $message); }); diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php index d6d86e293fd..e74989eb2f5 100644 --- a/apps/files/tests/Controller/ApiControllerTest.php +++ b/apps/files/tests/Controller/ApiControllerTest.php @@ -119,7 +119,7 @@ class ApiControllerTest extends TestCase { $this->tagService->expects($this->once()) ->method('updateFileTags') ->with('/path.txt', ['Tag1', 'Tag2']) - ->will($this->throwException(new NotFoundException('My error message'))); + ->willThrowException(new NotFoundException('My error message')); $expected = new DataResponse(['message' => 'My error message'], Http::STATUS_NOT_FOUND); $this->assertEquals($expected, $this->apiController->updateFileTags('/path.txt', ['Tag1', 'Tag2'])); @@ -129,7 +129,7 @@ class ApiControllerTest extends TestCase { $this->tagService->expects($this->once()) ->method('updateFileTags') ->with('/path.txt', ['Tag1', 'Tag2']) - ->will($this->throwException(new StorageNotAvailableException('My error message'))); + ->willThrowException(new StorageNotAvailableException('My error message')); $expected = new DataResponse(['message' => 'My error message'], Http::STATUS_SERVICE_UNAVAILABLE); $this->assertEquals($expected, $this->apiController->updateFileTags('/path.txt', ['Tag1', 'Tag2'])); @@ -139,7 +139,7 @@ class ApiControllerTest extends TestCase { $this->tagService->expects($this->once()) ->method('updateFileTags') ->with('/path.txt', ['Tag1', 'Tag2']) - ->will($this->throwException(new \Exception('My error message'))); + ->willThrowException(new \Exception('My error message')); $expected = new DataResponse(['message' => 'My error message'], Http::STATUS_NOT_FOUND); $this->assertEquals($expected, $this->apiController->updateFileTags('/path.txt', ['Tag1', 'Tag2'])); diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 93ef98bdec7..a9a80fc6f35 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -210,9 +210,7 @@ class ViewControllerTest extends TestCase { ]; } - /** - * @dataProvider dataTestShortRedirect - */ + #[\PHPUnit\Framework\Attributes\DataProvider('dataTestShortRedirect')] public function testShortRedirect(?string $openfile, ?string $opendetails, string $result): void { $this->appManager->expects($this->any()) ->method('isEnabledForUser') diff --git a/apps/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php index cb1fc5ed66d..ba93fa0efdf 100644 --- a/apps/files/tests/HelperTest.php +++ b/apps/files/tests/HelperTest.php @@ -76,9 +76,7 @@ class HelperTest extends \Test\TestCase { ]; } - /** - * @dataProvider sortDataProvider - */ + #[\PHPUnit\Framework\Attributes\DataProvider('sortDataProvider')] public function testSortByName(string $sort, bool $sortDescending, array $expectedOrder): void { if (($sort === 'mtime') && (PHP_INT_SIZE < 8)) { $this->markTestSkipped('Skip mtime sorting on 32bit'); diff --git a/apps/files/tests/Service/TagServiceTest.php b/apps/files/tests/Service/TagServiceTest.php index 74e58e674bb..424e483102c 100644 --- a/apps/files/tests/Service/TagServiceTest.php +++ b/apps/files/tests/Service/TagServiceTest.php @@ -53,7 +53,7 @@ class TagServiceTest extends \Test\TestCase { ->withAnyParameters() ->willReturn($user); - $this->root = \OCP\Server::get(IRootFolder::class)->getUserFolder($this->user); + $this->root = Server::get(IRootFolder::class)->getUserFolder($this->user); $this->tagger = Server::get(ITagManager::class)->load('files'); $this->tagService = $this->getTagService(); |