|
|
|
@ -33,9 +33,6 @@ namespace Tests\Core\Controller; |
|
|
|
|
|
|
|
|
|
use OC\AppFramework\Utility\TimeFactory; |
|
|
|
|
use OC\Core\Controller\AvatarController; |
|
|
|
|
use OCP\Accounts\IAccount; |
|
|
|
|
use OCP\Accounts\IAccountManager; |
|
|
|
|
use OCP\Accounts\IAccountProperty; |
|
|
|
|
use OCP\AppFramework\Http; |
|
|
|
|
use OCP\Files\File; |
|
|
|
|
use OCP\Files\IRootFolder; |
|
|
|
@ -49,7 +46,6 @@ use OCP\ILogger; |
|
|
|
|
use OCP\IRequest; |
|
|
|
|
use OCP\IUser; |
|
|
|
|
use OCP\IUserManager; |
|
|
|
|
use PHPUnit\Framework\MockObject\MockObject; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Class AvatarControllerTest |
|
|
|
@ -82,8 +78,6 @@ class AvatarControllerTest extends \Test\TestCase { |
|
|
|
|
private $request; |
|
|
|
|
/** @var TimeFactory|\PHPUnit\Framework\MockObject\MockObject */ |
|
|
|
|
private $timeFactory; |
|
|
|
|
/** @var IAccountManager|MockObject */ |
|
|
|
|
private $accountManager; |
|
|
|
|
|
|
|
|
|
protected function setUp(): void { |
|
|
|
|
parent::setUp(); |
|
|
|
@ -98,7 +92,6 @@ class AvatarControllerTest extends \Test\TestCase { |
|
|
|
|
$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')->getMock(); |
|
|
|
|
$this->logger = $this->getMockBuilder(ILogger::class)->getMock(); |
|
|
|
|
$this->timeFactory = $this->getMockBuilder('OC\AppFramework\Utility\TimeFactory')->getMock(); |
|
|
|
|
$this->accountManager = $this->createMock(IAccountManager::class); |
|
|
|
|
|
|
|
|
|
$this->avatarMock = $this->getMockBuilder('OCP\IAvatar')->getMock(); |
|
|
|
|
$this->userMock = $this->getMockBuilder(IUser::class)->getMock(); |
|
|
|
@ -113,8 +106,7 @@ class AvatarControllerTest extends \Test\TestCase { |
|
|
|
|
$this->rootFolder, |
|
|
|
|
$this->logger, |
|
|
|
|
'userid', |
|
|
|
|
$this->timeFactory, |
|
|
|
|
$this->accountManager |
|
|
|
|
$this->timeFactory |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
// Configure userMock |
|
|
|
|