summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-02-20 10:16:59 +0100
committerGitHub <noreply@github.com>2018-02-20 10:16:59 +0100
commitcf83eb5e77313c3a820cd1e808c83e0991b9d6a0 (patch)
tree13ced98982664ef5a60986915996363af1d90acd /tests
parentc48332a14fe4e367e52b3fb2f53e4f58a47a7b66 (diff)
parentd18d323f214face6d2b6c3dae54a2dd3f086550b (diff)
downloadnextcloud-server-cf83eb5e77313c3a820cd1e808c83e0991b9d6a0.tar.gz
nextcloud-server-cf83eb5e77313c3a820cd1e808c83e0991b9d6a0.zip
Merge pull request #8336 from nextcloud/cleanup-unused-parameter
Cleanup unused parameter
Diffstat (limited to 'tests')
-rw-r--r--tests/Core/Controller/AutoCompleteControllerTest.php8
-rw-r--r--tests/Settings/Controller/UsersControllerTest.php14
2 files changed, 1 insertions, 21 deletions
diff --git a/tests/Core/Controller/AutoCompleteControllerTest.php b/tests/Core/Controller/AutoCompleteControllerTest.php
index 6279ba3283e..b1e9e6ba304 100644
--- a/tests/Core/Controller/AutoCompleteControllerTest.php
+++ b/tests/Core/Controller/AutoCompleteControllerTest.php
@@ -23,11 +23,9 @@
namespace Tests\Core\Controller;
-
use OC\Core\Controller\AutoCompleteController;
use OCP\Collaboration\AutoComplete\IManager;
use OCP\Collaboration\Collaborators\ISearch;
-use OCP\IConfig;
use OCP\IRequest;
use Test\TestCase;
@@ -36,8 +34,6 @@ class AutoCompleteControllerTest extends TestCase {
protected $collaboratorSearch;
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
protected $autoCompleteManager;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
- protected $config;
/** @var AutoCompleteController */
protected $controller;
@@ -48,14 +44,12 @@ class AutoCompleteControllerTest extends TestCase {
$request = $this->createMock(IRequest::class);
$this->collaboratorSearch = $this->createMock(ISearch::class);
$this->autoCompleteManager = $this->createMock(IManager::class);
- $this->config = $this->createMock(IConfig::class);
$this->controller = new AutoCompleteController(
'core',
$request,
$this->collaboratorSearch,
- $this->autoCompleteManager,
- $this->config
+ $this->autoCompleteManager
);
}
diff --git a/tests/Settings/Controller/UsersControllerTest.php b/tests/Settings/Controller/UsersControllerTest.php
index 15c18fb7f08..1b59f15efb0 100644
--- a/tests/Settings/Controller/UsersControllerTest.php
+++ b/tests/Settings/Controller/UsersControllerTest.php
@@ -19,7 +19,6 @@ use OC\SubAdmin;
use OCP\App\IAppManager;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
use OCP\Files\Config\IUserMountCache;
use OCP\Encryption\IEncryptionModule;
@@ -38,7 +37,6 @@ use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Mail\IEMailTemplate;
use OCP\Mail\IMailer;
-use OCP\Security\ICrypto;
use OCP\Security\ISecureRandom;
use OC\User\User;
use Test\Util\User\Dummy;
@@ -74,12 +72,8 @@ class UsersControllerTest extends \Test\TestCase {
private $accountManager;
/** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */
private $secureRandom;
- /** @var ITimeFactory | \PHPUnit_Framework_MockObject_MockObject */
- private $timeFactory;
/** @var NewUserMailHelper|\PHPUnit_Framework_MockObject_MockObject */
private $newUserMailHelper;
- /** @var ICrypto | \PHPUnit_Framework_MockObject_MockObject */
- private $crypto;
/** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */
private $jobList;
/** @var \OC\Security\IdentityProof\Manager |\PHPUnit_Framework_MockObject_MockObject */
@@ -105,11 +99,7 @@ class UsersControllerTest extends \Test\TestCase {
$this->avatarManager = $this->createMock(IAvatarManager::class);
$this->accountManager = $this->createMock(AccountManager::class);
$this->secureRandom = $this->createMock(ISecureRandom::class);
- $this->timeFactory = $this->createMock(ITimeFactory::class);
- $this->crypto = $this->createMock(ICrypto::class);
$this->newUserMailHelper = $this->createMock(NewUserMailHelper::class);
- $this->timeFactory = $this->createMock(ITimeFactory::class);
- $this->crypto = $this->createMock(ICrypto::class);
$this->securityManager = $this->getMockBuilder(\OC\Security\IdentityProof\Manager::class)->disableOriginalConstructor()->getMock();
$this->jobList = $this->createMock(IJobList::class);
$this->encryptionManager = $this->createMock(IManager::class);
@@ -163,8 +153,6 @@ class UsersControllerTest extends \Test\TestCase {
$this->accountManager,
$this->secureRandom,
$this->newUserMailHelper,
- $this->timeFactory,
- $this->crypto,
$this->securityManager,
$this->jobList,
$this->userMountCache,
@@ -190,8 +178,6 @@ class UsersControllerTest extends \Test\TestCase {
$this->accountManager,
$this->secureRandom,
$this->newUserMailHelper,
- $this->timeFactory,
- $this->crypto,
$this->securityManager,
$this->jobList,
$this->userMountCache,