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

Fix Scrutinizer errors about missing user backend

This commit is contained in:
Robin McCorkell 2014-05-12 15:33:04 +01:00
parent 8ab01599a9
commit 875a8acedf
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/lib/group/group.php
View File

@ -17,9 +17,10 @@ class Group extends \PHPUnit_Framework_TestCase {
*/ */
protected function getUserManager() { protected function getUserManager() {
$userManager = $this->getMock('\OC\User\Manager'); $userManager = $this->getMock('\OC\User\Manager');
$user1 = new User('user1', null); $backend = $this->getMock('\OC_User_Backend');
$user2 = new User('user2', null); $user1 = new User('user1', $backend);
$user3 = new User('user3', null); $user2 = new User('user2', $backend);
$user3 = new User('user3', $backend);
$userManager->expects($this->any()) $userManager->expects($this->any())
->method('get') ->method('get')
->will($this->returnValueMap(array( ->will($this->returnValueMap(array(
@ -79,6 +80,7 @@ class Group extends \PHPUnit_Framework_TestCase {
public function testInGroupSingleBackend() { public function testInGroupSingleBackend() {
$backend = $this->getMock('OC_Group_Database'); $backend = $this->getMock('OC_Group_Database');
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend');
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
$backend->expects($this->once()) $backend->expects($this->once())
@ -86,13 +88,14 @@ class Group extends \PHPUnit_Framework_TestCase {
->with('user1', 'group1') ->with('user1', 'group1')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$this->assertTrue($group->inGroup(new User('user1', null))); $this->assertTrue($group->inGroup(new User('user1', $userBackend)));
} }
public function testInGroupMultipleBackends() { public function testInGroupMultipleBackends() {
$backend1 = $this->getMock('OC_Group_Database'); $backend1 = $this->getMock('OC_Group_Database');
$backend2 = $this->getMock('OC_Group_Database'); $backend2 = $this->getMock('OC_Group_Database');
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend');
$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
$backend1->expects($this->once()) $backend1->expects($this->once())
@ -105,12 +108,13 @@ class Group extends \PHPUnit_Framework_TestCase {
->with('user1', 'group1') ->with('user1', 'group1')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$this->assertTrue($group->inGroup(new User('user1', null))); $this->assertTrue($group->inGroup(new User('user1', $userBackend)));
} }
public function testAddUser() { public function testAddUser() {
$backend = $this->getMock('OC_Group_Database'); $backend = $this->getMock('OC_Group_Database');
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend');
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
$backend->expects($this->once()) $backend->expects($this->once())
@ -125,12 +129,13 @@ class Group extends \PHPUnit_Framework_TestCase {
->method('addToGroup') ->method('addToGroup')
->with('user1', 'group1'); ->with('user1', 'group1');
$group->addUser(new User('user1', null)); $group->addUser(new User('user1', $userBackend));
} }
public function testAddUserAlreadyInGroup() { public function testAddUserAlreadyInGroup() {
$backend = $this->getMock('OC_Group_Database'); $backend = $this->getMock('OC_Group_Database');
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend');
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
$backend->expects($this->once()) $backend->expects($this->once())
@ -144,12 +149,13 @@ class Group extends \PHPUnit_Framework_TestCase {
$backend->expects($this->never()) $backend->expects($this->never())
->method('addToGroup'); ->method('addToGroup');
$group->addUser(new User('user1', null)); $group->addUser(new User('user1', $userBackend));
} }
public function testRemoveUser() { public function testRemoveUser() {
$backend = $this->getMock('OC_Group_Database'); $backend = $this->getMock('OC_Group_Database');
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend');
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
$backend->expects($this->once()) $backend->expects($this->once())
@ -164,12 +170,13 @@ class Group extends \PHPUnit_Framework_TestCase {
->method('removeFromGroup') ->method('removeFromGroup')
->with('user1', 'group1'); ->with('user1', 'group1');
$group->removeUser(new User('user1', null)); $group->removeUser(new User('user1', $userBackend));
} }
public function testRemoveUserNotInGroup() { public function testRemoveUserNotInGroup() {
$backend = $this->getMock('OC_Group_Database'); $backend = $this->getMock('OC_Group_Database');
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend');
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
$backend->expects($this->once()) $backend->expects($this->once())
@ -183,13 +190,14 @@ class Group extends \PHPUnit_Framework_TestCase {
$backend->expects($this->never()) $backend->expects($this->never())
->method('removeFromGroup'); ->method('removeFromGroup');
$group->removeUser(new User('user1', null)); $group->removeUser(new User('user1', $userBackend));
} }
public function testRemoveUserMultipleBackends() { public function testRemoveUserMultipleBackends() {
$backend1 = $this->getMock('OC_Group_Database'); $backend1 = $this->getMock('OC_Group_Database');
$backend2 = $this->getMock('OC_Group_Database'); $backend2 = $this->getMock('OC_Group_Database');
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend');
$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
$backend1->expects($this->once()) $backend1->expects($this->once())
@ -216,7 +224,7 @@ class Group extends \PHPUnit_Framework_TestCase {
->method('removeFromGroup') ->method('removeFromGroup')
->with('user1', 'group1'); ->with('user1', 'group1');
$group->removeUser(new User('user1', null)); $group->removeUser(new User('user1', $userBackend));
} }
public function testSearchUsers() { public function testSearchUsers() {

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

@ -294,10 +294,11 @@ class Manager extends \PHPUnit_Framework_TestCase {
* @var \OC\User\Manager $userManager * @var \OC\User\Manager $userManager
*/ */
$userManager = $this->getMock('\OC\User\Manager'); $userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$manager = new \OC\Group\Manager($userManager); $manager = new \OC\Group\Manager($userManager);
$manager->addBackend($backend); $manager->addBackend($backend);
$groups = $manager->getUserGroups(new User('user1', null)); $groups = $manager->getUserGroups(new User('user1', $userBackend));
$this->assertEquals(1, count($groups)); $this->assertEquals(1, count($groups));
$group1 = $groups[0]; $group1 = $groups[0];
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
@ -332,11 +333,12 @@ class Manager extends \PHPUnit_Framework_TestCase {
* @var \OC\User\Manager $userManager * @var \OC\User\Manager $userManager
*/ */
$userManager = $this->getMock('\OC\User\Manager'); $userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$manager = new \OC\Group\Manager($userManager); $manager = new \OC\Group\Manager($userManager);
$manager->addBackend($backend1); $manager->addBackend($backend1);
$manager->addBackend($backend2); $manager->addBackend($backend2);
$groups = $manager->getUserGroups(new User('user1', null)); $groups = $manager->getUserGroups(new User('user1', $userBackend));
$this->assertEquals(2, count($groups)); $this->assertEquals(2, count($groups));
$group1 = $groups[0]; $group1 = $groups[0];
$group2 = $groups[1]; $group2 = $groups[1];
@ -345,10 +347,12 @@ class Manager extends \PHPUnit_Framework_TestCase {
} }
public function testDisplayNamesInGroupMultipleUserBackends() { public function testDisplayNamesInGroupMultipleUserBackends() {
$user1 = new User('user1', null); $userBackend = $this->getMock('\OC_User_Backend');
$user2 = new User('user2', null);
$user3 = new User('user3', null); $user1 = new User('user1', $userBackend);
$user4 = new User('user33', null); $user2 = new User('user2', $userBackend);
$user3 = new User('user3', $userBackend);
$user4 = new User('user33', $userBackend);
/** /**
* @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
@ -368,6 +372,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
* @var \OC\User\Manager $userManager * @var \OC\User\Manager $userManager
*/ */
$userManager = $this->getMock('\OC\User\Manager'); $userManager = $this->getMock('\OC\User\Manager');
$userBackend = $this->getMock('\OC_User_Backend');
$userManager->expects($this->once()) $userManager->expects($this->once())
->method('search') ->method('search')
->with('user3') ->with('user3')
@ -375,12 +380,12 @@ class Manager extends \PHPUnit_Framework_TestCase {
$userManager->expects($this->any()) $userManager->expects($this->any())
->method('get') ->method('get')
->will($this->returnCallback(function($uid) { ->will($this->returnCallback(function($uid) use ($userBackend) {
switch($uid) { switch($uid) {
case 'user1' : return new User('user1', null); case 'user1' : return new User('user1', $userBackend);
case 'user2' : return new User('user2', null); case 'user2' : return new User('user2', $userBackend);
case 'user3' : return new User('user3', null); case 'user3' : return new User('user3', $userBackend);
case 'user33': return new User('user33', null); case 'user33': return new User('user33', $userBackend);
default: default:
return null; return null;
} }