summaryrefslogtreecommitdiffstats
path: root/apps/provisioning_api/tests/groupstest.php
diff options
context:
space:
mode:
authormbi <knox@users.noreply.github.com>2015-12-08 21:02:52 +0100
committermbi <knox@users.noreply.github.com>2015-12-08 21:02:52 +0100
commit508c46a112d3d53b4b0668efcbe1403eb2e143b8 (patch)
tree29ef86459abae1dcaadf75203851ab9b39ec43bd /apps/provisioning_api/tests/groupstest.php
parent27f420e0a797f8a56b5e83e8dd8e19df289c766b (diff)
parent13993c4a6db83c0a637fc7c20da0470acae47208 (diff)
downloadnextcloud-server-508c46a112d3d53b4b0668efcbe1403eb2e143b8.tar.gz
nextcloud-server-508c46a112d3d53b4b0668efcbe1403eb2e143b8.zip
Merge branch 'master' into master
Diffstat (limited to 'apps/provisioning_api/tests/groupstest.php')
-rw-r--r--apps/provisioning_api/tests/groupstest.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php
index d37f4412e20..f4f3b194944 100644
--- a/apps/provisioning_api/tests/groupstest.php
+++ b/apps/provisioning_api/tests/groupstest.php
@@ -30,13 +30,13 @@ use OCP\IUserSession;
use OCP\IRequest;
class GroupsTest extends \Test\TestCase {
- /** @var IGroupManager */
+ /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
protected $groupManager;
- /** @var IUserSession */
+ /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
protected $userSession;
- /** @var IRequest */
+ /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
protected $request;
- /** @var \OC\SubAdmin */
+ /** @var \OC\SubAdmin|\PHPUnit_Framework_MockObject_MockObject */
protected $subAdminManager;
/** @var \OCA\Provisioning_API\Groups */
protected $api;
@@ -58,6 +58,10 @@ class GroupsTest extends \Test\TestCase {
);
}
+ /**
+ * @param string $gid
+ * @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject
+ */
private function createGroup($gid) {
$group = $this->getMock('OCP\IGroup');
$group
@@ -66,6 +70,10 @@ class GroupsTest extends \Test\TestCase {
return $group;
}
+ /**
+ * @param string $uid
+ * @return \OCP\IUser|\PHPUnit_Framework_MockObject_MockObject
+ */
private function createUser($uid) {
$user = $this->getMock('OCP\IUser');
$user