diff options
Diffstat (limited to 'apps/provisioning_api/tests')
| -rw-r--r-- | apps/provisioning_api/tests/Controller/GroupsControllerTest.php | 85 | ||||
| -rw-r--r-- | apps/provisioning_api/tests/Controller/UsersControllerTest.php | 10 |
2 files changed, 54 insertions, 41 deletions
diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php index 352264c7afb..44b440a40b2 100644 --- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php +++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php @@ -26,54 +26,67 @@ namespace OCA\Provisioning_API\Tests\Controller; +use OC\Accounts\AccountManager; +use OC\Group\Manager; +use OC\SubAdmin; use OCA\Provisioning_API\Controller\GroupsController; -use OCP\IGroupManager; +use OCP\IConfig; use OCP\ILogger; use OCP\IRequest; use OCP\IUser; +use OCP\IUserManager; use OCP\IUserSession; class GroupsControllerTest extends \Test\TestCase { - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + + /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ + protected $request; + /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject */ + protected $userManager; + /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ + protected $config; + /** @var Manager|PHPUnit_Framework_MockObject_MockObject */ protected $groupManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */ protected $userSession; - /** @var \OC\SubAdmin|\PHPUnit_Framework_MockObject_MockObject */ - protected $subAdminManager; + /** @var AccountManager|PHPUnit_Framework_MockObject_MockObject */ + protected $accountManager; + /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */ + protected $logger; - /** @var GroupsController */ + /** @var GroupsController|PHPUnit_Framework_MockObject_MockObject */ protected $api; protected function setUp() { parent::setUp(); - $this->subAdminManager = $this->getMockBuilder('OC\SubAdmin') - ->disableOriginalConstructor() - ->getMock(); + $this->request = $this->createMock(IRequest::class); + $this->userManager = $this->createMock(IUserManager::class); + $this->config = $this->createMock(IConfig::class); + $this->groupManager = $this->createMock(Manager::class); + $this->userSession = $this->createMock(IUserSession::class); + $this->accountManager = $this->createMock(AccountManager::class); + $this->logger = $this->createMock(ILogger::class); + + $this->subAdminManager = $this->createMock(SubAdmin::class); - $this->groupManager = $this->getMockBuilder('OC\Group\Manager') - ->disableOriginalConstructor() - ->getMock(); $this->groupManager - ->method('getSubAdmin') - ->willReturn($this->subAdminManager); - - $this->userSession = $this->getMockBuilder(IUserSession::class) - ->disableOriginalConstructor() + ->method('getSubAdmin') + ->willReturn($this->subAdminManager); + + $this->api = $this->getMockBuilder(GroupsController::class) + ->setConstructorArgs([ + 'provisioning_api', + $this->request, + $this->userManager, + $this->config, + $this->groupManager, + $this->userSession, + $this->accountManager, + $this->logger + ]) + ->setMethods(['fillStorageInfo']) ->getMock(); - $request = $this->getMockBuilder(IRequest::class) - ->disableOriginalConstructor() - ->getMock(); - - $logger = $this->createMock(ILogger::class); - - $this->api = new GroupsController( - 'provisioning_api', - $request, - $this->groupManager, - $this->userSession, - $logger - ); } /** @@ -141,10 +154,10 @@ class GroupsControllerTest extends \Test\TestCase { public function dataGetGroups() { return [ - [null, null, null], - ['foo', null, null], - [null, 1, null], - [null, null, 2], + [null, 0, 0], + ['foo', 0, 0], + [null, 1, 0], + [null, 0, 2], ['foo', 1, 2], ]; } @@ -224,7 +237,7 @@ class GroupsControllerTest extends \Test\TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 + * @expectedExceptionCode 403 */ public function testGetGroupAsIrrelevantSubadmin() { $group = $this->createGroup('group'); @@ -269,7 +282,7 @@ class GroupsControllerTest extends \Test\TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 998 + * @expectedExceptionCode 404 * @expectedExceptionMessage The requested group could not be found */ public function testGetGroupNonExisting() { diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index 3f2cf3b1105..3d6ab8f3ebf 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -640,8 +640,8 @@ class UsersControllerTest extends TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 998 - * @expectedExceptionMessage The requested user could not be found + * @expectedExceptionCode 404 + * @expectedExceptionMessage User does not exist */ public function testGetUserTargetDoesNotExist() { $loggedInUser = $this->getMockBuilder(IUser::class) @@ -2394,7 +2394,7 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) - ->method('isSubAdminofGroup') + ->method('isSubAdminOfGroup') ->with($loggedInUser, $targetGroup) ->will($this->returnValue(true)); $this->groupManager @@ -2445,7 +2445,7 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) - ->method('isSubAdminofGroup') + ->method('isSubAdminOfGroup') ->with($loggedInUser, $targetGroup) ->will($this->returnValue(true)); $this->groupManager @@ -2818,7 +2818,7 @@ class UsersControllerTest extends TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 + * @expectedExceptionCode 404 * @expectedExceptionMessage User does not exist */ public function testGetUserSubAdminGroupsNotExistingTargetUser() { |