Skip to content

Commit e1e6235

Browse files
nickvergessennickvergessen
committed
test: Migrate files app
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent 89a7778 commit e1e6235

12 files changed

Lines changed: 138 additions & 200 deletions

‎apps/files/tests/Activity/Filter/GenericTest.php‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
3+
declare(strict_types=1);
24
/**
35
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
46
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -18,7 +20,7 @@
1820
* @group DB
1921
*/
2022
class GenericTest extends TestCase {
21-
public function dataFilters() {
23+
public static function dataFilters(): array {
2224
return [
2325
[Favorites::class],
2426
[FileChanges::class],
@@ -27,38 +29,34 @@ public function dataFilters() {
2729

2830
/**
2931
* @dataProvider dataFilters
30-
* @param string $filterClass
3132
*/
32-
public function testImplementsInterface($filterClass): void {
33+
public function testImplementsInterface(string $filterClass): void {
3334
$filter = Server::get($filterClass);
3435
$this->assertInstanceOf(IFilter::class, $filter);
3536
}
3637

3738
/**
3839
* @dataProvider dataFilters
39-
* @param string $filterClass
4040
*/
41-
public function testGetIdentifier($filterClass): void {
41+
public function testGetIdentifier(string $filterClass): void {
4242
/** @var IFilter $filter */
4343
$filter = Server::get($filterClass);
4444
$this->assertIsString($filter->getIdentifier());
4545
}
4646

4747
/**
4848
* @dataProvider dataFilters
49-
* @param string $filterClass
5049
*/
51-
public function testGetName($filterClass): void {
50+
public function testGetName(string $filterClass): void {
5251
/** @var IFilter $filter */
5352
$filter = Server::get($filterClass);
5453
$this->assertIsString($filter->getName());
5554
}
5655

5756
/**
5857
* @dataProvider dataFilters
59-
* @param string $filterClass
6058
*/
61-
public function testGetPriority($filterClass): void {
59+
public function testGetPriority(string $filterClass): void {
6260
/** @var IFilter $filter */
6361
$filter = Server::get($filterClass);
6462
$priority = $filter->getPriority();
@@ -69,9 +67,8 @@ public function testGetPriority($filterClass): void {
6967

7068
/**
7169
* @dataProvider dataFilters
72-
* @param string $filterClass
7370
*/
74-
public function testGetIcon($filterClass): void {
71+
public function testGetIcon(string $filterClass): void {
7572
/** @var IFilter $filter */
7673
$filter = Server::get($filterClass);
7774
$this->assertIsString($filter->getIcon());
@@ -80,19 +77,17 @@ public function testGetIcon($filterClass): void {
8077

8178
/**
8279
* @dataProvider dataFilters
83-
* @param string $filterClass
8480
*/
85-
public function testFilterTypes($filterClass): void {
81+
public function testFilterTypes(string $filterClass): void {
8682
/** @var IFilter $filter */
8783
$filter = Server::get($filterClass);
8884
$this->assertIsArray($filter->filterTypes([]));
8985
}
9086

9187
/**
9288
* @dataProvider dataFilters
93-
* @param string $filterClass
9489
*/
95-
public function testAllowedApps($filterClass): void {
90+
public function testAllowedApps(string $filterClass): void {
9691
/** @var IFilter $filter */
9792
$filter = Server::get($filterClass);
9893
$this->assertIsArray($filter->allowedApps());

‎apps/files/tests/Activity/ProviderTest.php‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
3+
declare(strict_types=1);
24
/**
35
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
46
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -26,23 +28,14 @@
2628
* @package OCA\Files\Tests\Activity
2729
*/
2830
class ProviderTest extends TestCase {
29-
30-
/** @var IFactory|MockObject */
31-
protected $l10nFactory;
32-
/** @var IURLGenerator|MockObject */
33-
protected $url;
34-
/** @var IManager|MockObject */
35-
protected $activityManager;
36-
/** @var IUserManager|MockObject */
37-
protected $userManager;
38-
/** @var IRootFolder|MockObject */
39-
protected $rootFolder;
40-
/** @var ICloudIdManager|MockObject */
41-
protected $cloudIdManager;
42-
/** @var IContactsManager|MockObject */
43-
protected $contactsManager;
44-
/** @var IEventMerger|MockObject */
45-
protected $eventMerger;
31+
protected IFactory&MockObject $l10nFactory;
32+
protected IURLGenerator&MockObject $url;
33+
protected IManager&MockObject $activityManager;
34+
protected IUserManager&MockObject $userManager;
35+
protected IRootFolder&MockObject $rootFolder;
36+
protected ICloudIdManager&MockObject $cloudIdManager;
37+
protected IContactsManager&MockObject $contactsManager;
38+
protected IEventMerger&MockObject $eventMerger;
4639

4740
protected function setUp(): void {
4841
parent::setUp();
@@ -74,7 +67,7 @@ protected function getProvider(array $methods = []) {
7467
$this->contactsManager,
7568
$this->eventMerger,
7669
])
77-
->setMethods($methods)
70+
->onlyMethods($methods)
7871
->getMock();
7972
}
8073
return new Provider(
@@ -89,7 +82,7 @@ protected function getProvider(array $methods = []) {
8982
);
9083
}
9184

92-
public function dataGetFile() {
85+
public static function dataGetFile(): array {
9386
return [
9487
[[42 => '/FortyTwo.txt'], null, '42', 'FortyTwo.txt', 'FortyTwo.txt'],
9588
[['23' => '/Twenty/Three.txt'], null, '23', 'Three.txt', 'Twenty/Three.txt'],
@@ -99,13 +92,8 @@ public function dataGetFile() {
9992

10093
/**
10194
* @dataProvider dataGetFile
102-
* @param mixed $parameter
103-
* @param mixed $eventId
104-
* @param int $id
105-
* @param string $name
106-
* @param string $path
10795
*/
108-
public function testGetFile($parameter, $eventId, $id, $name, $path): void {
96+
public function testGetFile(array|string $parameter, ?int $eventId, string $id, string $name, string $path): void {
10997
$provider = $this->getProvider();
11098

11199
if ($eventId !== null) {
@@ -139,7 +127,7 @@ public function testGetFileThrows(): void {
139127
self::invokePrivate($provider, 'getFile', ['/Foo/Bar.txt', null]);
140128
}
141129

142-
public function dataGetUser() {
130+
public static function dataGetUser(): array {
143131
return [
144132
['test', 'Test user', null, ['type' => 'user', 'id' => 'test', 'name' => 'Test user']],
145133
['test@http://localhost', null, ['user' => 'test', 'displayId' => 'test@localhost', 'remote' => 'localhost', 'name' => null], ['type' => 'user', 'id' => 'test', 'name' => 'test@localhost', 'server' => 'localhost']],
@@ -150,10 +138,6 @@ public function dataGetUser() {
150138

151139
/**
152140
* @dataProvider dataGetUser
153-
* @param string $uid
154-
* @param string|null $userDisplayName
155-
* @param array|null $cloudIdData
156-
* @param array $expected
157141
*/
158142
public function testGetUser(string $uid, ?string $userDisplayName, ?array $cloudIdData, array $expected): void {
159143
$provider = $this->getProvider();

‎apps/files/tests/Activity/Setting/GenericTest.php‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
3+
declare(strict_types=1);
24
/**
35
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
46
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,7 +14,7 @@
1214
use Test\TestCase;
1315

1416
class GenericTest extends TestCase {
15-
public function dataSettings() {
17+
public static function dataSettings(): array {
1618
return [
1719
[FavoriteAction::class],
1820
[FileChanged::class],
@@ -22,38 +24,34 @@ public function dataSettings() {
2224

2325
/**
2426
* @dataProvider dataSettings
25-
* @param string $settingClass
2627
*/
27-
public function testImplementsInterface($settingClass): void {
28+
public function testImplementsInterface(string $settingClass): void {
2829
$setting = Server::get($settingClass);
2930
$this->assertInstanceOf(ISetting::class, $setting);
3031
}
3132

3233
/**
3334
* @dataProvider dataSettings
34-
* @param string $settingClass
3535
*/
36-
public function testGetIdentifier($settingClass): void {
36+
public function testGetIdentifier(string $settingClass): void {
3737
/** @var ISetting $setting */
3838
$setting = Server::get($settingClass);
3939
$this->assertIsString($setting->getIdentifier());
4040
}
4141

4242
/**
4343
* @dataProvider dataSettings
44-
* @param string $settingClass
4544
*/
46-
public function testGetName($settingClass): void {
45+
public function testGetName(string $settingClass): void {
4746
/** @var ISetting $setting */
4847
$setting = Server::get($settingClass);
4948
$this->assertIsString($setting->getName());
5049
}
5150

5251
/**
5352
* @dataProvider dataSettings
54-
* @param string $settingClass
5553
*/
56-
public function testGetPriority($settingClass): void {
54+
public function testGetPriority(string $settingClass): void {
5755
/** @var ISetting $setting */
5856
$setting = Server::get($settingClass);
5957
$priority = $setting->getPriority();
@@ -64,39 +62,35 @@ public function testGetPriority($settingClass): void {
6462

6563
/**
6664
* @dataProvider dataSettings
67-
* @param string $settingClass
6865
*/
69-
public function testCanChangeStream($settingClass): void {
66+
public function testCanChangeStream(string $settingClass): void {
7067
/** @var ISetting $setting */
7168
$setting = Server::get($settingClass);
7269
$this->assertIsBool($setting->canChangeStream());
7370
}
7471

7572
/**
7673
* @dataProvider dataSettings
77-
* @param string $settingClass
7874
*/
79-
public function testIsDefaultEnabledStream($settingClass): void {
75+
public function testIsDefaultEnabledStream(string $settingClass): void {
8076
/** @var ISetting $setting */
8177
$setting = Server::get($settingClass);
8278
$this->assertIsBool($setting->isDefaultEnabledStream());
8379
}
8480

8581
/**
8682
* @dataProvider dataSettings
87-
* @param string $settingClass
8883
*/
89-
public function testCanChangeMail($settingClass): void {
84+
public function testCanChangeMail(string $settingClass): void {
9085
/** @var ISetting $setting */
9186
$setting = Server::get($settingClass);
9287
$this->assertIsBool($setting->canChangeMail());
9388
}
9489

9590
/**
9691
* @dataProvider dataSettings
97-
* @param string $settingClass
9892
*/
99-
public function testIsDefaultEnabledMail($settingClass): void {
93+
public function testIsDefaultEnabledMail(string $settingClass): void {
10094
/** @var ISetting $setting */
10195
$setting = Server::get($settingClass);
10296
$this->assertIsBool($setting->isDefaultEnabledMail());

‎apps/files/tests/AdvancedCapabilitiesTest.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class AdvancedCapabilitiesTest extends TestCase {
1818
protected AdvancedCapabilities $capabilities;
1919

2020
protected function setUp(): void {
21+
parent::setUp();
2122
$this->service = $this->createMock(SettingsService::class);
2223
$this->capabilities = new AdvancedCapabilities($this->service);
2324
}

0 commit comments

Comments
 (0)