Skip to content

Commit 9a91aae

Browse files
committed
ci: Migrate PHPUnit configs
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent ebb65f0 commit 9a91aae

File tree

3 files changed

+32
-45
lines changed

3 files changed

+32
-45
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ Vagrantfile
152152
# Tests - auto-generated files
153153
/data-autotest
154154
/results.sarif
155+
/tests/.phpunit.cache
155156
/tests/.phpunit.result.cache
156157
/tests/coverage*
157158
/tests/css
Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3+
- SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
34
- SPDX-FileCopyrightText: 2014-2016 ownCloud, Inc.
45
- SPDX-License-Identifier: AGPL-3.0-only
56
-->
6-
<phpunit bootstrap="bootstrap.php"
7-
verbose="true"
7+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8+
bootstrap="bootstrap.php"
89
timeoutForSmallTests="900"
910
timeoutForMediumTests="900"
1011
timeoutForLargeTests="900"
11-
>
12-
<testsuite name='ownCloud files external'>
12+
cacheDirectory=".phpunit.cache"
13+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
14+
<testsuite name="Nextcloud files external">
1315
<directory>../apps/files_external/tests</directory>
1416
<!-- exclude backends as they are called separately -->
1517
<exclude>../apps/files_external/tests/Storage/</exclude>
1618
</testsuite>
17-
<!-- filters for code coverage -->
18-
<filter>
19-
<!-- whitelist processUncoveredFilesFromWhitelist="true" -->
20-
<whitelist>
19+
<source>
20+
<include>
2121
<file>../lib/private/Files/Storage/DAV.php</file>
22-
<directory suffix=".php">../apps/files_external</directory>
23-
<exclude>
24-
<directory suffix=".php">../apps/files_external/l10n</directory>
25-
<directory suffix=".php">../apps/files_external/3rdparty</directory>
26-
<directory suffix=".php">../apps/files_external/tests</directory>
27-
</exclude>
28-
</whitelist>
29-
</filter>
30-
<!--<listeners>
31-
<listener class="StartSessionListener" file="startsessionlistener.php" />
32-
<listener class="TestCleanupListener" file="testcleanuplistener.php">
33-
<arguments>
34-
<string>detail</string>
35-
</arguments>
36-
</listener>
37-
</listeners>-->
22+
<directory>../apps/files_external</directory>
23+
</include>
24+
<exclude>
25+
<directory>../apps/files_external/l10n</directory>
26+
<directory>../apps/files_external/3rdparty</directory>
27+
<directory>../apps/files_external/tests</directory>
28+
</exclude>
29+
</source>
3830
</phpunit>
39-

tests/phpunit-autotest.xml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,35 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
- SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
44
- SPDX-FileCopyrightText: 2016 ownCloud, Inc.
55
- SPDX-License-Identifier: AGPL-3.0-only
66
-->
77
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
88
bootstrap="bootstrap.php"
9-
verbose="true"
10-
backupGlobals="false"
119
timeoutForSmallTests="900"
1210
timeoutForMediumTests="900"
1311
timeoutForLargeTests="900"
14-
convertDeprecationsToExceptions="true"
15-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
12+
cacheDirectory=".phpunit.cache"
13+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
1614
<testsuite name="Nextcloud Server">
1715
<directory>lib/</directory>
1816
<directory>Core/</directory>
1917
<directory>../apps/</directory>
2018
<exclude>../apps/user_ldap/tests/Integration</exclude>
2119
</testsuite>
22-
<coverage>
20+
<source>
2321
<include>
24-
<directory suffix=".php">..</directory>
22+
<directory>..</directory>
2523
</include>
2624
<exclude>
27-
<directory suffix=".php">../3rdparty</directory>
28-
<directory suffix=".php">../apps/*/composer</directory>
29-
<directory suffix=".php">../apps/*/tests</directory>
30-
<directory suffix=".php">../apps/files_external/3rdparty</directory>
31-
<directory suffix=".php">../build</directory>
32-
<directory suffix=".php">../lib/composer</directory>
33-
<directory suffix=".php">../tests</directory>
34-
<directory suffix=".php">../vendor-bin</directory>
25+
<directory>../3rdparty</directory>
26+
<directory>../apps/*/composer</directory>
27+
<directory>../apps/*/tests</directory>
28+
<directory>../apps/files_external/3rdparty</directory>
29+
<directory>../build</directory>
30+
<directory>../lib/composer</directory>
31+
<directory>../tests</directory>
32+
<directory>../vendor-bin</directory>
3533
</exclude>
36-
</coverage>
37-
<listeners>
38-
<listener class="StartSessionListener" file="startsessionlistener.php" />
39-
</listeners>
34+
</source>
4035
</phpunit>

0 commit comments

Comments
 (0)