mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9859 from nextcloud/fix/noid/iconcontroller_timing_fix 

Fix possible test timing issues in IconController
This commit is contained in:
Morris Jobke 2018-06-13 23:14:42 +02:00 committed by GitHub
parent 699049be1b e4db293cc1
commit e2795b0202
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/theming/lib/Controller/IconController.php
View File

@ -34,15 +34,12 @@ use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\NotFoundException;
use OCP\IRequest;
class IconController extends Controller {
/** @var ThemingDefaults */
private $themingDefaults;
/** @var ITimeFactory */
private $timeFactory;
/** @var IconBuilder */
private $iconBuilder;
/** @var ImageManager */
@ -56,7 +53,6 @@ class IconController extends Controller {
* @param string $appName
* @param IRequest $request
* @param ThemingDefaults $themingDefaults
* @param ITimeFactory $timeFactory
* @param IconBuilder $iconBuilder
* @param ImageManager $imageManager
* @param FileAccessHelper $fileAccessHelper
@ -65,7 +61,6 @@ class IconController extends Controller {
$appName,
IRequest $request,
ThemingDefaults $themingDefaults,
ITimeFactory $timeFactory,
IconBuilder $iconBuilder,
ImageManager $imageManager,
FileAccessHelper $fileAccessHelper
@ -73,7 +68,6 @@ class IconController extends Controller {
parent::__construct($appName, $request);
$this->themingDefaults = $themingDefaults;
$this->timeFactory = $timeFactory;
$this->iconBuilder = $iconBuilder;
$this->imageManager = $imageManager;
$this->fileAccessHelper = $fileAccessHelper;

6
apps/theming/tests/Controller/IconControllerTest.php
View File

@ -64,19 +64,21 @@ class IconControllerTest extends TestCase {
public function setUp() {
$this->request = $this->createMock(IRequest::class);
$this->themingDefaults = $this->createMock(ThemingDefaults::class);
$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->iconBuilder = $this->createMock(IconBuilder::class);
$this->imageManager = $this->createMock(ImageManager::class);
$this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->timeFactory->expects($this->any())
->method('getTime')
->willReturn(123);
$this->overwriteService(ITimeFactory::class, $this->timeFactory);
$this->iconController = new IconController(
'theming',
$this->request,
$this->themingDefaults,
$this->timeFactory,
$this->iconBuilder,
$this->imageManager,
$this->fileAccessHelper