mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor provision api app's UserControllerTest 

* Replace deprecated getMock with createMock
* Use createMock consistently
* Use php's ::class references

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2017-02-28 10:40:49 +01:00
parent b72b02778d
commit 8e370bbf28
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
1 changed files with 73 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
apps/provisioning_api/tests/Controller/UsersControllerTest.php
View File

@ -29,67 +29,59 @@
namespace OCA\Provisioning_API\Tests\Controller; namespace OCA\Provisioning_API\Tests\Controller;
use Exception;
use OC\Accounts\AccountManager; use OC\Accounts\AccountManager;
use OC\Group\Manager;
use OC\SubAdmin;
use OCA\Provisioning_API\Controller\UsersController; use OCA\Provisioning_API\Controller\UsersController;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IGroup; use OCP\IGroup;
use OCP\ILogger;
use OCP\IRequest; use OCP\IRequest;
use OCP\IUser; use OCP\IUser;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\IConfig;
use OCP\IUserSession; use OCP\IUserSession;
use PHPUnit_Framework_MockObject_MockObject; use PHPUnit_Framework_MockObject_MockObject;
use Test\TestCase as OriginalTest; use Test\TestCase;
use OCP\ILogger;
class UsersControllerTest extends OriginalTest { class UsersControllerTest extends TestCase {
/** @var IUserManager | PHPUnit_Framework_MockObject_MockObject */ /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject */
protected $userManager; protected $userManager;
/** @var IConfig | PHPUnit_Framework_MockObject_MockObject */
protected $config;
/** @var \OC\Group\Manager | PHPUnit_Framework_MockObject_MockObject */
protected $groupManager;
/** @var IUserSession | PHPUnit_Framework_MockObject_MockObject */
protected $userSession;
/** @var ILogger | PHPUnit_Framework_MockObject_MockObject */
protected $logger;
/** @var UsersController | PHPUnit_Framework_MockObject_MockObject */
protected $api;
/** @var AccountManager | PHPUnit_Framework_MockObject_MockObject */
protected $accountManager;
/** @var IRequest | PHPUnit_Framework_MockObject_MockObject */
protected $request;
protected function tearDown() { /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */
parent::tearDown(); protected $config;
}
/** @var Manager|PHPUnit_Framework_MockObject_MockObject */
protected $groupManager;
/** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */
protected $userSession;
/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
protected $logger;
/** @var UsersController|PHPUnit_Framework_MockObject_MockObject */
protected $api;
/** @var AccountManager|PHPUnit_Framework_MockObject_MockObject */
protected $accountManager;
/** @var IRequest|PHPUnit_Framework_MockObject_MockObject */
protected $request;
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
$this->userManager = $this->getMockBuilder('OCP\IUserManager') $this->userManager = $this->createMock(IUserManager::class);
->disableOriginalConstructor() $this->config = $this->createMock(IConfig::class);
->getMock(); $this->groupManager = $this->createMock(Manager::class);
$this->config = $this->getMockBuilder('OCP\IConfig') $this->userSession = $this->createMock(IUserSession::class);
->disableOriginalConstructor() $this->logger = $this->createMock(ILogger::class);
->getMock(); $this->request = $this->createMock(IRequest::class);
$this->groupManager = $this->getMockBuilder('OC\Group\Manager') $this->accountManager = $this->createMock(AccountManager::class);
->disableOriginalConstructor() $this->api = $this->getMockBuilder(UsersController::class)
->getMock();
$this->userSession = $this->getMockBuilder('OCP\IUserSession')
->disableOriginalConstructor()
->getMock();
$this->logger = $this->getMockBuilder('OCP\ILogger')
->disableOriginalConstructor()
->getMock();
$this->request = $this->getMockBuilder('OCP\IRequest')
->disableOriginalConstructor()
->getMock();
$this->accountManager = $this->getMockBuilder(AccountManager::class)
->disableOriginalConstructor()
->getMock();
$this->api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController')
->setConstructorArgs([ ->setConstructorArgs([
'provisioning_api', 'provisioning_api',
$this->request, $this->request,
@ -105,7 +97,7 @@ class UsersControllerTest extends OriginalTest {
} }
public function testGetUsersAsAdmin() { public function testGetUsersAsAdmin() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -136,7 +128,7 @@ class UsersControllerTest extends OriginalTest {
} }
public function testGetUsersAsSubAdmin() { public function testGetUsersAsSubAdmin() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -209,7 +201,7 @@ class UsersControllerTest extends OriginalTest {
->expects($this->once()) ->expects($this->once())
->method('error') ->method('error')
->with('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']); ->with('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -240,7 +232,7 @@ class UsersControllerTest extends OriginalTest {
->method('userExists') ->method('userExists')
->with('NewUser') ->with('NewUser')
->willReturn(false); ->willReturn(false);
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -276,7 +268,7 @@ class UsersControllerTest extends OriginalTest {
->method('userExists') ->method('userExists')
->with('NewUser') ->with('NewUser')
->willReturn(false); ->willReturn(false);
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -321,7 +313,7 @@ class UsersControllerTest extends OriginalTest {
->expects($this->once()) ->expects($this->once())
->method('info') ->method('info')
->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']); ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -347,7 +339,7 @@ class UsersControllerTest extends OriginalTest {
->method('userExists') ->method('userExists')
->with('NewUser') ->with('NewUser')
->willReturn(false); ->willReturn(false);
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -368,7 +360,7 @@ class UsersControllerTest extends OriginalTest {
->method('groupExists') ->method('groupExists')
->with('ExistingGroup') ->with('ExistingGroup')
->willReturn(true); ->willReturn(true);
$user = $this->getMockBuilder('OCP\IUser') $user = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userManager $this->userManager
@ -414,12 +406,12 @@ class UsersControllerTest extends OriginalTest {
->expects($this->once()) ->expects($this->once())
->method('createUser') ->method('createUser')
->with('NewUser', 'PasswordOfTheNewUser') ->with('NewUser', 'PasswordOfTheNewUser')
->will($this->throwException(new \Exception('User backend not found.'))); ->will($this->throwException(new Exception('User backend not found.')));
$this->logger $this->logger
->expects($this->once()) ->expects($this->once())
->method('error') ->method('error')
->with('Failed addUser attempt with exception: User backend not found.', ['app' => 'ocs_api']); ->with('Failed addUser attempt with exception: User backend not found.', ['app' => 'ocs_api']);
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -445,7 +437,7 @@ class UsersControllerTest extends OriginalTest {
* @expectedExceptionMessage no group specified (required for subadmins) * @expectedExceptionMessage no group specified (required for subadmins)
*/ */
public function testAddUserAsSubAdminNoGroup() { public function testAddUserAsSubAdminNoGroup() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -478,7 +470,7 @@ class UsersControllerTest extends OriginalTest {
* @expectedExceptionMessage insufficient privileges for group ExistingGroup * @expectedExceptionMessage insufficient privileges for group ExistingGroup
*/ */
public function testAddUserAsSubAdminValidGroupNotSubAdmin() { public function testAddUserAsSubAdminValidGroupNotSubAdmin() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -527,7 +519,7 @@ class UsersControllerTest extends OriginalTest {
->method('userExists') ->method('userExists')
->with('NewUser') ->with('NewUser')
->willReturn(false); ->willReturn(false);
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
@ -551,7 +543,7 @@ class UsersControllerTest extends OriginalTest {
['ExistingGroup2'] ['ExistingGroup2']
) )
->willReturn(true); ->willReturn(true);
$user = $this->getMockBuilder('OCP\IUser') $user = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userManager $this->userManager
@ -618,7 +610,7 @@ class UsersControllerTest extends OriginalTest {
* @expectedExceptionMessage The requested user could not be found * @expectedExceptionMessage The requested user could not be found
*/ */
public function testGetUserTargetDoesNotExist() { public function testGetUserTargetDoesNotExist() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -638,14 +630,14 @@ class UsersControllerTest extends OriginalTest {
$group = $this->getMockBuilder(IGroup::class) $group = $this->getMockBuilder(IGroup::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->once()) ->expects($this->once())
->method('getUID') ->method('getUID')
->will($this->returnValue('admin')); ->will($this->returnValue('admin'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$targetUser->expects($this->once()) $targetUser->expects($this->once())
@ -723,14 +715,14 @@ class UsersControllerTest extends OriginalTest {
} }
public function testGetUserDataAsSubAdminAndUserIsAccessible() { public function testGetUserDataAsSubAdminAndUserIsAccessible() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->once()) ->expects($this->once())
->method('getUID') ->method('getUID')
->will($this->returnValue('subadmin')); ->will($this->returnValue('subadmin'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$targetUser $targetUser
@ -817,14 +809,14 @@ class UsersControllerTest extends OriginalTest {
* @expectedExceptionCode 997 * @expectedExceptionCode 997
*/ */
public function testGetUserDataAsSubAdminAndUserIsNotAccessible() { public function testGetUserDataAsSubAdminAndUserIsNotAccessible() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->exactly(2)) ->expects($this->exactly(2))
->method('getUID') ->method('getUID')
->will($this->returnValue('subadmin')); ->will($this->returnValue('subadmin'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -858,14 +850,14 @@ class UsersControllerTest extends OriginalTest {
} }
public function testGetUserDataAsSubAdminSelfLookup() { public function testGetUserDataAsSubAdminSelfLookup() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->exactly(2)) ->expects($this->exactly(2))
->method('getUID') ->method('getUID')
->will($this->returnValue('subadmin')); ->will($this->returnValue('subadmin'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -941,14 +933,14 @@ class UsersControllerTest extends OriginalTest {
} }
public function testEditUserRegularUserSelfEditChangeDisplayName() { public function testEditUserRegularUserSelfEditChangeDisplayName() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->any()) ->expects($this->any())
->method('getUID') ->method('getUID')
->will($this->returnValue('UserToEdit')); ->will($this->returnValue('UserToEdit'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -969,14 +961,14 @@ class UsersControllerTest extends OriginalTest {
} }
public function testEditUserRegularUserSelfEditChangeEmailValid() { public function testEditUserRegularUserSelfEditChangeEmailValid() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->any()) ->expects($this->any())
->method('getUID') ->method('getUID')
->will($this->returnValue('UserToEdit')); ->will($this->returnValue('UserToEdit'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -1002,14 +994,14 @@ class UsersControllerTest extends OriginalTest {
* @expectedExceptionCode 102 * @expectedExceptionCode 102
*/ */
public function testEditUserRegularUserSelfEditChangeEmailInvalid() { public function testEditUserRegularUserSelfEditChangeEmailInvalid() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->any()) ->expects($this->any())
->method('getUID') ->method('getUID')
->will($this->returnValue('UserToEdit')); ->will($this->returnValue('UserToEdit'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -1026,14 +1018,14 @@ class UsersControllerTest extends OriginalTest {
} }
public function testEditUserRegularUserSelfEditChangePassword() { public function testEditUserRegularUserSelfEditChangePassword() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->any()) ->expects($this->any())
->method('getUID') ->method('getUID')
->will($this->returnValue('UserToEdit')); ->will($this->returnValue('UserToEdit'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -1059,14 +1051,14 @@ class UsersControllerTest extends OriginalTest {
* @expectedExceptionCode 997 * @expectedExceptionCode 997
*/ */
public function testEditUserRegularUserSelfEditChangeQuota() { public function testEditUserRegularUserSelfEditChangeQuota() {
$loggedInUser = $this->getMockBuilder('OCP\IUser') $loggedInUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$loggedInUser $loggedInUser
->expects($this->any()) ->expects($this->any())
->method('getUID') ->method('getUID')
->will($this->returnValue('UserToEdit')); ->will($this->returnValue('UserToEdit'));
$targetUser = $this->getMockBuilder('OCP\IUser') $targetUser = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->userSession $this->userSession
@ -1747,7 +1739,7 @@ class UsersControllerTest extends OriginalTest {
->willReturn($targetGroup); ->willReturn($targetGroup);
$subAdminManager = $this->createMock(\OC\SubAdmin::class); $subAdminManager = $this->createMock(SubAdmin::class);
$subAdminManager->expects($this->once()) $subAdminManager->expects($this->once())
->method('isSubAdminOfGroup') ->method('isSubAdminOfGroup')
->with($loggedInUser, $targetGroup) ->with($loggedInUser, $targetGroup)
@ -1791,7 +1783,7 @@ class UsersControllerTest extends OriginalTest {
->willReturn($targetGroup); ->willReturn($targetGroup);
$subAdminManager = $this->createMock(\OC\SubAdmin::class); $subAdminManager = $this->createMock(SubAdmin::class);
$subAdminManager->expects($this->once()) $subAdminManager->expects($this->once())
->method('isSubAdminOfGroup') ->method('isSubAdminOfGroup')
->with($loggedInUser, $targetGroup) ->with($loggedInUser, $targetGroup)
@ -1835,7 +1827,7 @@ class UsersControllerTest extends OriginalTest {
->willReturn($targetGroup); ->willReturn($targetGroup);
$subAdminManager = $this->createMock(\OC\SubAdmin::class); $subAdminManager = $this->createMock(SubAdmin::class);
$subAdminManager->expects($this->never()) $subAdminManager->expects($this->never())
->method('isSubAdminOfGroup'); ->method('isSubAdminOfGroup');
@ -2581,8 +2573,7 @@ class UsersControllerTest extends OriginalTest {
} }
public function testGetCurrentUserLoggedIn() { public function testGetCurrentUserLoggedIn() {
$user = $this->createMock(IUser::class);
$user = $this->getMock(IUser::class);
$user->expects($this->once())->method('getUID')->willReturn('UID'); $user->expects($this->once())->method('getUID')->willReturn('UID');
$this->userSession->expects($this->once())->method('getUser') $this->userSession->expects($this->once())->method('getUser')