From 478b86e5e586975f96d57f6ebb6a3b5dbcbdaaea Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 12 Sep 2016 21:41:19 +0200
Subject: [PATCH] Fix getMock UrlGeneratortest
---
tests/lib/UrlGeneratorTest.php | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php
index 7186c8fad80..c8d5b8ece2c 100644
--- a/tests/lib/UrlGeneratorTest.php
+++ b/tests/lib/UrlGeneratorTest.php
@@ -7,6 +7,8 @@
*/
namespace Test;
+use OCP\ICacheFactory;
+use OCP\IConfig;
/**
* Class UrlGeneratorTest
@@ -22,8 +24,8 @@ class UrlGeneratorTest extends \Test\TestCase {
*/
public function testLinkToDocRoot($app, $file, $args, $expectedResult) {
\OC::$WEBROOT = '';
- $config = $this->getMock('\OCP\IConfig');
- $cacheFactory = $this->getMock('\OCP\ICacheFactory');
+ $config = $this->createMock(IConfig::class);
+ $cacheFactory = $this->createMock(ICacheFactory::class);
$urlGenerator = new \OC\URLGenerator($config, $cacheFactory);
$result = $urlGenerator->linkTo($app, $file, $args);
@@ -37,8 +39,8 @@ class UrlGeneratorTest extends \Test\TestCase {
*/
public function testLinkToSubDir($app, $file, $args, $expectedResult) {
\OC::$WEBROOT = '/owncloud';
- $config = $this->getMock('\OCP\IConfig');
- $cacheFactory = $this->getMock('\OCP\ICacheFactory');
+ $config = $this->createMock(IConfig::class);
+ $cacheFactory = $this->createMock(ICacheFactory::class);
$urlGenerator = new \OC\URLGenerator($config, $cacheFactory);
$result = $urlGenerator->linkTo($app, $file, $args);
@@ -50,8 +52,8 @@ class UrlGeneratorTest extends \Test\TestCase {
*/
public function testLinkToRouteAbsolute($route, $expected) {
\OC::$WEBROOT = '/owncloud';
- $config = $this->getMock('\OCP\IConfig');
- $cacheFactory = $this->getMock('\OCP\ICacheFactory');
+ $config = $this->createMock(IConfig::class);
+ $cacheFactory = $this->createMock(ICacheFactory::class);
$urlGenerator = new \OC\URLGenerator($config, $cacheFactory);
$result = $urlGenerator->linkToRouteAbsolute($route);
$this->assertEquals($expected, $result);
@@ -89,8 +91,8 @@ class UrlGeneratorTest extends \Test\TestCase {
function testGetAbsoluteURLDocRoot($url, $expectedResult) {
\OC::$WEBROOT = '';
- $config = $this->getMock('\OCP\IConfig');
- $cacheFactory = $this->getMock('\OCP\ICacheFactory');
+ $config = $this->createMock(IConfig::class);
+ $cacheFactory = $this->createMock(ICacheFactory::class);
$urlGenerator = new \OC\URLGenerator($config, $cacheFactory);
$result = $urlGenerator->getAbsoluteURL($url);
@@ -105,8 +107,8 @@ class UrlGeneratorTest extends \Test\TestCase {
function testGetAbsoluteURLSubDir($url, $expectedResult) {
\OC::$WEBROOT = '/owncloud';
- $config = $this->getMock('\OCP\IConfig');
- $cacheFactory = $this->getMock('\OCP\ICacheFactory');
+ $config = $this->createMock(IConfig::class);
+ $cacheFactory = $this->createMock(ICacheFactory::class);
$urlGenerator = new \OC\URLGenerator($config, $cacheFactory);
$result = $urlGenerator->getAbsoluteURL($url);
--
GitLab