chore: minor unit test reorg

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Jan 15, 2025 · 65e8c45 · 65e8c45
1 parent 1fee962
commit 65e8c45
Show file tree

Hide file tree

Showing 8 changed files with 336 additions and 473 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"config": {
 		"platform": {
-			"php": "8.1"
+			"php": "8.0"
 		},
 		"allow-plugins": {
 			"bamarni/composer-bin-plugin": true

diff --git a/composer.lock b/composer.lock
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -4,13 +4,14 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-define('PHPUNIT_RUN', 1);
+if (!defined('PHPUNIT_RUN')) {
+	define('PHPUNIT_RUN', 1);
+}
 
 require_once __DIR__ . '/../../../lib/base.php';
 
 \OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true);
-\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/', true);
 
-OC_App::loadApp('notify_push');
+\OC_App::loadApp('notify_push');
 
 OC_Hook::clear();
diff --git a/tests/CoreEventsTest.php → tests/lib/CoreEventsTest.php b/tests/CoreEventsTest.php → tests/lib/CoreEventsTest.php
diff --git a/tests/ListenerTest.php → tests/lib/ListenerTest.php b/tests/ListenerTest.php → tests/lib/ListenerTest.php
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -1,24 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-  - SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-<phpunit bootstrap="bootstrap.php"
-		 timeoutForSmallTests="900"
-		 timeoutForMediumTests="900"
-		 timeoutForLargeTests="900"
-		 convertDeprecationsToExceptions="true"
->
-	<testsuite name='Nextcloud - Notify Push App Tests'>
-		<directory suffix='.php'>.</directory>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 bootstrap="bootstrap.php"
+		 verbose="true"
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd">
+	<testsuite name="unit">
+		<directory suffix="Test.php">./</directory>
 	</testsuite>
-	<filter>
-		<whitelist>
-			<directory suffix=".php">../</directory>
-			<exclude>
-				<directory suffix=".php">../tests
-				</directory>
-			</exclude>
-		</whitelist>
-	</filter>
+	<coverage>
+		<include>
+			<directory suffix=".php">./tests/lib</directory>
+		</include>
+	</coverage>
 </phpunit>
diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json
@@ -1,11 +1,11 @@
 {
-    "config": {
-        "platform": {
-            "php": "8.1"
-        },
-        "sort-packages": true
-    },
-    "require-dev": {
-        "christophwurst/nextcloud_testing": "^1.0.0"
-    }
+	"config": {
+		"platform": {
+			"php": "8.0"
+		},
+		"sort-packages": true
+	},
+	"require-dev": {
+		"phpunit/phpunit": "^9.6.13"
+	}
 }