1 files changed, 19 insertions, 20 deletions

diff --git a/tests/lib/BackgroundJob/JobTest.php b/tests/lib/BackgroundJob/JobTest.php
index a4e0dcf4fd6..b67059f0380 100644
--- a/tests/lib/BackgroundJob/JobTest.php
+++ b/tests/lib/BackgroundJob/JobTest.php
@@ -1,62 +1,61 @@
 <?php
+
 /**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\BackgroundJob;
 
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\ILogger;
+use OCP\Server;
+use Psr\Log\LoggerInterface;
 
 class JobTest extends \Test\TestCase {
 	private $run = false;
 	private ITimeFactory $timeFactory;
+	private LoggerInterface $logger;
 
 	protected function setUp(): void {
 		parent::setUp();
 		$this->run = false;
-		$this->timeFactory = \OC::$server->get(ITimeFactory::class);
+		$this->timeFactory = Server::get(ITimeFactory::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
+
+		\OC::$server->registerService(LoggerInterface::class, fn ($c) => $this->logger);
 	}
 
-	public function testRemoveAfterException() {
+	public function testRemoveAfterException(): void {
 		$jobList = new DummyJobList();
 		$e = new \Exception();
-		$job = new TestJob($this->timeFactory, $this, function () use ($e) {
+		$job = new TestJob($this->timeFactory, $this, function () use ($e): void {
 			throw $e;
 		});
 		$jobList->add($job);
 
-		$logger = $this->getMockBuilder(ILogger::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$logger->expects($this->once())
+		$this->logger->expects($this->once())
 			->method('error');
 
 		$this->assertCount(1, $jobList->getAll());
-		$job->execute($jobList, $logger);
+		$job->start($jobList);
 		$this->assertTrue($this->run);
 		$this->assertCount(1, $jobList->getAll());
 	}
 
-	public function testRemoveAfterError() {
+	public function testRemoveAfterError(): void {
 		$jobList = new DummyJobList();
-		$job = new TestJob($this->timeFactory, $this, function () {
+		$job = new TestJob($this->timeFactory, $this, function (): void {
 			$test = null;
 			$test->someMethod();
 		});
 		$jobList->add($job);
 
-		$logger = $this->getMockBuilder(ILogger::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$logger->expects($this->once())
+		$this->logger->expects($this->once())
 			->method('error');
 
 		$this->assertCount(1, $jobList->getAll());
-		$job->execute($jobList, $logger);
+		$job->start($jobList);
 		$this->assertTrue($this->run);
 		$this->assertCount(1, $jobList->getAll());
 	}