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

Fix provisioning API unit tests for login 

Properly login the user every time to make sure their FS is properly
setup.
This commit is contained in:
Vincent Petry 2015-05-18 12:28:54 +02:00
parent 724f88d9ff
commit 5899b7b6ea
3 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ class AppsTest extends TestCase {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$result = \OCA\provisioning_API\Apps::getApps(array()); $result = \OCA\provisioning_API\Apps::getApps(array());

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

@ -27,7 +27,7 @@ class GroupsTest extends TestCase {
public function testGetGroupAsUser() { public function testGetGroupAsUser() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
\OC_User::setUserId($users[0]); self::loginAsUser($users[0]);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
@ -46,7 +46,7 @@ class GroupsTest extends TestCase {
public function testGetGroupAsSubadmin() { public function testGetGroupAsSubadmin() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
\OC_User::setUserId($users[0]); self::loginAsUser($users[0]);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
@ -75,7 +75,7 @@ class GroupsTest extends TestCase {
public function testGetGroupAsIrrelevantSubadmin() { public function testGetGroupAsIrrelevantSubadmin() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
\OC_User::setUserId($users[0]); self::loginAsUser($users[0]);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
@ -99,7 +99,7 @@ class GroupsTest extends TestCase {
public function testGetGroupAsAdmin() { public function testGetGroupAsAdmin() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
\OC_User::setUserId($users[0]); self::loginAsUser($users[0]);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
@ -120,7 +120,7 @@ class GroupsTest extends TestCase {
public function testGetSubAdminsOfGroup() { public function testGetSubAdminsOfGroup() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -135,7 +135,7 @@ class GroupsTest extends TestCase {
\OC_Group::deleteGroup($group1); \OC_Group::deleteGroup($group1);
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$result = \OCA\provisioning_api\Groups::getSubAdminsOfGroup(array( $result = \OCA\provisioning_api\Groups::getSubAdminsOfGroup(array(
'groupid' => $this->getUniqueID(), 'groupid' => $this->getUniqueID(),

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

@ -81,7 +81,7 @@ class UsersTest extends TestCase {
public function testGetUserOnSelf() { public function testGetUserOnSelf() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$params['userid'] = $user; $params['userid'] = $user;
$result = \OCA\provisioning_API\Users::getUser($params); $result = \OCA\provisioning_API\Users::getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
@ -92,7 +92,7 @@ class UsersTest extends TestCase {
public function testGetUserOnNonExistingUser() { public function testGetUserOnNonExistingUser() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$params = array(); $params = array();
$params['userid'] = $this->getUniqueID(); $params['userid'] = $this->getUniqueID();
while(\OC_User::userExists($params['userid'])) { while(\OC_User::userExists($params['userid'])) {
@ -108,7 +108,7 @@ 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];
\OC_User::setUserId($users[1]); self::loginAsUser($users[1]);
$result = \OCA\provisioning_API\Users::getUser($params); $result = \OCA\provisioning_API\Users::getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
@ -116,8 +116,10 @@ class UsersTest extends TestCase {
// Now as as admin // Now as as admin
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
$params['userid'] = $users[0]; $params['userid'] = $users[0];
// login to generate home
self::loginAsUser($users[0]);
\OC_Group::addToGroup($users[1], 'admin'); \OC_Group::addToGroup($users[1], 'admin');
\OC_User::setUserId($users[1]); self::loginAsUser($users[1]);
$result = \OCA\provisioning_API\Users::getUser($params); $result = \OCA\provisioning_API\Users::getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result); $this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded());
@ -129,7 +131,7 @@ class UsersTest extends TestCase {
// Test editing own name // Test editing own name
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
'userid' => $user, 'userid' => $user,
@ -150,7 +152,7 @@ class UsersTest extends TestCase {
// Test admin editing users name // Test admin editing users name
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
@ -171,7 +173,7 @@ class UsersTest extends TestCase {
// Test editing other users name // Test editing other users name
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
@ -195,7 +197,7 @@ class UsersTest extends TestCase {
public function testEditOwnQuota($expected, $quota) { public function testEditOwnQuota($expected, $quota) {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
[ [
'userid' => $user, 'userid' => $user,
@ -222,7 +224,7 @@ class UsersTest extends TestCase {
public function testAdminEditOwnQuota() { public function testAdminEditOwnQuota() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
'userid' => $user, 'userid' => $user,
@ -239,7 +241,7 @@ class UsersTest extends TestCase {
public function testAdminEditOtherUserQuota() { public function testAdminEditOtherUserQuota() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
@ -256,7 +258,7 @@ class UsersTest extends TestCase {
public function testUserEditOtherUserQuota() { public function testUserEditOtherUserQuota() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
@ -274,7 +276,7 @@ class UsersTest extends TestCase {
public function testUserEditOwnEmail() { public function testUserEditOwnEmail() {
$user = $this->generateUsers(); $user = $this->generateUsers();
$email = 'test@example.com'; $email = 'test@example.com';
\OC_User::setUserId($user); self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
'userid' => $user, 'userid' => $user,
@ -292,7 +294,7 @@ class UsersTest extends TestCase {
public function testUserEditOtherUserEmailAsUser() { public function testUserEditOtherUserEmailAsUser() {
$users = $this->generateUsers(2); $users = $this->generateUsers(2);
$email = 'test@example.com'; $email = 'test@example.com';
\OC_User::setUserId($users[0]); self::loginAsUser($users[0]);
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
'userid' => $users[1], 'userid' => $users[1],
@ -309,7 +311,7 @@ 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';
\OC_User::setUserId($users[0]); self::loginAsUser($users[0]);
\OC_Group::addToGroup($users[0], 'admin'); \OC_Group::addToGroup($users[0], 'admin');
$result = \OCA\provisioning_API\Users::editUser( $result = \OCA\provisioning_API\Users::editUser(
array( array(
@ -327,7 +329,7 @@ class UsersTest extends TestCase {
public function testDeleteSelf() { public function testDeleteSelf() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::deleteUser(array( $result = \OCA\provisioning_API\Users::deleteUser(array(
'userid' => $user, 'userid' => $user,
)); ));
@ -337,7 +339,7 @@ class UsersTest extends TestCase {
public function testDeleteOtherAsUser() { public function testDeleteOtherAsUser() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::deleteUser(array( $result = \OCA\provisioning_API\Users::deleteUser(array(
'userid' => $user2, 'userid' => $user2,
@ -348,7 +350,7 @@ class UsersTest extends TestCase {
public function testDeleteOtherAsSubAdmin() { public function testDeleteOtherAsSubAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
@ -365,7 +367,7 @@ class UsersTest extends TestCase {
public function testDeleteOtherAsIrelevantSubAdmin() { public function testDeleteOtherAsIrelevantSubAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group = $this->getUniqueID(); $group = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
@ -386,7 +388,7 @@ class UsersTest extends TestCase {
public function testDeleteOtherAsAdmin() { public function testDeleteOtherAsAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::deleteUser(array( $result = \OCA\provisioning_API\Users::deleteUser(array(
'userid' => $user2, 'userid' => $user2,
@ -398,7 +400,7 @@ class UsersTest extends TestCase {
public function testDeleteSelfAsAdmin() { public function testDeleteSelfAsAdmin() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin'); \OC_Group::addToGroup($user, 'admin');
\OC_User::setUserId($user); self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::deleteUser(array( $result = \OCA\provisioning_API\Users::deleteUser(array(
'userid' => $user, 'userid' => $user,
)); ));
@ -408,7 +410,7 @@ class UsersTest extends TestCase {
public function testGetUsersGroupsOnSelf() { public function testGetUsersGroupsOnSelf() {
$user = $this->generateUsers(); $user = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
\OC_Group::addToGroup($user, $group); \OC_Group::addToGroup($user, $group);
@ -426,7 +428,7 @@ class UsersTest extends TestCase {
public function testGetUsersGroupOnOther() { public function testGetUsersGroupOnOther() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
\OC_Group::addToGroup($user2, $group); \OC_Group::addToGroup($user2, $group);
@ -442,7 +444,7 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
\OC_Group::addToGroup($user2, $group); \OC_Group::addToGroup($user2, $group);
@ -460,7 +462,7 @@ class UsersTest extends TestCase {
public function testGetUsersGroupsOnOtherAsSubAdmin() { public function testGetUsersGroupsOnOtherAsSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -484,7 +486,7 @@ class UsersTest extends TestCase {
public function testGetUsersGroupsOnOtherAsIrelevantSubAdmin() { public function testGetUsersGroupsOnOtherAsIrelevantSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -505,7 +507,7 @@ class UsersTest extends TestCase {
$user = $this->generateUsers(); $user = $this->generateUsers();
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
\OC_User::setUserId($user); self::loginAsUser($user);
$_POST['groupid'] = $group; $_POST['groupid'] = $group;
$result = \OCA\provisioning_API\Users::addToGroup(array( $result = \OCA\provisioning_API\Users::addToGroup(array(
'userid' => $user, 'userid' => $user,
@ -522,7 +524,7 @@ class UsersTest extends TestCase {
$group = $this->getUniqueID(); $group = $this->getUniqueID();
\OC_Group::createGroup($group); \OC_Group::createGroup($group);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user); self::loginAsUser($user);
$_POST['groupid'] = $group; $_POST['groupid'] = $group;
$result = \OCA\provisioning_API\Users::addToGroup(array( $result = \OCA\provisioning_API\Users::addToGroup(array(
'userid' => $user2, 'userid' => $user2,
@ -536,7 +538,7 @@ class UsersTest extends TestCase {
public function testAddToGroupAsSubAdmin() { public function testAddToGroupAsSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
\OC_SubAdmin::createSubAdmin($user1, $group1); \OC_SubAdmin::createSubAdmin($user1, $group1);
@ -553,7 +555,7 @@ class UsersTest extends TestCase {
public function testAddToGroupAsIrelevantSubAdmin() { public function testAddToGroupAsIrelevantSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -573,7 +575,7 @@ 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();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
\OC_Group::addToGroup($user1, $group1); \OC_Group::addToGroup($user1, $group1);
@ -592,7 +594,7 @@ class UsersTest extends TestCase {
public function testRemoveFromGroupAsAdmin() { public function testRemoveFromGroupAsAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
\OC_Group::addToGroup($user2, $group1); \OC_Group::addToGroup($user2, $group1);
@ -611,7 +613,7 @@ class UsersTest extends TestCase {
public function testRemoveFromGroupAsSubAdmin() { public function testRemoveFromGroupAsSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -632,7 +634,7 @@ class UsersTest extends TestCase {
public function testRemoveFromGroupAsIrelevantSubAdmin() { public function testRemoveFromGroupAsIrelevantSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
@ -657,7 +659,7 @@ class UsersTest extends TestCase {
public function testCreateSubAdmin() { public function testCreateSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -674,7 +676,7 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$_POST['groupid'] = 'admin'; $_POST['groupid'] = 'admin';
$result = \OCA\provisioning_api\Users::addSubAdmin(array( $result = \OCA\provisioning_api\Users::addSubAdmin(array(
@ -687,7 +689,7 @@ class UsersTest extends TestCase {
$this->resetParams(); $this->resetParams();
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -704,7 +706,7 @@ class UsersTest extends TestCase {
public function testRemoveSubAdmin() { public function testRemoveSubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -721,7 +723,7 @@ class UsersTest extends TestCase {
\OC_Group::deleteGroup($group1); \OC_Group::deleteGroup($group1);
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$result = \OCA\provisioning_api\Users::removeSubAdmin(array( $result = \OCA\provisioning_api\Users::removeSubAdmin(array(
'userid' => $this->getUniqueID(), 'userid' => $this->getUniqueID(),
@ -737,7 +739,7 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -757,7 +759,7 @@ class UsersTest extends TestCase {
public function testGetSubAdminGroups() { public function testGetSubAdminGroups() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);
@ -772,7 +774,7 @@ class UsersTest extends TestCase {
\OC_Group::deleteGroup($group1); \OC_Group::deleteGroup($group1);
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$result = \OCA\provisioning_api\Users::getUserSubAdminGroups(array( $result = \OCA\provisioning_api\Users::getUserSubAdminGroups(array(
@ -786,7 +788,7 @@ class UsersTest extends TestCase {
public function testSubAdminOfGroupAlreadySubAdmin() { public function testSubAdminOfGroupAlreadySubAdmin() {
$user1 = $this->generateUsers(); $user1 = $this->generateUsers();
$user2 = $this->generateUsers(); $user2 = $this->generateUsers();
\OC_User::setUserId($user1); self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin'); \OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
\OC_Group::createGroup($group1); \OC_Group::createGroup($group1);