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

Fix unit test

Browse source 
Null is not longer possible as value for $dispatcher.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2019-02-11 17:27:48 +01:00
parent 4f9abaaaa9
commit e090973e64
No known key found for this signature in database
GPG key ID: 36E3664E099D0614
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/Migration/BackgroundRepair.php
View file

@ -29,7 +29,7 @@ use OC\Repair;
use OC_App;
use OCP\BackgroundJob\IJobList;
use OCP\ILogger;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
/**
* Class BackgroundRepair
@ -44,12 +44,16 @@ class BackgroundRepair extends TimedJob {
/** @var ILogger */
private $logger;
/** @var EventDispatcher */
/** @var EventDispatcherInterface */
private $dispatcher;
public function setDispatcher(EventDispatcher $dispatcher) {
/**
* @param EventDispatcherInterface $dispatcher
*/
public function setDispatcher(EventDispatcherInterface $dispatcher): void {
$this->dispatcher = $dispatcher;
}
/**
* run the job, then remove it from the job list
*

24
tests/lib/Migration/BackgroundRepairTest.php
View file

@ -21,13 +21,12 @@
namespace Test\Migration;
use OC\Migration\BackgroundRepair;
use OC\NeedsUpdateException;
use OCP\ILogger;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
use Test\TestCase;
@ -57,15 +56,18 @@ class TestRepairStep implements IRepairStep {
class BackgroundRepairTest extends TestCase {
/** @var \OC\BackgroundJob\JobList | \PHPUnit_Framework_MockObject_MockObject */
/** @var \OC\BackgroundJob\JobList|\PHPUnit_Framework_MockObject_MockObject */
private $jobList;
/** @var BackgroundRepair | \PHPUnit_Framework_MockObject_MockObject */
/** @var BackgroundRepair|\PHPUnit_Framework_MockObject_MockObject */
private $job;
/** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
private $logger;
/** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject $dispatcher */
private $dispatcher;
public function setUp() {
parent::setUp();
@ -78,6 +80,9 @@ class BackgroundRepairTest extends TestCase {
$this->job = $this->getMockBuilder(BackgroundRepair::class)
->setMethods(['loadApp'])
->getMock();
$this->dispatcher = $this->createMock(EventDispatcherInterface::class);
$this->job->setDispatcher($this->dispatcher);
}
public function testNoArguments() {
@ -96,8 +101,11 @@ class BackgroundRepairTest extends TestCase {
}
public function testUnknownStep() {
$this->dispatcher->expects($this->never())->method('dispatch');
$this->jobList->expects($this->once())->method('remove');
$this->logger->expects($this->once())->method('logException');
$this->job->setArgument([
'app' => 'test',
'step' => 'j'
@ -106,13 +114,11 @@ class BackgroundRepairTest extends TestCase {
}
public function testWorkingStep() {
/** @var EventDispatcher | \PHPUnit_Framework_MockObject_MockObject $dispatcher */
$dispatcher = $this->createMock(EventDispatcher::class);
$dispatcher->expects($this->once())->method('dispatch')
$this->dispatcher->expects($this->once())->method('dispatch')
->with('\OC\Repair::step', new GenericEvent('\OC\Repair::step', ['A test repair step']));
$this->jobList->expects($this->once())->method('remove');
$this->job->setDispatcher($dispatcher);
$this->job->setArgument([
'app' => 'test',
'step' => '\Test\Migration\TestRepairStep'