diff options
Diffstat (limited to 'apps/theming/tests/Controller')
| -rw-r--r-- | apps/theming/tests/Controller/IconControllerTest.php | 27 | ||||
| -rw-r--r-- | apps/theming/tests/Controller/ThemingControllerTest.php | 2 |
2 files changed, 7 insertions, 22 deletions
diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index 8c916c6cfe6..09cb41088de 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net> * - * @author Julius Haertl <jus@bitgrid.net> + * @author Julius Härtl <jus@bitgrid.net> * * @license GNU AGPL version 3 or any later version * @@ -22,43 +22,31 @@ */ namespace OCA\Theming\Tests\Controller; -use OCA\Theming\Controller\IconController; -use OCA\Theming\IconBuilder; -use OCA\Theming\Util; + use OCP\AppFramework\Http; -use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataDisplayResponse; -use OCP\Files\IRootFolder; -use OCP\IConfig; -use OCP\IL10N; use OCP\IRequest; use Test\TestCase; -use OCA\Theming\ThemingDefaults; -use \Imagick; +use OCA\Theming\Util; +use OCA\Theming\Controller\IconController; + class IconControllerTest extends TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ private $request; /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ - private $config; - /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ private $themingDefaults; /** @var Util */ private $util; /** @var \OCP\AppFramework\Utility\ITimeFactory */ private $timeFactory; /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ - private $l10n; - /** @var IconController */ private $iconController; /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ - private $rootFolder; - /** @var IconBuilder */ private $iconBuilder; public function setUp() { $this->request = $this->getMockBuilder('OCP\IRequest')->getMock(); - $this->config = $this->getMockBuilder('OCP\IConfig')->getMock(); $this->themingDefaults = $this->getMockBuilder('OCA\Theming\ThemingDefaults') ->disableOriginalConstructor()->getMock(); $this->util = $this->getMockBuilder('\OCA\Theming\Util')->disableOriginalConstructor() @@ -66,8 +54,6 @@ class IconControllerTest extends TestCase { $this->timeFactory = $this->getMockBuilder('OCP\AppFramework\Utility\ITimeFactory') ->disableOriginalConstructor() ->getMock(); - $this->l10n = $this->getMockBuilder('OCP\IL10N')->getMock(); - $this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')->getMock(); $this->iconBuilder = $this->getMockBuilder('OCA\Theming\IconBuilder') ->disableOriginalConstructor()->getMock(); @@ -78,12 +64,9 @@ class IconControllerTest extends TestCase { $this->iconController = new IconController( 'theming', $this->request, - $this->config, $this->themingDefaults, $this->util, $this->timeFactory, - $this->l10n, - $this->rootFolder, $this->iconBuilder ); diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index b065046fdba..b7bce2d6ec0 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -932,6 +932,7 @@ class ThemingControllerTest extends TestCase { slogan: "", color: "#000", inverted: false, + cacheBuster: null }; })();'; $expected = new Http\DataDisplayResponse($expectedResponse); @@ -966,6 +967,7 @@ class ThemingControllerTest extends TestCase { slogan: "awesome", color: "#ffffff", inverted: true, + cacheBuster: null }; })();'; $expected = new Http\DataDisplayResponse($expectedResponse); |