|
|
@@ -22,18 +22,24 @@ |
|
|
|
*/ |
|
|
|
namespace Test\Group; |
|
|
|
|
|
|
|
use OC\Group\Database; |
|
|
|
use OC\User\Manager; |
|
|
|
use OCP\ILogger; |
|
|
|
use OCP\IUser; |
|
|
|
use OCP\GroupInterface; |
|
|
|
use Test\TestCase; |
|
|
|
|
|
|
|
class ManagerTest extends \Test\TestCase { |
|
|
|
class ManagerTest extends TestCase { |
|
|
|
/** @var Manager|\PHPUnit_Framework_MockObject_MockObject $userManager */ |
|
|
|
protected $userManager; |
|
|
|
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject $userManager */ |
|
|
|
protected $logger; |
|
|
|
|
|
|
|
protected function setUp() { |
|
|
|
parent::setUp(); |
|
|
|
|
|
|
|
$this->userManager = $this->createMock(Manager::class); |
|
|
|
$this->logger = $this->createMock(ILogger::class); |
|
|
|
} |
|
|
|
|
|
|
|
private function getTestUser($userId) { |
|
|
@@ -47,8 +53,12 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
return $mockUser; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param null|int $implementedActions |
|
|
|
* @return \PHPUnit_Framework_MockObject_MockObject |
|
|
|
*/ |
|
|
|
private function getTestBackend($implementedActions = null) { |
|
|
|
if (is_null($implementedActions)) { |
|
|
|
if ($implementedActions === null) { |
|
|
|
$implementedActions = |
|
|
|
GroupInterface::ADD_TO_GROUP | |
|
|
|
GroupInterface::REMOVE_FROM_GOUP | |
|
|
@@ -58,7 +68,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
// need to declare it this way due to optional methods |
|
|
|
// thanks to the implementsActions logic |
|
|
|
$backend = $this->getMockBuilder(\OCP\GroupInterface::class) |
|
|
|
$backend = $this->getMockBuilder(GroupInterface::class) |
|
|
|
->disableOriginalConstructor() |
|
|
|
->setMethods([ |
|
|
|
'getGroupDetails', |
|
|
@@ -91,7 +101,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$group = $manager->get('group1'); |
|
|
@@ -100,7 +110,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
|
|
|
|
public function testGetNoBackend() { |
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
|
|
|
|
$this->assertNull($manager->get('group1')); |
|
|
|
} |
|
|
@@ -115,7 +125,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(false)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$this->assertNull($manager->get('group1')); |
|
|
@@ -125,7 +135,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
$backend = new \Test\Util\Group\Dummy(); |
|
|
|
$backend->createGroup('group1'); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$group = $manager->get('group1'); |
|
|
@@ -152,7 +162,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend1); |
|
|
|
$manager->addBackend($backend2); |
|
|
|
|
|
|
@@ -162,9 +172,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
|
|
|
|
public function testCreate() { |
|
|
|
/** |
|
|
|
* @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend |
|
|
|
*/ |
|
|
|
/**@var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ |
|
|
|
$backendGroupCreated = false; |
|
|
|
$backend = $this->getTestBackend(); |
|
|
|
$backend->expects($this->any()) |
|
|
@@ -177,9 +185,9 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('createGroup') |
|
|
|
->will($this->returnCallback(function () use (&$backendGroupCreated) { |
|
|
|
$backendGroupCreated = true; |
|
|
|
}));; |
|
|
|
})); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$group = $manager->createGroup('group1'); |
|
|
@@ -187,9 +195,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
|
|
|
|
public function testCreateExists() { |
|
|
|
/** |
|
|
|
* @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend |
|
|
|
*/ |
|
|
|
/** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ |
|
|
|
$backend = $this->getTestBackend(); |
|
|
|
$backend->expects($this->any()) |
|
|
|
->method('groupExists') |
|
|
@@ -198,7 +204,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
$backend->expects($this->never()) |
|
|
|
->method('createGroup'); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$group = $manager->createGroup('group1'); |
|
|
@@ -219,11 +225,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$groups = $manager->search('1'); |
|
|
|
$this->assertEquals(1, count($groups)); |
|
|
|
$this->assertCount(1, $groups); |
|
|
|
$group1 = reset($groups); |
|
|
|
$this->assertEquals('group1', $group1->getGID()); |
|
|
|
} |
|
|
@@ -253,12 +259,12 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('groupExists') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend1); |
|
|
|
$manager->addBackend($backend2); |
|
|
|
|
|
|
|
$groups = $manager->search('1'); |
|
|
|
$this->assertEquals(2, count($groups)); |
|
|
|
$this->assertCount(2, $groups); |
|
|
|
$group1 = reset($groups); |
|
|
|
$group12 = next($groups); |
|
|
|
$this->assertEquals('group1', $group1->getGID()); |
|
|
@@ -290,18 +296,40 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('groupExists') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend1); |
|
|
|
$manager->addBackend($backend2); |
|
|
|
|
|
|
|
$groups = $manager->search('1', 2, 1); |
|
|
|
$this->assertEquals(2, count($groups)); |
|
|
|
$this->assertCount(2, $groups); |
|
|
|
$group1 = reset($groups); |
|
|
|
$group12 = next($groups); |
|
|
|
$this->assertEquals('group1', $group1->getGID()); |
|
|
|
$this->assertEquals('group12', $group12->getGID()); |
|
|
|
} |
|
|
|
|
|
|
|
public function testSearchResultExistsButGroupDoesNot() { |
|
|
|
/** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ |
|
|
|
$backend = $this->createMock(Database::class); |
|
|
|
$backend->expects($this->once()) |
|
|
|
->method('getGroups') |
|
|
|
->with('1') |
|
|
|
->will($this->returnValue(['group1'])); |
|
|
|
$backend->expects($this->once()) |
|
|
|
->method('groupExists') |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(false)); |
|
|
|
|
|
|
|
/** @var \OC\User\Manager $userManager */ |
|
|
|
$userManager = $this->createMock(Manager::class); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$groups = $manager->search('1'); |
|
|
|
$this->assertEmpty($groups); |
|
|
|
} |
|
|
|
|
|
|
|
public function testGetUserGroups() { |
|
|
|
/** |
|
|
|
* @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend |
|
|
@@ -316,18 +344,18 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$groups = $manager->getUserGroups($this->getTestUser('user1')); |
|
|
|
$this->assertEquals(1, count($groups)); |
|
|
|
$this->assertCount(1, $groups); |
|
|
|
$group1 = reset($groups); |
|
|
|
$this->assertEquals('group1', $group1->getGID()); |
|
|
|
} |
|
|
|
|
|
|
|
public function testGetUserGroupIds() { |
|
|
|
/** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Manager $manager */ |
|
|
|
$manager = $this->getMockBuilder('OC\Group\Manager') |
|
|
|
$manager = $this->getMockBuilder(\OC\Group\Manager::class) |
|
|
|
->disableOriginalConstructor() |
|
|
|
->setMethods(['getUserGroups']) |
|
|
|
->getMock(); |
|
|
@@ -338,19 +366,44 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
'abc' => 'abc', |
|
|
|
]); |
|
|
|
|
|
|
|
/** @var \OC\User\User $user */ |
|
|
|
$user = $this->getMockBuilder('OC\User\User') |
|
|
|
->disableOriginalConstructor() |
|
|
|
->getMock(); |
|
|
|
/** @var \OC\User\User|\PHPUnit_Framework_MockObject_MockObject $user */ |
|
|
|
$user = $this->createMock(IUser::class); |
|
|
|
|
|
|
|
$groups = $manager->getUserGroupIds($user); |
|
|
|
$this->assertEquals(2, count($groups)); |
|
|
|
$this->assertCount(2, $groups); |
|
|
|
|
|
|
|
foreach ($groups as $group) { |
|
|
|
$this->assertInternalType('string', $group); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public function testGetUserGroupsWithDeletedGroup() { |
|
|
|
/** |
|
|
|
* @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend |
|
|
|
*/ |
|
|
|
$backend = $this->createMock(Database::class); |
|
|
|
$backend->expects($this->once()) |
|
|
|
->method('getUserGroups') |
|
|
|
->with('user1') |
|
|
|
->will($this->returnValue(array('group1'))); |
|
|
|
$backend->expects($this->any()) |
|
|
|
->method('groupExists') |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(false)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
/** @var \OC\User\User|\PHPUnit_Framework_MockObject_MockObject $user */ |
|
|
|
$user = $this->createMock(IUser::class); |
|
|
|
$user->expects($this->atLeastOnce()) |
|
|
|
->method('getUID') |
|
|
|
->willReturn('user1'); |
|
|
|
|
|
|
|
$groups = $manager->getUserGroups($user); |
|
|
|
$this->assertEmpty($groups); |
|
|
|
} |
|
|
|
|
|
|
|
public function testInGroup() { |
|
|
|
/** |
|
|
|
* @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend |
|
|
@@ -364,7 +417,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('groupExists') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$this->assertTrue($manager->isInGroup('user1', 'group1')); |
|
|
@@ -383,7 +436,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('groupExists') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$this->assertTrue($manager->isAdmin('user1')); |
|
|
@@ -402,7 +455,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('groupExists') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$this->assertFalse($manager->isAdmin('user1')); |
|
|
@@ -433,12 +486,12 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('groupExists') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend1); |
|
|
|
$manager->addBackend($backend2); |
|
|
|
|
|
|
|
$groups = $manager->getUserGroups($this->getTestUser('user1')); |
|
|
|
$this->assertEquals(2, count($groups)); |
|
|
|
$this->assertCount(2, $groups); |
|
|
|
$group1 = reset($groups); |
|
|
|
$group2 = next($groups); |
|
|
|
$this->assertEquals('group1', $group1->getGID()); |
|
|
@@ -468,14 +521,10 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$userBackend = $this->getMockBuilder('\OC\User\Backend') |
|
|
|
->disableOriginalConstructor() |
|
|
|
->getMock(); |
|
|
|
|
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('searchDisplayName') |
|
|
|
->with('user3') |
|
|
|
->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($search, $limit, $offset) { |
|
|
|
switch($offset) { |
|
|
|
case 0 : return ['user3' => $this->getTestUser('user3'), |
|
|
|
'user33' => $this->getTestUser('user33')]; |
|
|
@@ -485,7 +534,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
})); |
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('get') |
|
|
|
->will($this->returnCallback(function($uid) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($uid) { |
|
|
|
switch($uid) { |
|
|
|
case 'user1' : return $this->getTestUser('user1'); |
|
|
|
case 'user2' : return $this->getTestUser('user2'); |
|
|
@@ -496,11 +545,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$users = $manager->displayNamesInGroup('testgroup', 'user3'); |
|
|
|
$this->assertEquals(1, count($users)); |
|
|
|
$this->assertCount(1, $users); |
|
|
|
$this->assertFalse(isset($users['user1'])); |
|
|
|
$this->assertFalse(isset($users['user2'])); |
|
|
|
$this->assertFalse(isset($users['user3'])); |
|
|
@@ -531,14 +580,10 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$userBackend = $this->getMockBuilder('\OC\User\Backend') |
|
|
|
->disableOriginalConstructor() |
|
|
|
->getMock(); |
|
|
|
|
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('searchDisplayName') |
|
|
|
->with('user3') |
|
|
|
->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($search, $limit, $offset) { |
|
|
|
switch($offset) { |
|
|
|
case 0 : return ['user3' => $this->getTestUser('user3'), |
|
|
|
'user33' => $this->getTestUser('user33')]; |
|
|
@@ -548,7 +593,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
})); |
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('get') |
|
|
|
->will($this->returnCallback(function($uid) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($uid) { |
|
|
|
switch($uid) { |
|
|
|
case 'user1' : return $this->getTestUser('user1'); |
|
|
|
case 'user2' : return $this->getTestUser('user2'); |
|
|
@@ -560,11 +605,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$users = $manager->displayNamesInGroup('testgroup', 'user3', 1); |
|
|
|
$this->assertEquals(1, count($users)); |
|
|
|
$this->assertCount(1, $users); |
|
|
|
$this->assertFalse(isset($users['user1'])); |
|
|
|
$this->assertFalse(isset($users['user2'])); |
|
|
|
$this->assertFalse(isset($users['user3'])); |
|
|
@@ -596,14 +641,10 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$userBackend = $this->getMockBuilder('\OC\User\Backend') |
|
|
|
->disableOriginalConstructor() |
|
|
|
->getMock(); |
|
|
|
|
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('searchDisplayName') |
|
|
|
->with('user3') |
|
|
|
->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($search, $limit, $offset) { |
|
|
|
switch($offset) { |
|
|
|
case 0 : |
|
|
|
return [ |
|
|
@@ -616,7 +657,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
})); |
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('get') |
|
|
|
->will($this->returnCallback(function($uid) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($uid) { |
|
|
|
switch($uid) { |
|
|
|
case 'user1' : return $this->getTestUser('user1'); |
|
|
|
case 'user2' : return $this->getTestUser('user2'); |
|
|
@@ -628,11 +669,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$users = $manager->displayNamesInGroup('testgroup', 'user3', 1, 1); |
|
|
|
$this->assertEquals(1, count($users)); |
|
|
|
$this->assertCount(1, $users); |
|
|
|
$this->assertFalse(isset($users['user1'])); |
|
|
|
$this->assertFalse(isset($users['user2'])); |
|
|
|
$this->assertFalse(isset($users['user3'])); |
|
|
@@ -655,13 +696,9 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('testgroup', '', -1, 0) |
|
|
|
->will($this->returnValue(array('user2', 'user33'))); |
|
|
|
|
|
|
|
$userBackend = $this->getMockBuilder('\OC\User\Backend') |
|
|
|
->disableOriginalConstructor() |
|
|
|
->getMock(); |
|
|
|
|
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('get') |
|
|
|
->will($this->returnCallback(function($uid) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($uid) { |
|
|
|
switch($uid) { |
|
|
|
case 'user1' : return $this->getTestUser('user1'); |
|
|
|
case 'user2' : return $this->getTestUser('user2'); |
|
|
@@ -672,11 +709,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$users = $manager->displayNamesInGroup('testgroup', ''); |
|
|
|
$this->assertEquals(2, count($users)); |
|
|
|
$this->assertCount(2, $users); |
|
|
|
$this->assertFalse(isset($users['user1'])); |
|
|
|
$this->assertTrue(isset($users['user2'])); |
|
|
|
$this->assertFalse(isset($users['user3'])); |
|
|
@@ -698,13 +735,9 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('testgroup', '', 1, 0) |
|
|
|
->will($this->returnValue(array('user2'))); |
|
|
|
|
|
|
|
$userBackend = $this->getMockBuilder('\OC\User\Backend') |
|
|
|
->disableOriginalConstructor() |
|
|
|
->getMock(); |
|
|
|
|
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('get') |
|
|
|
->will($this->returnCallback(function($uid) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($uid) { |
|
|
|
switch($uid) { |
|
|
|
case 'user1' : return $this->getTestUser('user1'); |
|
|
|
case 'user2' : return $this->getTestUser('user2'); |
|
|
@@ -715,11 +748,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$users = $manager->displayNamesInGroup('testgroup', '', 1); |
|
|
|
$this->assertEquals(1, count($users)); |
|
|
|
$this->assertCount(1, $users); |
|
|
|
$this->assertFalse(isset($users['user1'])); |
|
|
|
$this->assertTrue(isset($users['user2'])); |
|
|
|
$this->assertFalse(isset($users['user3'])); |
|
|
@@ -741,13 +774,9 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('testgroup', '', 1, 1) |
|
|
|
->will($this->returnValue(array('user33'))); |
|
|
|
|
|
|
|
$userBackend = $this->getMockBuilder('\OC\User\Backend') |
|
|
|
->disableOriginalConstructor() |
|
|
|
->getMock(); |
|
|
|
|
|
|
|
$this->userManager->expects($this->any()) |
|
|
|
->method('get') |
|
|
|
->will($this->returnCallback(function($uid) use ($userBackend) { |
|
|
|
->will($this->returnCallback(function($uid) { |
|
|
|
switch($uid) { |
|
|
|
case 'user1' : return $this->getTestUser('user1'); |
|
|
|
case 'user2' : return $this->getTestUser('user2'); |
|
|
@@ -758,11 +787,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
} |
|
|
|
})); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$users = $manager->displayNamesInGroup('testgroup', '', 1, 1); |
|
|
|
$this->assertEquals(1, count($users)); |
|
|
|
$this->assertCount(1, $users); |
|
|
|
$this->assertFalse(isset($users['user1'])); |
|
|
|
$this->assertFalse(isset($users['user2'])); |
|
|
|
$this->assertFalse(isset($users['user3'])); |
|
|
@@ -786,7 +815,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('group1') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
// prime cache |
|
|
@@ -797,11 +826,11 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
// add user |
|
|
|
$group = $manager->get('group1'); |
|
|
|
$group->addUser($user1); |
|
|
|
$expectedGroups = ['group1']; |
|
|
|
$expectedGroups[] = 'group1'; |
|
|
|
|
|
|
|
// check result |
|
|
|
$groups = $manager->getUserGroups($user1); |
|
|
|
$this->assertEquals(1, count($groups)); |
|
|
|
$this->assertCount(1, $groups); |
|
|
|
$group1 = reset($groups); |
|
|
|
$this->assertEquals('group1', $group1->getGID()); |
|
|
|
} |
|
|
@@ -829,13 +858,13 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->method('removeFromGroup') |
|
|
|
->will($this->returnValue(true)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
// prime cache |
|
|
|
$user1 = $this->getTestUser('user1'); |
|
|
|
$groups = $manager->getUserGroups($user1); |
|
|
|
$this->assertEquals(1, count($groups)); |
|
|
|
$this->assertCount(1, $groups); |
|
|
|
$group1 = reset($groups); |
|
|
|
$this->assertEquals('group1', $group1->getGID()); |
|
|
|
|
|
|
@@ -859,7 +888,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
->with('user1') |
|
|
|
->will($this->returnValue(null)); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
$groups = $manager->getUserIdGroups('user1'); |
|
|
@@ -885,7 +914,7 @@ class ManagerTest extends \Test\TestCase { |
|
|
|
['group2', ['gid' => 'group2']], |
|
|
|
])); |
|
|
|
|
|
|
|
$manager = new \OC\Group\Manager($this->userManager); |
|
|
|
$manager = new \OC\Group\Manager($this->userManager, $this->logger); |
|
|
|
$manager->addBackend($backend); |
|
|
|
|
|
|
|
// group with display name |