Skip to content
Snippets Groups Projects
Commit 4c19a009 authored by Joas Schilling's avatar Joas Schilling Committed by GitHub
Browse files

Merge pull request #373 from nextcloud/fix_noDB 

FIX NODB group
parents e29835a7 8d739f30
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
tests/lib/Group/GroupTest.php
+ 124
− 43
View file @ 4c19a009
...@@ -12,15 +12,36 @@ namespace Test\Group; ...@@ -12,15 +12,36 @@ namespace Test\Group;
use OC\User\User; use OC\User\User;
class GroupTest extends \Test\TestCase { class GroupTest extends \Test\TestCase {
/**
* @param string $uid
* @param \OC\User\Backend $backend
* @return User
*/
private function newUser($uid, \OC\User\Backend $backend) {
$config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock();
$urlgenerator = $this->getMockBuilder('\OCP\IURLGenerator')
->disableOriginalConstructor()
->getMock();
return new User($uid, $backend, null, $config, $urlgenerator);
}
/** /**
* @return \OC\User\Manager | \OC\User\Manager * @return \OC\User\Manager
*/ */
protected function getUserManager() { protected function getUserManager() {
$userManager = $this->getMock('\OC\User\Manager'); $userManager = $this->getMockBuilder('\OC\User\Manager')
$backend = $this->getMock('\OC_User_Backend'); ->disableOriginalConstructor()
$user1 = new User('user1', $backend); ->getMock();
$user2 = new User('user2', $backend); $backend = $this->getMockBuilder('\OC\User\Backend')
$user3 = new User('user3', $backend); ->disableOriginalConstructor()
->getMock();
$user1 = $this->newUser('user1', $backend);
$user2 = $this->newUser('user2', $backend);
$user3 = $this->newUser('user3', $backend);
$userManager->expects($this->any()) $userManager->expects($this->any())
->method('get') ->method('get')
->will($this->returnValueMap(array( ->will($this->returnValueMap(array(
...@@ -32,7 +53,9 @@ class GroupTest extends \Test\TestCase { ...@@ -32,7 +53,9 @@ class GroupTest extends \Test\TestCase {
} }
public function testGetUsersSingleBackend() { public function testGetUsersSingleBackend() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
...@@ -51,8 +74,12 @@ class GroupTest extends \Test\TestCase { ...@@ -51,8 +74,12 @@ class GroupTest extends \Test\TestCase {
} }
public function testGetUsersMultipleBackends() { public function testGetUsersMultipleBackends() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
$backend2 = $this->getMock('OC\Group\Database'); ->disableOriginalConstructor()
->getMock();
$backend2 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
...@@ -78,9 +105,13 @@ class GroupTest extends \Test\TestCase { ...@@ -78,9 +105,13 @@ class GroupTest extends \Test\TestCase {
} }
public function testInGroupSingleBackend() { public function testInGroupSingleBackend() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend'); $userBackend = $this->getMockBuilder('\OC\User\Backend')
->disableOriginalConstructor()
->getMock();
$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())
...@@ -88,14 +119,20 @@ class GroupTest extends \Test\TestCase { ...@@ -88,14 +119,20 @@ class GroupTest extends \Test\TestCase {
->with('user1', 'group1') ->with('user1', 'group1')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$this->assertTrue($group->inGroup(new User('user1', $userBackend))); $this->assertTrue($group->inGroup($this->newUser('user1', $userBackend)));
} }
public function testInGroupMultipleBackends() { public function testInGroupMultipleBackends() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
$backend2 = $this->getMock('OC\Group\Database'); ->disableOriginalConstructor()
->getMock();
$backend2 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend'); $userBackend = $this->getMockBuilder('\OC_User_Backend')
->disableOriginalConstructor()
->getMock();
$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())
...@@ -108,13 +145,17 @@ class GroupTest extends \Test\TestCase { ...@@ -108,13 +145,17 @@ class GroupTest extends \Test\TestCase {
->with('user1', 'group1') ->with('user1', 'group1')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$this->assertTrue($group->inGroup(new User('user1', $userBackend))); $this->assertTrue($group->inGroup($this->newUser('user1', $userBackend)));
} }
public function testAddUser() { public function testAddUser() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend'); $userBackend = $this->getMockBuilder('\OC\User\Backend')
->disableOriginalConstructor()
->getMock();
$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())
...@@ -129,13 +170,17 @@ class GroupTest extends \Test\TestCase { ...@@ -129,13 +170,17 @@ class GroupTest extends \Test\TestCase {
->method('addToGroup') ->method('addToGroup')
->with('user1', 'group1'); ->with('user1', 'group1');
$group->addUser(new User('user1', $userBackend)); $group->addUser($this->newUser('user1', $userBackend));
} }
public function testAddUserAlreadyInGroup() { public function testAddUserAlreadyInGroup() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend'); $userBackend = $this->getMockBuilder('\OC\User\Backend')
->disableOriginalConstructor()
->getMock();
$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())
...@@ -149,13 +194,17 @@ class GroupTest extends \Test\TestCase { ...@@ -149,13 +194,17 @@ class GroupTest extends \Test\TestCase {
$backend->expects($this->never()) $backend->expects($this->never())
->method('addToGroup'); ->method('addToGroup');
$group->addUser(new User('user1', $userBackend)); $group->addUser($this->newUser('user1', $userBackend));
} }
public function testRemoveUser() { public function testRemoveUser() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend'); $userBackend = $this->getMockBuilder('\OC\User\Backend')
->disableOriginalConstructor()
->getMock();
$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())
...@@ -170,13 +219,17 @@ class GroupTest extends \Test\TestCase { ...@@ -170,13 +219,17 @@ class GroupTest extends \Test\TestCase {
->method('removeFromGroup') ->method('removeFromGroup')
->with('user1', 'group1'); ->with('user1', 'group1');
$group->removeUser(new User('user1', $userBackend)); $group->removeUser($this->newUser('user1', $userBackend));
} }
public function testRemoveUserNotInGroup() { public function testRemoveUserNotInGroup() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend'); $userBackend = $this->getMockBuilder('\OC_User_Backend')
->disableOriginalConstructor()
->getMock();
$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())
...@@ -190,14 +243,20 @@ class GroupTest extends \Test\TestCase { ...@@ -190,14 +243,20 @@ class GroupTest extends \Test\TestCase {
$backend->expects($this->never()) $backend->expects($this->never())
->method('removeFromGroup'); ->method('removeFromGroup');
$group->removeUser(new User('user1', $userBackend)); $group->removeUser($this->newUser('user1', $userBackend));
} }
public function testRemoveUserMultipleBackends() { public function testRemoveUserMultipleBackends() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
$backend2 = $this->getMock('OC\Group\Database'); ->disableOriginalConstructor()
->getMock();
$backend2 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$userBackend = $this->getMock('\OC_User_Backend'); $userBackend = $this->getMockBuilder('\OC\User\Backend')
->disableOriginalConstructor()
->getMock();
$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())
...@@ -224,11 +283,13 @@ class GroupTest extends \Test\TestCase { ...@@ -224,11 +283,13 @@ class GroupTest extends \Test\TestCase {
->method('removeFromGroup') ->method('removeFromGroup')
->with('user1', 'group1'); ->with('user1', 'group1');
$group->removeUser(new User('user1', $userBackend)); $group->removeUser($this->newUser('user1', $userBackend));
} }
public function testSearchUsers() { public function testSearchUsers() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
...@@ -245,8 +306,12 @@ class GroupTest extends \Test\TestCase { ...@@ -245,8 +306,12 @@ class GroupTest extends \Test\TestCase {
} }
public function testSearchUsersMultipleBackends() { public function testSearchUsersMultipleBackends() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
$backend2 = $this->getMock('OC\Group\Database'); ->disableOriginalConstructor()
->getMock();
$backend2 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
...@@ -267,7 +332,9 @@ class GroupTest extends \Test\TestCase { ...@@ -267,7 +332,9 @@ class GroupTest extends \Test\TestCase {
} }
public function testSearchUsersLimitAndOffset() { public function testSearchUsersLimitAndOffset() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
...@@ -284,8 +351,12 @@ class GroupTest extends \Test\TestCase { ...@@ -284,8 +351,12 @@ class GroupTest extends \Test\TestCase {
} }
public function testSearchUsersMultipleBackendsLimitAndOffset() { public function testSearchUsersMultipleBackendsLimitAndOffset() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
$backend2 = $this->getMock('OC\Group\Database'); ->disableOriginalConstructor()
->getMock();
$backend2 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
...@@ -308,7 +379,9 @@ class GroupTest extends \Test\TestCase { ...@@ -308,7 +379,9 @@ class GroupTest extends \Test\TestCase {
} }
public function testCountUsers() { public function testCountUsers() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend1), $userManager); $group = new \OC\Group\Group('group1', array($backend1), $userManager);
...@@ -327,8 +400,12 @@ class GroupTest extends \Test\TestCase { ...@@ -327,8 +400,12 @@ class GroupTest extends \Test\TestCase {
} }
public function testCountUsersMultipleBackends() { public function testCountUsersMultipleBackends() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
$backend2 = $this->getMock('OC\Group\Database'); ->disableOriginalConstructor()
->getMock();
$backend2 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
...@@ -354,7 +431,9 @@ class GroupTest extends \Test\TestCase { ...@@ -354,7 +431,9 @@ class GroupTest extends \Test\TestCase {
} }
public function testCountUsersNoMethod() { public function testCountUsersNoMethod() {
$backend1 = $this->getMock('OC\Group\Database'); $backend1 = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend1), $userManager); $group = new \OC\Group\Group('group1', array($backend1), $userManager);
...@@ -370,7 +449,9 @@ class GroupTest extends \Test\TestCase { ...@@ -370,7 +449,9 @@ class GroupTest extends \Test\TestCase {
} }
public function testDelete() { public function testDelete() {
$backend = $this->getMock('OC\Group\Database'); $backend = $this->getMockBuilder('OC\Group\Database')
->disableOriginalConstructor()
->getMock();
$userManager = $this->getUserManager(); $userManager = $this->getUserManager();
$group = new \OC\Group\Group('group1', array($backend), $userManager); $group = new \OC\Group\Group('group1', array($backend), $userManager);
......
tests/lib/Group/LegacyGroupTest.php
+ 6
− 0
View file @ 4c19a009
...@@ -27,6 +27,12 @@ namespace Test\Group; ...@@ -27,6 +27,12 @@ namespace Test\Group;
use OC_Group; use OC_Group;
use OC_User; use OC_User;
/**
* Class LegacyGroupTest
*
* @package Test\Group
* @group DB
*/
class LegacyGroupTest extends \Test\TestCase { class LegacyGroupTest extends \Test\TestCase {
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
......
tests/lib/Group/ManagerTest.php
+ 203
− 205
View file @ 4c19a009
This diff is collapsed.
tests/lib/UtilTest.php
+ 8
− 0
View file @ 4c19a009
...@@ -29,6 +29,9 @@ class UtilTest extends \Test\TestCase { ...@@ -29,6 +29,9 @@ class UtilTest extends \Test\TestCase {
$this->assertTrue(is_string($edition)); $this->assertTrue(is_string($edition));
} }
/**
* @group DB
*/
function testFormatDate() { function testFormatDate() {
date_default_timezone_set("UTC"); date_default_timezone_set("UTC");
...@@ -41,6 +44,9 @@ class UtilTest extends \Test\TestCase { ...@@ -41,6 +44,9 @@ class UtilTest extends \Test\TestCase {
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
/**
* @group DB
*/
function testFormatDateWithTZ() { function testFormatDateWithTZ() {
date_default_timezone_set("UTC"); date_default_timezone_set("UTC");
...@@ -69,6 +75,7 @@ class UtilTest extends \Test\TestCase { ...@@ -69,6 +75,7 @@ class UtilTest extends \Test\TestCase {
/** /**
* @dataProvider formatDateWithTZFromSessionData * @dataProvider formatDateWithTZFromSessionData
* @group DB
*/ */
function testFormatDateWithTZFromSession($offset, $expected, $expectedTimeZone) { function testFormatDateWithTZFromSession($offset, $expected, $expectedTimeZone) {
date_default_timezone_set("UTC"); date_default_timezone_set("UTC");
...@@ -285,6 +292,7 @@ class UtilTest extends \Test\TestCase { ...@@ -285,6 +292,7 @@ class UtilTest extends \Test\TestCase {
* Test default apps * Test default apps
* *
* @dataProvider defaultAppsProvider * @dataProvider defaultAppsProvider
* @group DB
*/ */
function testDefaultApps($defaultAppConfig, $expectedPath, $enabledApps) { function testDefaultApps($defaultAppConfig, $expectedPath, $enabledApps) {
$oldDefaultApps = \OCP\Config::getSystemValue('defaultapp', ''); $oldDefaultApps = \OCP\Config::getSystemValue('defaultapp', '');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment