From 639168ede40de47b6cddb57f45d889309f196fc3 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Wed, 17 May 2017 10:16:59 +0200 Subject: Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/theming/tests/Controller/ThemingControllerTest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index cbdb86d0358..5fa8dc51939 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -62,8 +62,6 @@ class ThemingControllerTest extends TestCase { private $l10n; /** @var ThemingController */ private $themingController; - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ - private $rootFolder; /** @var ITempManager */ private $tempManager; /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ @@ -79,14 +77,13 @@ class ThemingControllerTest extends TestCase { $this->themingDefaults = $this->createMock(ThemingDefaults::class); $this->timeFactory = $this->createMock(ITimeFactory::class); $this->l10n = $this->createMock(L10N::class); - $this->rootFolder = $this->createMock(IRootFolder::class); + $this->appData = $this->createMock(IAppData::class); $this->appManager = $this->createMock(IAppManager::class); - $this->util = new Util($this->config, $this->rootFolder, $this->appManager); + $this->util = new Util($this->config, $this->appManager, $this->appData); $this->timeFactory->expects($this->any()) ->method('getTime') ->willReturn(123); $this->tempManager = \OC::$server->getTempManager(); - $this->appData = $this->createMock(IAppData::class); $this->scssCacher = $this->createMock(SCSSCacher::class); $this->themingController = new ThemingController( -- cgit v1.2.3