1 files changed, 12 insertions, 40 deletions

diff --git a/tests/lib/Support/CrashReport/RegistryTest.php b/tests/lib/Support/CrashReport/RegistryTest.php
index 9424738cd70..adf7579b202 100644
--- a/tests/lib/Support/CrashReport/RegistryTest.php
+++ b/tests/lib/Support/CrashReport/RegistryTest.php
@@ -3,25 +3,8 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\Support\CrashReport;
@@ -29,27 +12,18 @@ namespace Test\Support\CrashReport;
 use Exception;
 use OC\Support\CrashReport\Registry;
 use OCP\AppFramework\QueryException;
-use OCP\IServerContainer;
 use OCP\Support\CrashReport\ICollectBreadcrumbs;
 use OCP\Support\CrashReport\IMessageReporter;
 use OCP\Support\CrashReport\IReporter;
 use Test\TestCase;
 
 class RegistryTest extends TestCase {
-	/** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */
-	private $serverContainer;
-
-	/** @var Registry */
-	private $registry;
+	private Registry $registry;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->serverContainer = $this->createMock(IServerContainer::class);
-
-		$this->registry = new Registry(
-			$this->serverContainer
-		);
+		$this->registry = new Registry();
 	}
 
 	/**
@@ -62,13 +36,10 @@ class RegistryTest extends TestCase {
 		$this->addToAssertionCount(1);
 	}
 
-	public function testRegisterLazyCantLoad(): void {
+	public function testRegisterLazy(): void {
 		$reporterClass = '\OCA\MyApp\Reporter';
 		$reporter = $this->createMock(IReporter::class);
-		$this->serverContainer->expects($this->once())
-			->method('query')
-			->with($reporterClass)
-			->willReturn($reporter);
+		$this->overwriteService($reporterClass, $reporter);
 		$reporter->expects($this->once())
 			->method('report');
 		$exception = new Exception('test');
@@ -77,16 +48,17 @@ class RegistryTest extends TestCase {
 		$this->registry->delegateReport($exception);
 	}
 
-	public function testRegisterLazy(): void {
+	/**
+	 * Doesn't assert anything, just checks whether anything "explodes"
+	 */
+	public function testRegisterLazyCantLoad(): void {
 		$reporterClass = '\OCA\MyApp\Reporter';
-		$this->serverContainer->expects($this->once())
-			->method('query')
-			->with($reporterClass)
-			->willThrowException(new QueryException());
+		/* We do not register reporterClass in DI, so it will throw a QueryException queried */
 		$exception = new Exception('test');
 
 		$this->registry->registerLazy($reporterClass);
 		$this->registry->delegateReport($exception);
+		$this->addToAssertionCount(1);
 	}
 
 	public function testDelegateBreadcrumbCollection(): void {