upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Improve ResetTokenBackgroundJob and unit test

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

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-01-11 10:59:10 +01:00
parent 0f729e2cd3
commit ffb3a3e33a
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
2 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/updatenotification/lib/ResetTokenBackgroundJob.php
View file

@ -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;
}
/**

19
apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
View file

@ -29,23 +29,23 @@ use OCP\IConfig;
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 @@ class ResetTokenBackgroundJobTest extends TestCase {
->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 @@ class ResetTokenBackgroundJobTest extends TestCase {
->method('deleteSystemValue')
->with('updater.secret');
$this->invokePrivate($this->resetTokenBackgroundJob, 'run', ['']);
static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]);
}
}