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

Do not use uniqid in Group and User tests as it is not unique on windows

This commit is contained in:
Joas Schilling 2014-11-05 12:21:02 +01:00
parent 62047f86f5
commit 216ef617db
7 changed files with 62 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tests/lib/group.php
View File

@ -22,38 +22,39 @@
* *
*/ */
class Test_Group extends PHPUnit_Framework_TestCase { class Test_Group extends \Test\TestCase {
function setUp() { protected function setUp() {
parent::setUp();
OC_Group::clearBackends(); OC_Group::clearBackends();
OC_User::clearBackends(); OC_User::clearBackends();
} }
function testSingleBackend() { public function testSingleBackend() {
$userBackend = new \OC_User_Dummy(); $userBackend = new \OC_User_Dummy();
\OC_User::getManager()->registerBackend($userBackend); \OC_User::getManager()->registerBackend($userBackend);
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new OC_Group_Dummy());
$group1 = uniqid(); $group1 = $this->getUniqueID();
$group2 = uniqid(); $group2 = $this->getUniqueID();
OC_Group::createGroup($group1); OC_Group::createGroup($group1);
OC_Group::createGroup($group2); OC_Group::createGroup($group2);
$user1 = uniqid(); $user1 = $this->getUniqueID();
$user2 = uniqid(); $user2 = $this->getUniqueID();
$userBackend->createUser($user1, ''); $userBackend->createUser($user1, '');
$userBackend->createUser($user2, ''); $userBackend->createUser($user2, '');
$this->assertFalse(OC_Group::inGroup($user1, $group1)); $this->assertFalse(OC_Group::inGroup($user1, $group1), 'Asserting that user1 is not in group1');
$this->assertFalse(OC_Group::inGroup($user2, $group1)); $this->assertFalse(OC_Group::inGroup($user2, $group1), 'Asserting that user2 is not in group1');
$this->assertFalse(OC_Group::inGroup($user1, $group2)); $this->assertFalse(OC_Group::inGroup($user1, $group2), 'Asserting that user1 is not in group2');
$this->assertFalse(OC_Group::inGroup($user2, $group2)); $this->assertFalse(OC_Group::inGroup($user2, $group2), 'Asserting that user2 is not in group2');
$this->assertTrue(OC_Group::addToGroup($user1, $group1)); $this->assertTrue(OC_Group::addToGroup($user1, $group1));
$this->assertTrue(OC_Group::inGroup($user1, $group1)); $this->assertTrue(OC_Group::inGroup($user1, $group1), 'Asserting that user1 is in group1');
$this->assertFalse(OC_Group::inGroup($user2, $group1)); $this->assertFalse(OC_Group::inGroup($user2, $group1), 'Asserting that user2 is not in group1');
$this->assertFalse(OC_Group::inGroup($user1, $group2)); $this->assertFalse(OC_Group::inGroup($user1, $group2), 'Asserting that user1 is not in group2');
$this->assertFalse(OC_Group::inGroup($user2, $group2)); $this->assertFalse(OC_Group::inGroup($user2, $group2), 'Asserting that user2 is not in group2');
$this->assertTrue(OC_Group::addToGroup($user1, $group1)); $this->assertTrue(OC_Group::addToGroup($user1, $group1));
@ -80,7 +81,7 @@ class Test_Group extends PHPUnit_Framework_TestCase {
public function testNoGroupsTwice() { public function testNoGroupsTwice() {
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new OC_Group_Dummy());
$group = uniqid(); $group = $this->getUniqueID();
OC_Group::createGroup($group); OC_Group::createGroup($group);
$groupCopy = $group; $groupCopy = $group;
@ -103,7 +104,7 @@ class Test_Group extends PHPUnit_Framework_TestCase {
public function testDontAddUserToNonexistentGroup() { public function testDontAddUserToNonexistentGroup() {
OC_Group::useBackend(new OC_Group_Dummy()); OC_Group::useBackend(new OC_Group_Dummy());
$groupNonExistent = 'notExistent'; $groupNonExistent = 'notExistent';
$user = uniqid(); $user = $this->getUniqueID();
$this->assertEquals(false, OC_Group::addToGroup($user, $groupNonExistent)); $this->assertEquals(false, OC_Group::addToGroup($user, $groupNonExistent));
$this->assertEquals(array(), OC_Group::getGroups()); $this->assertEquals(array(), OC_Group::getGroups());
@ -114,12 +115,12 @@ class Test_Group extends PHPUnit_Framework_TestCase {
$userBackend = new \OC_User_Dummy(); $userBackend = new \OC_User_Dummy();
\OC_User::getManager()->registerBackend($userBackend); \OC_User::getManager()->registerBackend($userBackend);
$group1 = uniqid(); $group1 = $this->getUniqueID();
$group2 = uniqid(); $group2 = $this->getUniqueID();
$group3 = uniqid(); $group3 = $this->getUniqueID();
$user1 = uniqid(); $user1 = $this->getUniqueID();
$user2 = uniqid(); $user2 = $this->getUniqueID();
$user3 = uniqid(); $user3 = $this->getUniqueID();
OC_Group::createGroup($group1); OC_Group::createGroup($group1);
OC_Group::createGroup($group2); OC_Group::createGroup($group2);
OC_Group::createGroup($group3); OC_Group::createGroup($group3);
@ -139,8 +140,7 @@ class Test_Group extends PHPUnit_Framework_TestCase {
// FIXME: needs more parameter variation // FIXME: needs more parameter variation
} }
public function testMultiBackend() {
function testMultiBackend() {
$userBackend = new \OC_User_Dummy(); $userBackend = new \OC_User_Dummy();
\OC_User::getManager()->registerBackend($userBackend); \OC_User::getManager()->registerBackend($userBackend);
$backend1 = new OC_Group_Dummy(); $backend1 = new OC_Group_Dummy();
@ -148,8 +148,8 @@ class Test_Group extends PHPUnit_Framework_TestCase {
OC_Group::useBackend($backend1); OC_Group::useBackend($backend1);
OC_Group::useBackend($backend2); OC_Group::useBackend($backend2);
$group1 = uniqid(); $group1 = $this->getUniqueID();
$group2 = uniqid(); $group2 = $this->getUniqueID();
OC_Group::createGroup($group1); OC_Group::createGroup($group1);
//groups should be added to the first registered backend //groups should be added to the first registered backend
@ -166,8 +166,8 @@ class Test_Group extends PHPUnit_Framework_TestCase {
$this->assertTrue(OC_Group::groupExists($group1)); $this->assertTrue(OC_Group::groupExists($group1));
$this->assertTrue(OC_Group::groupExists($group2)); $this->assertTrue(OC_Group::groupExists($group2));
$user1 = uniqid(); $user1 = $this->getUniqueID();
$user2 = uniqid(); $user2 = $this->getUniqueID();
$userBackend->createUser($user1, ''); $userBackend->createUser($user1, '');
$userBackend->createUser($user2, ''); $userBackend->createUser($user2, '');

8
tests/lib/group/backend.php
View File

@ -20,7 +20,7 @@
* *
*/ */
abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase { abstract class Test_Group_Backend extends \Test\TestCase {
/** /**
* @var OC_Group_Backend $backend * @var OC_Group_Backend $backend
*/ */
@ -33,7 +33,7 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
*/ */
public function getGroupName($name = null) { public function getGroupName($name = null) {
if(is_null($name)) { if(is_null($name)) {
return uniqid('test_'); return $this->getUniqueID('test_');
} else { } else {
return $name; return $name;
} }
@ -45,7 +45,7 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
* @return string * @return string
*/ */
public function getUserName() { public function getUserName() {
return uniqid('test_'); return $this->getUniqueID('test_');
} }
public function testAddRemove() { public function testAddRemove() {
@ -138,6 +138,4 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
$result = $this->backend->countUsersInGroup($group, 'bar'); $result = $this->backend->countUsersInGroup($group, 'bar');
$this->assertSame(2, $result); $this->assertSame(2, $result);
} }
} }

21
tests/lib/group/database.php
View File

@ -29,29 +29,20 @@ class Test_Group_Database extends Test_Group_Backend {
* @return string * @return string
*/ */
public function getGroupName($name = null) { public function getGroupName($name = null) {
if(is_null($name)) { $name = parent::getGroupName($name);
$name=uniqid('test_'); $this->groups[] = $name;
}
$this->groups[]=$name;
return $name; return $name;
} }
/** protected function setUp() {
* get a new unique user name parent::setUp();
* test cases can override this in order to clean up created user
* @return string
*/
public function getUserName() {
return uniqid('test_');
}
public function setUp() {
$this->backend=new OC_Group_Database(); $this->backend=new OC_Group_Database();
} }
public function tearDown() { protected function tearDown() {
foreach($this->groups as $group) { foreach($this->groups as $group) {
$this->backend->deleteGroup($group); $this->backend->deleteGroup($group);
} }
parent::tearDown();
} }
} }

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

@ -21,7 +21,8 @@
*/ */
class Test_Group_Dummy extends Test_Group_Backend { class Test_Group_Dummy extends Test_Group_Backend {
public function setUp() { protected function setUp() {
parent::setUp();
$this->backend=new OC_Group_Dummy(); $this->backend=new OC_Group_Dummy();
} }
} }

5
tests/lib/user/backend.php
View File

@ -30,7 +30,7 @@
* For an example see /tests/lib/user/dummy.php * For an example see /tests/lib/user/dummy.php
*/ */
abstract class Test_User_Backend extends PHPUnit_Framework_TestCase { abstract class Test_User_Backend extends \Test\TestCase {
/** /**
* @var OC_User_Backend $backend * @var OC_User_Backend $backend
*/ */
@ -42,7 +42,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
* @return string * @return string
*/ */
public function getUser() { public function getUser() {
return uniqid('test_'); return $this->getUniqueID('test_');
} }
public function testAddRemove() { public function testAddRemove() {
@ -112,5 +112,4 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
$result = $this->backend->getDisplayNames('bar'); $result = $this->backend->getDisplayNames('bar');
$this->assertSame(2, count($result)); $this->assertSame(2, count($result));
} }
} }

9
tests/lib/user/database.php
View File

@ -21,22 +21,27 @@
*/ */
class Test_User_Database extends Test_User_Backend { class Test_User_Database extends Test_User_Backend {
/** @var array */
private $users;
public function getUser() { public function getUser() {
$user = parent::getUser(); $user = parent::getUser();
$this->users[]=$user; $this->users[]=$user;
return $user; return $user;
} }
public function setUp() { protected function setUp() {
parent::setUp();
$this->backend=new OC_User_Database(); $this->backend=new OC_User_Database();
} }
public function tearDown() { protected function tearDown() {
if(!isset($this->users)) { if(!isset($this->users)) {
return; return;
} }
foreach($this->users as $user) { foreach($this->users as $user) {
$this->backend->deleteUser($user); $this->backend->deleteUser($user);
} }
parent::tearDown();
} }
} }

3
tests/lib/user/dummy.php
View File

@ -21,7 +21,8 @@
*/ */
class Test_User_Dummy extends Test_User_Backend { class Test_User_Dummy extends Test_User_Backend {
public function setUp() { protected function setUp() {
parent::setUp();
$this->backend=new OC_User_Dummy(); $this->backend=new OC_User_Dummy();
} }
} }