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

change logic in displayNamesInGroup and add some unit tests

This commit is contained in:
voxsim 2014-08-28 13:51:48 +02:00
parent 5d30ed9ad1
commit a49610e18a
2 changed files with 296 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/private/group/manager.php
View File

@ -208,23 +208,30 @@ class Manager extends PublicEmitter {
if(is_null($group)) {
return array();
}
// only user backends have the capability to do a complex search for users
$groupUsers = $group->searchUsers('');
$search = trim($search);
$groupUsers = array();
if(!empty($search)) {
//TODO: for OC 7 earliest: user backend should get a method to check selected users against a pattern
// only user backends have the capability to do a complex search for users
$filteredUsers = $this->userManager->search($search);
$testUsers = true;
foreach($filteredUsers as $filteredUser) {
if($group->inGroup($filteredUser)) {
$groupUsers []= $filteredUser;
}
}
if($limit === -1) {
$groupUsers = array_slice($groupUsers, $offset);
} else {
$groupUsers = array_slice($groupUsers, $offset, $limit);
}
} else {
$filteredUsers = array();
$testUsers = false;
$groupUsers = $group->searchUsers('', $limit, $offset);
}
$matchingUsers = array();
foreach($groupUsers as $user) {
if(!$testUsers || isset($filteredUsers[$user->getUID()])) {
$matchingUsers[$user->getUID()] = $user->getDisplayName();
}
foreach($groupUsers as $groupUser) {
$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
}
return $matchingUsers;
}

292
tests/lib/group/manager.php
View File

@ -346,14 +346,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
$this->assertEquals('group2', $group2->getGID());
}
public function testDisplayNamesInGroupMultipleUserBackends() {
$userBackend = $this->getMock('\OC_User_Backend');
$user1 = new User('user1', $userBackend);
$user2 = new User('user2', $userBackend);
$user3 = new User('user3', $userBackend);
$user4 = new User('user33', $userBackend);
public function testDisplayNamesInGroupWithOneUserBackend() {
/**
* @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
*/
@ -363,20 +356,30 @@ class Manager extends \PHPUnit_Framework_TestCase {
->with('testgroup')
->will($this->returnValue(true));
$backend->expects($this->once())
->method('usersInGroup')
->with('testgroup', '', -1, 0)
->will($this->returnValue(array('user2', 'user33')));
$backend->expects($this->any())
->method('InGroup')
->will($this->returnCallback(function($uid, $gid) {
switch($uid) {
case 'user1' : return false;
case 'user2' : return true;
case 'user3' : return false;
case 'user33': return true;
default:
return null;
}
}));
/**
* @var \OC\User\Manager $userManager
*/
$userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$userManager->expects($this->once())
->method('search')
->with('user3')
->will($this->returnValue(array('user3' => $user3, 'user33' => $user4)));
->will($this->returnValue(array('user3' => new User('user3', $userBackend),
'user33' => new User('user33', $userBackend))));
$userManager->expects($this->any())
->method('get')
@ -396,6 +399,269 @@ class Manager extends \PHPUnit_Framework_TestCase {
$users = $manager->displayNamesInGroup('testgroup', 'user3');
$this->assertEquals(1, count($users));
$this->assertFalse(isset($users['user1']));
$this->assertFalse(isset($users['user2']));
$this->assertFalse(isset($users['user3']));
$this->assertTrue(isset($users['user33']));
}
public function testDisplayNamesInGroupWithOneUserBackendWithLimitSpecified() {
/**
* @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
*/
$backend = $this->getMock('\OC_Group_Database');
$backend->expects($this->exactly(1))
->method('groupExists')
->with('testgroup')
->will($this->returnValue(true));
$backend->expects($this->any())
->method('InGroup')
->will($this->returnCallback(function($uid, $gid) {
switch($uid) {
case 'user1' : return false;
case 'user2' : return true;
case 'user3' : return false;
case 'user33': return true;
case 'user333': return true;
default:
return null;
}
}));
/**
* @var \OC\User\Manager $userManager
*/
$userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$userManager->expects($this->once())
->method('search')
->with('user3')
->will($this->returnValue(array('user3' => new User('user3', $userBackend),
'user33' => new User('user33', $userBackend),
'user333' => new User('user333', $userBackend))));
$userManager->expects($this->any())
->method('get')
->will($this->returnCallback(function($uid) use ($userBackend) {
switch($uid) {
case 'user1' : return new User('user1', $userBackend);
case 'user2' : return new User('user2', $userBackend);
case 'user3' : return new User('user3', $userBackend);
case 'user33': return new User('user33', $userBackend);
case 'user333': return new User('user333', $userBackend);
default:
return null;
}
}));
$manager = new \OC\Group\Manager($userManager);
$manager->addBackend($backend);
$users = $manager->displayNamesInGroup('testgroup', 'user3', 1);
$this->assertEquals(1, count($users));
$this->assertFalse(isset($users['user1']));
$this->assertFalse(isset($users['user2']));
$this->assertFalse(isset($users['user3']));
$this->assertTrue(isset($users['user33']));
$this->assertFalse(isset($users['user333']));
}
public function testDisplayNamesInGroupWithOneUserBackendWithLimitAndOffsetSpecified() {
/**
* @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
*/
$backend = $this->getMock('\OC_Group_Database');
$backend->expects($this->exactly(1))
->method('groupExists')
->with('testgroup')
->will($this->returnValue(true));
$backend->expects($this->any())
->method('InGroup')
->will($this->returnCallback(function($uid, $gid) {
switch($uid) {
case 'user1' : return false;
case 'user2' : return true;
case 'user3' : return false;
case 'user33': return true;
case 'user333': return true;
default:
return null;
}
}));
/**
* @var \OC\User\Manager $userManager
*/
$userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$userManager->expects($this->once())
->method('search')
->with('user3')
->will($this->returnValue(array('user3' => new User('user3', $userBackend),
'user33' => new User('user33', $userBackend),
'user333' => new User('user333', $userBackend))));
$userManager->expects($this->any())
->method('get')
->will($this->returnCallback(function($uid) use ($userBackend) {
switch($uid) {
case 'user1' : return new User('user1', $userBackend);
case 'user2' : return new User('user2', $userBackend);
case 'user3' : return new User('user3', $userBackend);
case 'user33': return new User('user33', $userBackend);
case 'user333': return new User('user333', $userBackend);
default:
return null;
}
}));
$manager = new \OC\Group\Manager($userManager);
$manager->addBackend($backend);
$users = $manager->displayNamesInGroup('testgroup', 'user3', 1, 1);
$this->assertEquals(1, count($users));
$this->assertFalse(isset($users['user1']));
$this->assertFalse(isset($users['user2']));
$this->assertFalse(isset($users['user3']));
$this->assertFalse(isset($users['user33']));
$this->assertTrue(isset($users['user333']));
}
public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmpty() {
/**
* @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
*/
$backend = $this->getMock('\OC_Group_Database');
$backend->expects($this->exactly(1))
->method('groupExists')
->with('testgroup')
->will($this->returnValue(true));
$backend->expects($this->once())
->method('usersInGroup')
->with('testgroup', '', -1, 0)
->will($this->returnValue(array('user2', 'user33')));
/**
* @var \OC\User\Manager $userManager
*/
$userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$userManager->expects($this->any())
->method('get')
->will($this->returnCallback(function($uid) use ($userBackend) {
switch($uid) {
case 'user1' : return new User('user1', $userBackend);
case 'user2' : return new User('user2', $userBackend);
case 'user3' : return new User('user3', $userBackend);
case 'user33': return new User('user33', $userBackend);
default:
return null;
}
}));
$manager = new \OC\Group\Manager($userManager);
$manager->addBackend($backend);
$users = $manager->displayNamesInGroup('testgroup', '');
$this->assertEquals(2, count($users));
$this->assertFalse(isset($users['user1']));
$this->assertTrue(isset($users['user2']));
$this->assertFalse(isset($users['user3']));
$this->assertTrue(isset($users['user33']));
}
public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmptyAndLimitSpecified() {
/**
* @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
*/
$backend = $this->getMock('\OC_Group_Database');
$backend->expects($this->exactly(1))
->method('groupExists')
->with('testgroup')
->will($this->returnValue(true));
$backend->expects($this->once())
->method('usersInGroup')
->with('testgroup', '', 1, 0)
->will($this->returnValue(array('user2')));
/**
* @var \OC\User\Manager $userManager
*/
$userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$userManager->expects($this->any())
->method('get')
->will($this->returnCallback(function($uid) use ($userBackend) {
switch($uid) {
case 'user1' : return new User('user1', $userBackend);
case 'user2' : return new User('user2', $userBackend);
case 'user3' : return new User('user3', $userBackend);
case 'user33': return new User('user33', $userBackend);
default:
return null;
}
}));
$manager = new \OC\Group\Manager($userManager);
$manager->addBackend($backend);
$users = $manager->displayNamesInGroup('testgroup', '', 1);
$this->assertEquals(1, count($users));
$this->assertFalse(isset($users['user1']));
$this->assertTrue(isset($users['user2']));
$this->assertFalse(isset($users['user3']));
$this->assertFalse(isset($users['user33']));
}
public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmptyAndLimitAndOffsetSpecified() {
/**
* @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
*/
$backend = $this->getMock('\OC_Group_Database');
$backend->expects($this->exactly(1))
->method('groupExists')
->with('testgroup')
->will($this->returnValue(true));
$backend->expects($this->once())
->method('usersInGroup')
->with('testgroup', '', 1, 1)
->will($this->returnValue(array('user33')));
/**
* @var \OC\User\Manager $userManager
*/
$userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$userManager->expects($this->any())
->method('get')
->will($this->returnCallback(function($uid) use ($userBackend) {
switch($uid) {
case 'user1' : return new User('user1', $userBackend);
case 'user2' : return new User('user2', $userBackend);
case 'user3' : return new User('user3', $userBackend);
case 'user33': return new User('user33', $userBackend);
default:
return null;
}
}));
$manager = new \OC\Group\Manager($userManager);
$manager->addBackend($backend);
$users = $manager->displayNamesInGroup('testgroup', '', 1, 1);
$this->assertEquals(1, count($users));
$this->assertFalse(isset($users['user1']));
$this->assertFalse(isset($users['user2']));
$this->assertFalse(isset($users['user3']));
$this->assertTrue(isset($users['user33']));
}