Improve ResetTokenBackgroundJob and unit test

* Automatic DI is implemented since 11
* Correctly type hint parameters
* Optimise the tests

Signed-off-by: Joas Schilling <[email protected]>

Author: nickvergessen

apps/updatenotification/lib/ResetTokenBackgroundJob.php

@@ -22,7 +22,6 @@
 
 namespace OCA\UpdateNotification;
 
-use OC\AppFramework\Utility\TimeFactory;
 use OC\BackgroundJob\TimedJob;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
@@ -40,28 +39,15 @@ class ResetTokenBackgroundJob extends TimedJob {
 	private $timeFactory;
 
 	/**
-	 * @param IConfig|null $config
-	 * @param ITimeFactory|null $timeFactory
+	 * @param IConfig $config
+	 * @param ITimeFactory $timeFactory
 	 */
-	public function __construct(IConfig $config = null,
-								ITimeFactory $timeFactory = null) {
+	public function __construct(IConfig $config,
+								ITimeFactory $timeFactory) {
 		// Run all 10 minutes
 		$this->setInterval(60 * 10);
-
-		if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
-			$this->config = $config;
-			$this->timeFactory = $timeFactory;
-		} else {
-			$this->fixDIForJobs();
-		}
-	}
-
-	/**
-	 * DI for jobs
-	 */
-	private function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->timeFactory = new TimeFactory();
+		$this->config = $config;
+		$this->timeFactory = $timeFactory;
 	}
 
 	/**

apps/updatenotification/tests/ResetTokenBackgroundJobTest.php

@@ -29,23 +29,23 @@
 use Test\TestCase;
 
 class ResetTokenBackgroundJobTest extends TestCase {
-	/** @var IConfig */
+	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	private $config;
+	/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */
+	private $timeFactory;
 	/** @var ResetTokenBackgroundJob */
 	private $resetTokenBackgroundJob;
-	/** @var ITimeFactory */
-	private $timeFactory;
 
 	public function setUp() {
 		parent::setUp();
-		$this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
-		$this->timeFactory = $this->getMockBuilder('\\OCP\\AppFramework\\Utility\\ITimeFactory')->getMock();
+		$this->config = $this->createMock(IConfig::class);
+		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->resetTokenBackgroundJob = new ResetTokenBackgroundJob($this->config, $this->timeFactory);
 	}
 
 	public function testRunWithNotExpiredToken() {
 		$this->timeFactory
-			->expects($this->any())
+			->expects($this->atLeastOnce())
 			->method('getTime')
 			->willReturn(123);
 		$this->config
@@ -54,10 +54,9 @@ public function testRunWithNotExpiredToken() {
 			->with('core', 'updater.secret.created', 123);
 		$this->config
 			->expects($this->never())
-			->method('deleteSystemValue')
-			->with('updater.secret');
+			->method('deleteSystemValue');
 
-		$this->invokePrivate($this->resetTokenBackgroundJob, 'run', ['']);
+		static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
 	}
 
 	public function testRunWithExpiredToken() {
@@ -78,6 +77,6 @@ public function testRunWithExpiredToken() {
 			->method('deleteSystemValue')
 			->with('updater.secret');
 
-		$this->invokePrivate($this->resetTokenBackgroundJob, 'run', ['']);
+		static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
 	}
 }