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

[provisioning_api] Move tests to OCP

This commit is contained in:
Roeland Jago Douma 2015-07-25 22:37:14 +02:00
parent a4822f9f9a
commit cea72c47f9
4 changed files with 202 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/provisioning_api/tests/appstest.php
View File

@ -29,6 +29,8 @@ class AppsTest extends TestCase {
public function setup() { public function setup() {
parent::setup(); parent::setup();
$this->appManager = \OC::$server->getAppManager(); $this->appManager = \OC::$server->getAppManager();
$this->groupManager = \OC::$server->getGroupManager();
$this->userSession = \OC::$server->getUserSession();
$this->api = new \OCA\Provisioning_API\Apps($this->appManager); $this->api = new \OCA\Provisioning_API\Apps($this->appManager);
} }
@ -51,8 +53,8 @@ class AppsTest extends TestCase {
public function testGetApps() { public function testGetApps() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$result = $this->api->getApps([]); $result = $this->api->getApps([]);

64
apps/provisioning_api/tests/groupstest.php
View File

@ -41,10 +41,10 @@ class GroupsTest extends TestCase {
public function testGetGroupAsUser() { public function testGetGroupAsUser() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
self::loginAsUser($users[0]); $this->userSession->setUser($users[0]);
$group = $this->groupManager->createGroup($this->getUniqueID()); $group = $this->groupManager->createGroup($this->getUniqueID());
$group->addUser($this->userManager->get($users[1])); $group->addUser($users[1]);
$result = $this->api->getGroup(array( $result = $this->api->getGroup(array(
'groupid' => $group->getGID(), 'groupid' => $group->getGID(),
@ -59,17 +59,17 @@ class GroupsTest extends TestCase {
public function testGetGroupAsSubadmin() { public function testGetGroupAsSubadmin() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
self::loginAsUser($users[0]); $this->userSession->setUser($users[0]);
$group = $this->groupManager->createGroup($this->getUniqueID()); $group = $this->groupManager->createGroup($this->getUniqueID());
$group->addUser($this->userManager->get($users[0])); $group->addUser($users[0]);
$group->addUser($this->userManager->get($users[1])); $group->addUser($users[1]);
\OC_SubAdmin::createSubAdmin($users[0], $group->getGID()); \OC_SubAdmin::createSubAdmin($users[0]->getUID(), $group->getGID());
$result = $this->api->getGroup(array( $result = $this->api->getGroup([
'groupid' => $group->getGID(), 'groupid' => $group->getGID(),
)); ]);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -78,6 +78,10 @@ class GroupsTest extends TestCase {
$resultData = $result->getData(); $resultData = $result->getData();
$resultData = $resultData['users']; $resultData = $resultData['users'];
$users = array_map(function($user) {
return $user->getUID();
}, $users);
sort($users); sort($users);
sort($resultData); sort($resultData);
$this->assertEquals($users, $resultData); $this->assertEquals($users, $resultData);
@ -87,18 +91,18 @@ class GroupsTest extends TestCase {
public function testGetGroupAsIrrelevantSubadmin() { public function testGetGroupAsIrrelevantSubadmin() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
self::loginAsUser($users[0]); $this->userSession->setUser($users[0]);
$group1 = $this->groupManager->createGroup($this->getUniqueID()); $group1 = $this->groupManager->createGroup($this->getUniqueID());
$group2 = $this->groupManager->createGroup($this->getUniqueID()); $group2 = $this->groupManager->createGroup($this->getUniqueID());
$group1->addUser($this->userManager->get($users[1])); $group1->addUser($users[1]);
$group2->addUser($this->userManager->get($users[0])); $group2->addUser($users[0]);
\OC_SubAdmin::createSubAdmin($users[0], $group2->getGID()); \OC_SubAdmin::createSubAdmin($users[0]->getUID(), $group2->getGID());
$result = $this->api->getGroup(array( $result = $this->api->getGroup([
'groupid' => $group1->getGID(), 'groupid' => $group1->getGID(),
)); ]);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -109,45 +113,45 @@ class GroupsTest extends TestCase {
public function testGetGroupAsAdmin() { public function testGetGroupAsAdmin() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
self::loginAsUser($users[0]); $this->userSession->setUser($users[0]);
$group = $this->groupManager->createGroup($this->getUniqueID()); $group = $this->groupManager->createGroup($this->getUniqueID());
$group->addUser($this->userManager->get($users[1])); $group->addUser($users[1]);
$this->groupManager->get('admin')->addUser($this->userManager->get($users[0])); $this->groupManager->get('admin')->addUser($users[0]);
$result = $this->api->getGroup(array( $result = $this->api->getGroup([
'groupid' => $group->getGID(), 'groupid' => $group->getGID(),
)); ]);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertEquals(array('users' => array($users[1])), $result->getData()); $this->assertEquals(['users' => [$users[1]->getUID()]], $result->getData());
} }
public function testGetSubAdminsOfGroup() { public function testGetSubAdminsOfGroup() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$group1 = $this->groupManager->createGroup($this->getUniqueID()); $group1 = $this->groupManager->createGroup($this->getUniqueID());
\OC_SubAdmin::createSubAdmin($user2, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user2->getUID(), $group1->getGID());
$result = $this->api->getSubAdminsOfGroup(array( $result = $this->api->getSubAdminsOfGroup([
'groupid' => $group1->getGID(), 'groupid' => $group1->getGID(),
)); ]);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$data = $result->getData(); $data = $result->getData();
$this->assertEquals($user2, reset($data)); $this->assertEquals($user2->getUID(), reset($data));
$group1->delete(); $group1->delete();
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$result = $this->api->getSubAdminsOfGroup(array( $result = $this->api->getSubAdminsOfGroup([
'groupid' => $this->getUniqueID(), 'groupid' => $this->getUniqueID(),
)); ]);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
$this->assertEquals(101, $result->getStatusCode()); $this->assertEquals(101, $result->getStatusCode());

13
apps/provisioning_api/tests/testcase.php
View File

@ -27,7 +27,10 @@ abstract class TestCase extends \Test\TestCase {
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
\OC_Group::createGroup('admin');
$this->userManager = \OC::$server->getUserManager();
$this->groupManager = \OC::$server->getGroupManager();
$this->groupManager->createGroup('admin');
} }
/** /**
@ -38,8 +41,7 @@ abstract class TestCase extends \Test\TestCase {
protected function generateUsers($num = 1) { protected function generateUsers($num = 1) {
$users = array(); $users = array();
for ($i = 0; $i < $num; $i++) { for ($i = 0; $i < $num; $i++) {
$user = $this->getUniqueID(); $user = $this->userManager->createUser($this->getUniqueID(), 'password');
\OC_User::createUser($user, 'password');
$this->users[] = $user; $this->users[] = $user;
$users[] = $user; $users[] = $user;
} }
@ -48,11 +50,10 @@ abstract class TestCase extends \Test\TestCase {
protected function tearDown() { protected function tearDown() {
foreach($this->users as $user) { foreach($this->users as $user) {
\OC_User::deleteUser($user); $user->delete();
} }
\OC_Group::deleteGroup('admin'); $this->groupManager->get('admin')->delete();
parent::tearDown(); parent::tearDown();
} }
} }

318
apps/provisioning_api/tests/userstest.php
View File

@ -57,12 +57,12 @@ class UsersTest extends TestCase {
$this->assertEquals(count($this->userManager->search('', null, null)), $count); $this->assertEquals(count($this->userManager->search('', null, null)), $count);
$user = $this->generateUsers(); $user = $this->generateUsers();
$_GET['search'] = $user; $_GET['search'] = $user->getUID();
$result = $this->api->getUsers(); $result = $this->api->getUsers();
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$data = $result->getData(); $data = $result->getData();
$this->assertEquals($user, reset($data['users'])); $this->assertEquals($user->getUID(), reset($data['users']));
// Add several users // Add several users
$this->generateUsers(10); $this->generateUsers(10);
@ -94,13 +94,13 @@ class UsersTest extends TestCase {
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertTrue($this->userManager->userExists($_POST['userid'])); $this->assertTrue($this->userManager->userExists($_POST['userid']));
$this->assertEquals($_POST['userid'], $this->userManager->checkPassword($_POST['userid'], $_POST['password'])->getUID()); $this->assertEquals($_POST['userid'], $this->userManager->checkPassword($_POST['userid'], $_POST['password'])->getUID());
$this->users[] = $_POST['userid']; $this->users[] = $this->userManager->get($_POST['userid']);
} }
public function testGetUserOnSelf() { public function testGetUserOnSelf() {
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$params['userid'] = $user; $params['userid'] = $user->getUID();
$result = $this->api->getUser($params); $result = $this->api->getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -109,8 +109,8 @@ class UsersTest extends TestCase {
public function testGetUserOnNonExistingUser() { public function testGetUserOnNonExistingUser() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$params = array(); $params = array();
$params['userid'] = $this->getUniqueID(); $params['userid'] = $this->getUniqueID();
while($this->userManager->userExists($params['userid'])) { while($this->userManager->userExists($params['userid'])) {
@ -126,32 +126,32 @@ class UsersTest extends TestCase {
public function testGetUserOnOtherUser() { public function testGetUserOnOtherUser() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
$params['userid'] = $users[0]; $params['userid'] = $users[0];
self::loginAsUser($users[1]); $this->userSession->setUser($users[1]);
$result = $this->api->getUser($params); $result = $this->api->getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
// Now as as admin // Now as as admin
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
$params['userid'] = $users[0]; $params['userid'] = $users[0]->getUID();
// login to generate home // login to generate home
self::loginAsUser($users[0]); $this->userSession->setUser($users[0]);
\OC_Group::addToGroup($users[1], 'admin'); $this->groupManager->get('admin')->addUser($users[1]);
self::loginAsUser($users[1]); $this->userSession->setUser($users[1]);
$result = $this->api->getUser($params); $result = $this->api->getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$data = $result->getData(); $data = $result->getData();
$this->assertEquals(\OC::$server->getConfig()->getUserValue($users[0], 'core', 'enabled', 'true'), $data['enabled']); $this->assertEquals(\OC::$server->getConfig()->getUserValue($users[0]->getUID(), 'core', 'enabled', 'true'), $data['enabled']);
} }
public function testEditOwnDisplayName() { public function testEditOwnDisplayName() {
// Test editing own name // Test editing own name
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $user, 'userid' => $user->getUID(),
'_put' => array( '_put' => array(
'key' => 'display', 'key' => 'display',
'value' => 'newname', 'value' => 'newname',
@ -160,39 +160,39 @@ class UsersTest extends TestCase {
); );
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertEquals('newname', $this->userManager->get($user)->getDisplayName()); $this->assertEquals('newname', $user->getDisplayName());
} }
public function testAdminEditDisplayNameOfUser() { public function testAdminEditDisplayNameOfUser() {
// Test admin editing users name // Test admin editing users name
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = $this->api->editUser( $result = $this->api->editUser(
array( [
'userid' => $user2, 'userid' => $user2->getUID(),
'_put' => array( '_put' => [
'key' => 'display', 'key' => 'display',
'value' => 'newname', 'value' => 'newname',
), ],
) ]
); );
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertEquals('newname', $this->userManager->get($user2)->getDisplayName()); $this->assertEquals('newname', $user2->getDisplayName());
} }
public function testUserEditOtherUserDisplayName() { public function testUserEditOtherUserDisplayName() {
// Test editing other users name // Test editing other users name
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_put' => array( '_put' => array(
'key' => 'display', 'key' => 'display',
'value' => 'newname', 'value' => 'newname',
@ -211,11 +211,11 @@ class UsersTest extends TestCase {
*/ */
public function testEditOwnQuota($expected, $quota) { public function testEditOwnQuota($expected, $quota) {
$user = $this->generateUsers(); $user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($this->userManager->get($user)); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$result = $this->api->editUser( $result = $this->api->editUser(
[ [
'userid' => $user, 'userid' => $user->getUID(),
'_put' => [ '_put' => [
'key' => 'quota', 'key' => 'quota',
'value' => $quota, 'value' => $quota,
@ -238,11 +238,11 @@ class UsersTest extends TestCase {
public function testAdminEditOwnQuota() { public function testAdminEditOwnQuota() {
$user = $this->generateUsers(); $user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($this->userManager->get($user)); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $user, 'userid' => $user->getUID(),
'_put' => array( '_put' => array(
'key' => 'quota', 'key' => 'quota',
'value' => '20G', 'value' => '20G',
@ -255,12 +255,12 @@ class UsersTest extends TestCase {
public function testAdminEditOtherUserQuota() { public function testAdminEditOtherUserQuota() {
$user = $this->generateUsers(); $user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($this->userManager->get($user)); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_put' => array( '_put' => array(
'key' => 'quota', 'key' => 'quota',
'value' => '20G', 'value' => '20G',
@ -273,11 +273,11 @@ class UsersTest extends TestCase {
public function testUserEditOtherUserQuota() { public function testUserEditOtherUserQuota() {
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_put' => array( '_put' => array(
'key' => 'quota', 'key' => 'quota',
'value' => '20G', 'value' => '20G',
@ -291,10 +291,10 @@ class UsersTest extends TestCase {
public function testUserEditOwnEmail() { public function testUserEditOwnEmail() {
$user = $this->generateUsers(); $user = $this->generateUsers();
$email = 'test@example.com'; $email = 'test@example.com';
self::loginAsUser($user); $this->userSession->setUser($user);
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $user, 'userid' => $user->getUID(),
'_put' => array( '_put' => array(
'key' => 'email', 'key' => 'email',
'value' => $email, 'value' => $email,
@ -303,16 +303,16 @@ class UsersTest extends TestCase {
); );
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertEquals($email, \OC::$server->getConfig()->getUserValue($user, 'settings', 'email', null)); $this->assertEquals($email, \OC::$server->getConfig()->getUserValue($user->getUID(), 'settings', 'email', null));
} }
public function testUserEditOtherUserEmailAsUser() { public function testUserEditOtherUserEmailAsUser() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
$email = 'test@example.com'; $email = 'test@example.com';
self::loginAsUser($users[0]); $this->userSession->setUser($users[0]);
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $users[1], 'userid' => $users[1]->getUID(),
'_put' => array( '_put' => array(
'key' => 'email', 'key' => 'email',
'value' => $email, 'value' => $email,
@ -326,11 +326,11 @@ class UsersTest extends TestCase {
public function testUserEditOtherUserEmailAsAdmin() { public function testUserEditOtherUserEmailAsAdmin() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
$email = 'test@example.com'; $email = 'test@example.com';
self::loginAsUser($users[0]); $this->userSession->setUser($users[0]);
$this->groupManager->get('admin')->addUser($this->userManager->get($users[0])); $this->groupManager->get('admin')->addUser($users[0]);
$result = $this->api->editUser( $result = $this->api->editUser(
array( array(
'userid' => $users[1], 'userid' => $users[1]->getUID(),
'_put' => array( '_put' => array(
'key' => 'email', 'key' => 'email',
'value' => $email, 'value' => $email,
@ -339,14 +339,14 @@ class UsersTest extends TestCase {
); );
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertEquals($email, \OC::$server->getConfig()->getUserValue($users[1], 'settings', 'email', null)); $this->assertEquals($email, \OC::$server->getConfig()->getUserValue($users[1]->getUID(), 'settings', 'email', null));
} }
public function testDeleteSelf() { public function testDeleteSelf() {
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$result = $this->api->deleteUser(array( $result = $this->api->deleteUser(array(
'userid' => $user, 'userid' => $user->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -354,10 +354,10 @@ class UsersTest extends TestCase {
public function testDeleteOtherAsUser() { public function testDeleteOtherAsUser() {
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = $this->api->deleteUser(array( $result = $this->api->deleteUser(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -365,34 +365,31 @@ class UsersTest extends TestCase {
public function testDeleteOtherAsSubAdmin() { public function testDeleteOtherAsSubAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group = $this->getUniqueID(); $group = $this->groupManager->createGroup($this->getUniqueID());
$this->groupManager->createGroup($group); $group->addUser($user);
$this->groupManager->get($group)->addUser($this->userManager->get($user)); $group->addUser($user2);
$this->groupManager->get($group)->addUser($this->userManager->get($user2)); \OC_SubAdmin::createSubAdmin($user->getUID(), $group->getGID());
\OC_SubAdmin::createSubAdmin($user, $group);
$result = $this->api->deleteUser(array( $result = $this->api->deleteUser(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->groupManager->get($group)->delete(); $group->delete();
} }
public function testDeleteOtherAsIrelevantSubAdmin() { public function testDeleteOtherAsIrelevantSubAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group = $this->getUniqueID(); $group = $this->groupManager->createGroup($this->getUniqueID());
$group2 = $this->getUniqueID(); $group2 = $this->groupManager->createGroup($this->getUniqueID());
$group = $this->groupManager->createGroup($group); $group->addUser($user);
$group2 = $this->groupManager->createGroup($group2); $group2->addUser($user2);
$group->addUser($this->userManager->get($user)); \OC_SubAdmin::createSubAdmin($user->getUID(), $group->getGID());
$group2->addUser($this->userManager->get($user2));
\OC_SubAdmin::createSubAdmin($user, $group->getGID());
$result = $this->api->deleteUser(array( $result = $this->api->deleteUser(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -402,11 +399,11 @@ class UsersTest extends TestCase {
public function testDeleteOtherAsAdmin() { public function testDeleteOtherAsAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($this->userManager->get($user)); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = $this->api->deleteUser(array( $result = $this->api->deleteUser(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -414,10 +411,10 @@ class UsersTest extends TestCase {
public function testDeleteSelfAsAdmin() { public function testDeleteSelfAsAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($this->userManager->get($user)); $this->groupManager->get('admin')->addUser($user);
self::loginAsUser($user); $this->userSession->setUser($user);
$result = $this->api->deleteUser(array( $result = $this->api->deleteUser(array(
'userid' => $user, 'userid' => $user->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -425,12 +422,12 @@ class UsersTest extends TestCase {
public function testGetUsersGroupsOnSelf() { public function testGetUsersGroupsOnSelf() {
$user = $this->generateUsers(); $user = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
$group = $this->groupManager->createGroup($group); $group = $this->groupManager->createGroup($group);
$group->addUser($this->userManager->get($user)); $group->addUser($user);
$result = $this->api->getUsersGroups(array( $result = $this->api->getUsersGroups(array(
'userid' => $user, 'userid' => $user->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -443,12 +440,12 @@ class UsersTest extends TestCase {
public function testGetUsersGroupOnOther() { public function testGetUsersGroupOnOther() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
$group = $this->groupManager->createGroup($group); $group = $this->groupManager->createGroup($group);
$group->addUser($this->userManager->get($user2)); $group->addUser($user2);
$result = $this->api->getUsersGroups(array( $result = $this->api->getUsersGroups(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -457,14 +454,14 @@ class UsersTest extends TestCase {
public function testGetUsersGroupOnOtherAsAdmin() { public function testGetUsersGroupOnOtherAsAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
$group = $this->groupManager->createGroup($group); $group = $this->groupManager->createGroup($group);
$group->addUser($this->userManager->get($user2)); $group->addUser($user2);
$result = $this->api->getUsersGroups(array( $result = $this->api->getUsersGroups(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -477,17 +474,17 @@ class UsersTest extends TestCase {
public function testGetUsersGroupsOnOtherAsSubAdmin() { public function testGetUsersGroupsOnOtherAsSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2); $group2 = $this->groupManager->createGroup($group2);
$group1->addUser($this->userManager->get($user2)); $group1->addUser($user2);
$group2->addUser($this->userManager->get($user2)); $group2->addUser($user2);
$group1->addUser($this->userManager->get($user1)); $group1->addUser($user1);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
$result = $this->api->getUsersGroups(array( $result = $this->api->getUsersGroups(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -501,16 +498,16 @@ class UsersTest extends TestCase {
public function testGetUsersGroupsOnOtherAsIrelevantSubAdmin() { public function testGetUsersGroupsOnOtherAsIrelevantSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2); $group2 = $this->groupManager->createGroup($group2);
$group2->addUser($this->userManager->get($user2)); $group2->addUser($user2);
$group1->addUser($this->userManager->get($user1)); $group1->addUser($user1);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
$result = $this->api->getUsersGroups(array( $result = $this->api->getUsersGroups(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -522,67 +519,67 @@ class UsersTest extends TestCase {
$user = $this->generateUsers(); $user = $this->generateUsers();
$group = $this->getUniqueID(); $group = $this->getUniqueID();
$group = $this->groupManager->createGroup($group); $group = $this->groupManager->createGroup($group);
self::loginAsUser($user); $this->userSession->setUser($user);
$_POST['groupid'] = $group->getGID(); $_POST['groupid'] = $group->getGID();
$result = $this->api->addToGroup(array( $result = $this->api->addToGroup(array(
'userid' => $user, 'userid' => $user->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
$this->assertFalse($group->inGroup($this->userManager->get($user))); $this->assertFalse($group->inGroup($user));
$group->delete(); $group->delete();
} }
public function testAddToGroupAsAdmin() { public function testAddToGroupAsAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($this->userManager->get($user)); $this->groupManager->get('admin')->addUser($user);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
$group = $this->groupManager->createGroup($group); $group = $this->groupManager->createGroup($group);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user); $this->userSession->setUser($user);
$_POST['groupid'] = $group->getGID(); $_POST['groupid'] = $group->getGID();
$result = $this->api->addToGroup(array( $result = $this->api->addToGroup(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertTrue($group->inGroup($this->userManager->get($user2))); $this->assertTrue($group->inGroup($user2));
$group->delete(); $group->delete();
} }
public function testAddToGroupAsSubAdmin() { public function testAddToGroupAsSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
$_POST['groupid'] = $group1->getGID(); $_POST['groupid'] = $group1->getGID();
$result = $this->api->addToGroup(array( $result = $this->api->addToGroup(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
$this->assertFalse($group1->inGroup($this->userManager->get($user2))); $this->assertFalse($group1->inGroup($user2));
$group1->delete(); $group1->delete();
} }
public function testAddToGroupAsIrelevantSubAdmin() { public function testAddToGroupAsIrelevantSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2); $group2 = $this->groupManager->createGroup($group2);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
$_POST['groupid'] = $group2->getGID(); $_POST['groupid'] = $group2->getGID();
$result = $this->api->addToGroup(array( $result = $this->api->addToGroup(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
$this->assertFalse($group2->inGroup($this->userManager->get($user2))); $this->assertFalse($group2->inGroup($user2));
$group1->delete(); $group1->delete();
$group2->delete(); $group2->delete();
} }
@ -590,83 +587,83 @@ class UsersTest extends TestCase {
// test delete /cloud/users/{userid}/groups // test delete /cloud/users/{userid}/groups
public function testRemoveFromGroupAsSelf() { public function testRemoveFromGroupAsSelf() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$group1->addUser($this->userManager->get($user1)); $group1->addUser($user1);
$result = $this->api->removeFromGroup(array( $result = $this->api->removeFromGroup(array(
'userid' => $user1, 'userid' => $user1->getUID(),
'_delete' => array( '_delete' => array(
'groupid' => $group1->getGID(), 'groupid' => $group1->getGID(),
), ),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
$this->assertTrue($group1->inGroup($this->userManager->get($user1))); $this->assertTrue($group1->inGroup($user1));
$group1->delete(); $group1->delete();
} }
public function testRemoveFromGroupAsAdmin() { public function testRemoveFromGroupAsAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$group1->addUser($this->userManager->get($user2)); $group1->addUser($user2);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$result = $this->api->removeFromGroup(array( $result = $this->api->removeFromGroup(array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_delete' => array( '_delete' => array(
'groupid' => $group1->getGID(), 'groupid' => $group1->getGID(),
), ),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertFalse($group1->inGroup($this->userManager->get($user2))); $this->assertFalse($group1->inGroup($user2));
$group1->delete(); $group1->delete();
} }
public function testRemoveFromGroupAsSubAdmin() { public function testRemoveFromGroupAsSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$group1->addUser($this->userManager->get($user1)); $group1->addUser($user1);
$group1->addUser($this->userManager->get($user2)); $group1->addUser($user2);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
$result = $this->api->removeFromGroup(array( $result = $this->api->removeFromGroup(array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_delete' => array( '_delete' => array(
'groupid' => $group1->getGID(), 'groupid' => $group1->getGID(),
), ),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertFalse($group1->inGroup($this->userManager->get($user2))); $this->assertFalse($group1->inGroup($user2));
$group1->delete(); $group1->delete();
} }
public function testRemoveFromGroupAsIrelevantSubAdmin() { public function testRemoveFromGroupAsIrelevantSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2); $group2 = $this->groupManager->createGroup($group2);
$group1->addUser($this->userManager->get($user1)); $group1->addUser($user1);
$group2->addUser($this->userManager->get($user2)); $group2->addUser($user2);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
$result = $this->api->removeFromGroup(array( $result = $this->api->removeFromGroup(array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_delete' => array( '_delete' => array(
'groupid' => $group2->getGID(), 'groupid' => $group2->getGID(),
), ),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
$this->assertTrue($group2->inGroup($this->userManager->get($user2))); $this->assertTrue($group2->inGroup($user2));
$group1->delete(); $group1->delete();
$group2->delete(); $group2->delete();
} }
@ -674,28 +671,28 @@ class UsersTest extends TestCase {
public function testCreateSubAdmin() { public function testCreateSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$_POST['groupid'] = $group1->getGID(); $_POST['groupid'] = $group1->getGID();
$result = $this->api->addSubAdmin(array( $result = $this->api->addSubAdmin(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertTrue(\OC_SubAdmin::isSubAdminofGroup($user2, $group1->getGID())); $this->assertTrue(\OC_SubAdmin::isSubAdminofGroup($user2->getUID(), $group1->getGID()));
$group1->delete(); $group1->delete();
$this->resetParams(); $this->resetParams();
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$_POST['groupid'] = 'admin'; $_POST['groupid'] = 'admin';
$result = $this->api->addSubAdmin(array( $result = $this->api->addSubAdmin(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertEquals(103, $result->getStatusCode()); $this->assertEquals(103, $result->getStatusCode());
@ -704,8 +701,8 @@ class UsersTest extends TestCase {
$this->resetParams(); $this->resetParams();
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$_POST['groupid'] = $group1->getGID(); $_POST['groupid'] = $group1->getGID();
@ -721,25 +718,25 @@ class UsersTest extends TestCase {
public function testRemoveSubAdmin() { public function testRemoveSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
\OC_Group::addToGroup($user1, 'admin'); $this->groupManager->get('admin')->addUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
\OC_SubAdmin::createSubAdmin($user2, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user2->getUID(), $group1->getGID());
$result = $this->api->removeSubAdmin(array( $result = $this->api->removeSubAdmin(array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_delete' => array( '_delete' => array(
'groupid' => $group1->getGID(), 'groupid' => $group1->getGID(),
), ),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
$this->assertTrue(!\OC_SubAdmin::isSubAdminofGroup($user2, $group1->getGID())); $this->assertTrue(!\OC_SubAdmin::isSubAdminofGroup($user2->getUID(), $group1->getGID()));
$group1->delete(); $group1->delete();
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$result = $this->api->removeSubAdmin(array( $result = $this->api->removeSubAdmin(array(
'userid' => $this->getUniqueID(), 'userid' => $this->getUniqueID(),
'_delete' => array( '_delete' => array(
@ -754,13 +751,13 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
$_POST['groupid'] = $group1->getGID(); $_POST['groupid'] = $group1->getGID();
$result = $this->api->removeSubAdmin(array( $result = $this->api->removeSubAdmin(array(
'userid' => $user2, 'userid' => $user2->getUID(),
'_delete' => array( '_delete' => array(
'groupid' => $group1->getGID(), 'groupid' => $group1->getGID(),
), ),
@ -774,13 +771,13 @@ class UsersTest extends TestCase {
public function testGetSubAdminGroups() { public function testGetSubAdminGroups() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group1 = $this->groupManager->createGroup($group1); $group1 = $this->groupManager->createGroup($group1);
\OC_SubAdmin::createSubAdmin($user2, $group1->getGID()); \OC_SubAdmin::createSubAdmin($user2->getUID(), $group1->getGID());
$result = $this->api->getUserSubAdminGroups(array( $result = $this->api->getUserSubAdminGroups(array(
'userid' => $user2, 'userid' => $user2->getUID(),
)); ));
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -789,8 +786,8 @@ class UsersTest extends TestCase {
$group1->delete(); $group1->delete();
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$result = $this->api->getUserSubAdminGroups(array( $result = $this->api->getUserSubAdminGroups(array(
'userid' => $this->getUniqueID(), 'userid' => $this->getUniqueID(),
)); ));
@ -802,15 +799,14 @@ class UsersTest extends TestCase {
public function testSubAdminOfGroupAlreadySubAdmin() { public function testSubAdminOfGroupAlreadySubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
self::loginAsUser($user1); $this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($this->userManager->get($user1)); $this->groupManager->get('admin')->addUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->groupManager->createGroup($this->getUniqueID());
$group1 = $this->groupManager->createGroup($group1);
//Make user2 subadmin of group1 //Make user2 subadmin of group1
$_POST['groupid'] = $group1->getGID(); $_POST['groupid'] = $group1->getGID();
$result = $this->api->addSubAdmin([ $result = $this->api->addSubAdmin([
'userid' => $user2, 'userid' => $user2->getUID(),
]); ]);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -818,7 +814,7 @@ class UsersTest extends TestCase {
//Make user2 subadmin of group1 again //Make user2 subadmin of group1 again
$_POST['groupid'] = $group1->getGID(); $_POST['groupid'] = $group1->getGID();
$result = $this->api->addSubAdmin([ $result = $this->api->addSubAdmin([
'userid' => $user2, 'userid' => $user2->getUID(),
]); ]);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());