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

clean up created groups after testing, and correct parameter order

This commit is contained in:
Arthur Schiwon 2014-06-24 21:56:08 +02:00
parent 121d52860e
commit 553c2ad33a
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,9 +104,9 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
}
public function testSearchGroups() {
$name1 = 'foobarbaz';
$name2 = 'bazbarfoo';
$name3 = 'notme';
$name1 = $this->getGroupName('foobarbaz');
$name2 = $this->getGroupName('bazbarfoo');
$name3 = $this->getGroupName('notme');
$this->backend->createGroup($name1);
$this->backend->createGroup($name2);
@ -114,9 +114,6 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
$result = $this->backend->getGroups('bar');
$this->assertSame(2, count($result));
$result = $this->backend->getDisplayNames('bar');
$this->assertSame(2, count($result));
}
public function testSearchUsers() {
@ -127,9 +124,9 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
$name2 = 'bazbarfoo';
$name3 = 'notme';
$this->backend->addToGroup($group, $name1);
$this->backend->addToGroup($group, $name2);
$this->backend->addToGroup($group, $name3);
$this->backend->addToGroup($name1, $group);
$this->backend->addToGroup($name2, $group);
$this->backend->addToGroup($name3, $group);
$result = $this->backend->usersInGroup($group, 'bar');
$this->assertSame(2, count($result));

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

@ -28,8 +28,10 @@ class Test_Group_Database extends Test_Group_Backend {
* test cases can override this in order to clean up created groups
* @return string
*/
public function getGroupName() {
$name=uniqid('test_');
public function getGroupName($name = null) {
if(is_null($name)) {
$name=uniqid('test_');
}
$this->groups[]=$name;
return $name;
}