1 files changed, 20 insertions, 40 deletions

diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php
index 836dc25f4aa..2263495fc14 100644
--- a/apps/updatenotification/tests/Controller/AdminControllerTest.php
+++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php
@@ -3,56 +3,34 @@
 declare(strict_types=1);
 
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\UpdateNotification\Tests\Controller;
 
+use OCA\UpdateNotification\BackgroundJob\ResetToken;
 use OCA\UpdateNotification\Controller\AdminController;
-use OCA\UpdateNotification\ResetTokenBackgroundJob;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\Security\ISecureRandom;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class AdminControllerTest extends TestCase {
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-	/** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-	/** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */
-	private $secureRandom;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-	/** @var AdminController */
-	private $adminController;
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l10n;
+	private IRequest&MockObject $request;
+	private IJobList&MockObject $jobList;
+	private ISecureRandom&MockObject $secureRandom;
+	private IConfig&MockObject $config;
+	private ITimeFactory&MockObject $timeFactory;
+	private IL10N&MockObject $l10n;
+	private IAppConfig&MockObject $appConfig;
+
+	private AdminController $adminController;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -61,6 +39,7 @@ class AdminControllerTest extends TestCase {
 		$this->jobList = $this->createMock(IJobList::class);
 		$this->secureRandom = $this->createMock(ISecureRandom::class);
 		$this->config = $this->createMock(IConfig::class);
+		$this->appConfig = $this->createMock(IAppConfig::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->l10n = $this->createMock(IL10N::class);
 
@@ -70,16 +49,17 @@ class AdminControllerTest extends TestCase {
 			$this->jobList,
 			$this->secureRandom,
 			$this->config,
+			$this->appConfig,
 			$this->timeFactory,
 			$this->l10n
 		);
 	}
 
-	public function testCreateCredentials() {
+	public function testCreateCredentials(): void {
 		$this->jobList
 			->expects($this->once())
 			->method('add')
-			->with(ResetTokenBackgroundJob::class);
+			->with(ResetToken::class);
 		$this->secureRandom
 			->expects($this->once())
 			->method('generate')
@@ -93,9 +73,9 @@ class AdminControllerTest extends TestCase {
 			->expects($this->once())
 			->method('getTime')
 			->willReturn(12345);
-		$this->config
+		$this->appConfig
 			->expects($this->once())
-			->method('setAppValue')
+			->method('setValueInt')
 			->with('core', 'updater.secret.created', 12345);
 
 		$expected = new DataResponse('MyGeneratedToken');