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

Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test 

Move the group dummy backend to test
This commit is contained in:
Thomas Müller 2016-04-20 11:55:00 +02:00
parent a6676f31ec dd7e0d13e5
commit aa33ab0c03
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/tests/testcase.php
View File

@ -82,7 +82,7 @@ abstract class TestCase extends \Test\TestCase {
$backend->createUser(self::TEST_FILES_SHARING_API_USER4, self::TEST_FILES_SHARING_API_USER4); $backend->createUser(self::TEST_FILES_SHARING_API_USER4, self::TEST_FILES_SHARING_API_USER4);
// create group // create group
$groupBackend = new \OC_Group_Dummy(); $groupBackend = new \Test\Util\Group\Dummy();
$groupBackend->createGroup(self::TEST_FILES_SHARING_API_GROUP1); $groupBackend->createGroup(self::TEST_FILES_SHARING_API_GROUP1);
$groupBackend->createGroup('group'); $groupBackend->createGroup('group');
$groupBackend->createGroup('group1'); $groupBackend->createGroup('group1');

16
tests/lib/group.php
View File

@ -32,7 +32,7 @@ class Test_Group extends \Test\TestCase {
public function testSingleBackend() { public function testSingleBackend() {
$userBackend = new \Test\Util\User\Dummy(); $userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($userBackend); \OC::$server->getUserManager()->registerBackend($userBackend);
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new \Test\Util\Group\Dummy());
$group1 = $this->getUniqueID(); $group1 = $this->getUniqueID();
$group2 = $this->getUniqueID(); $group2 = $this->getUniqueID();
@ -72,7 +72,7 @@ class Test_Group extends \Test\TestCase {
public function testNoEmptyGIDs() { public function testNoEmptyGIDs() {
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new \Test\Util\Group\Dummy());
$emptyGroup = null; $emptyGroup = null;
$this->assertFalse(OC_Group::createGroup($emptyGroup)); $this->assertFalse(OC_Group::createGroup($emptyGroup));
@ -80,7 +80,7 @@ class Test_Group extends \Test\TestCase {
public function testNoGroupsTwice() { public function testNoGroupsTwice() {
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new \Test\Util\Group\Dummy());
$group = $this->getUniqueID(); $group = $this->getUniqueID();
OC_Group::createGroup($group); OC_Group::createGroup($group);
@ -92,7 +92,7 @@ class Test_Group extends \Test\TestCase {
public function testDontDeleteAdminGroup() { public function testDontDeleteAdminGroup() {
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new \Test\Util\Group\Dummy());
$adminGroup = 'admin'; $adminGroup = 'admin';
OC_Group::createGroup($adminGroup); OC_Group::createGroup($adminGroup);
@ -102,7 +102,7 @@ class Test_Group extends \Test\TestCase {
public function testDontAddUserToNonexistentGroup() { public function testDontAddUserToNonexistentGroup() {
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new \Test\Util\Group\Dummy());
$groupNonExistent = 'notExistent'; $groupNonExistent = 'notExistent';
$user = $this->getUniqueID(); $user = $this->getUniqueID();
@ -111,7 +111,7 @@ class Test_Group extends \Test\TestCase {
} }
public function testUsersInGroup() { public function testUsersInGroup() {
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new \Test\Util\Group\Dummy());
$userBackend = new \Test\Util\User\Dummy(); $userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($userBackend); \OC::$server->getUserManager()->registerBackend($userBackend);
@ -143,8 +143,8 @@ class Test_Group extends \Test\TestCase {
public function testMultiBackend() { public function testMultiBackend() {
$userBackend = new \Test\Util\User\Dummy(); $userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($userBackend); \OC::$server->getUserManager()->registerBackend($userBackend);
$backend1 = new OC_Group_Dummy(); $backend1 = new \Test\Util\Group\Dummy();
$backend2 = new OC_Group_Dummy(); $backend2 = new \Test\Util\Group\Dummy();
OC_Group::useBackend($backend1); OC_Group::useBackend($backend1);
OC_Group::useBackend($backend2); OC_Group::useBackend($backend2);

2
tests/lib/group/dummy.php
View File

@ -28,6 +28,6 @@
class Test_Group_Dummy extends Test_Group_Backend { class Test_Group_Dummy extends Test_Group_Backend {
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
$this->backend=new OC_Group_Dummy(); $this->backend=new \Test\Util\Group\Dummy();
} }
} }

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

@ -65,7 +65,7 @@ class Manager extends \Test\TestCase {
} }
public function testGetDeleted() { public function testGetDeleted() {
$backend = new \OC_Group_Dummy(); $backend = new \Test\Util\Group\Dummy();
$backend->createGroup('group1'); $backend->createGroup('group1');
/** /**

2
tests/lib/share/share.php
View File

@ -63,7 +63,7 @@ class Test_Share extends \Test\TestCase {
\OC::$server->getUserManager()->createUser($this->groupAndUser, 'pass'); \OC::$server->getUserManager()->createUser($this->groupAndUser, 'pass');
OC_User::setUserId($this->user1); OC_User::setUserId($this->user1);
OC_Group::clearBackends(); OC_Group::clearBackends();
OC_Group::useBackend(new OC_Group_Dummy); OC_Group::useBackend(new \Test\Util\Group\Dummy());
$this->group1 = $this->getUniqueID('group1_'); $this->group1 = $this->getUniqueID('group1_');
$this->group2 = $this->getUniqueID('group2_'); $this->group2 = $this->getUniqueID('group2_');
OC_Group::createGroup($this->group1); OC_Group::createGroup($this->group1);

6
lib/private/group/dummy.php → tests/lib/util/group/dummy.php
View File

@ -27,10 +27,14 @@
* *
*/ */
namespace Test\Util\Group;
use OC_Group_Backend;
/** /**
* dummy group backend, does not keep state, only for testing use * dummy group backend, does not keep state, only for testing use
*/ */
class OC_Group_Dummy extends OC_Group_Backend { class Dummy extends OC_Group_Backend {
private $groups=array(); private $groups=array();
/** /**
* Try to create a new group * Try to create a new group