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

Merge pull request #5032 from owncloud/fixing-5006-master 

Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.

* owncloud/fixing-5006-master:
  Use strict comparison === instead of ==.
  Adjust return value tests for checkPassword() to what OC_User_Example says.
  Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
  Use parent:: in Test_User_Database::getUser().
  Test_User_Backend::getUser() does not return an array, it returns a string.
  Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
This commit is contained in:
Andreas Fischer 2013-10-08 23:17:51 +02:00
parent 24e99016a9 75588fc0b6
commit fe64f7b900
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/user/dummy.php
View File

@ -88,8 +88,8 @@ class OC_User_Dummy extends OC_User_Backend {
* returns the user id or false * returns the user id or false
*/ */
public function checkPassword($uid, $password) { public function checkPassword($uid, $password) {
if (isset($this->users[$uid])) { if (isset($this->users[$uid]) && $this->users[$uid] === $password) {
return ($this->users[$uid] == $password); return $uid;
} else { } else {
return false; return false;
} }

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

@ -39,7 +39,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
/** /**
* get a new unique user name * get a new unique user name
* test cases can override this in order to clean up created user * test cases can override this in order to clean up created user
* @return array * @return string
*/ */
public function getUser() { public function getUser() {
return uniqid('test_'); return uniqid('test_');
@ -82,8 +82,8 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
$this->assertTrue($this->backend->userExists($name1)); $this->assertTrue($this->backend->userExists($name1));
$this->assertTrue($this->backend->userExists($name2)); $this->assertTrue($this->backend->userExists($name2));
$this->assertTrue($this->backend->checkPassword($name1, 'pass1')); $this->assertSame($name1, $this->backend->checkPassword($name1, 'pass1'));
$this->assertTrue($this->backend->checkPassword($name2, 'pass2')); $this->assertSame($name2, $this->backend->checkPassword($name2, 'pass2'));
$this->assertFalse($this->backend->checkPassword($name1, 'pass2')); $this->assertFalse($this->backend->checkPassword($name1, 'pass2'));
$this->assertFalse($this->backend->checkPassword($name2, 'pass1')); $this->assertFalse($this->backend->checkPassword($name2, 'pass1'));
@ -93,7 +93,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
$this->backend->setPassword($name1, 'newpass1'); $this->backend->setPassword($name1, 'newpass1');
$this->assertFalse($this->backend->checkPassword($name1, 'pass1')); $this->assertFalse($this->backend->checkPassword($name1, 'pass1'));
$this->assertTrue($this->backend->checkPassword($name1, 'newpass1')); $this->assertSame($name1, $this->backend->checkPassword($name1, 'newpass1'));
$this->assertFalse($this->backend->checkPassword($name2, 'newpass1')); $this->assertFalse($this->backend->checkPassword($name2, 'newpass1'));
} }
} }

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

@ -21,19 +21,14 @@
*/ */
class Test_User_Database extends Test_User_Backend { class Test_User_Database extends Test_User_Backend {
/**
* get a new unique user name
* test cases can override this in order to clean up created user
* @return array
*/
public function getUser() { public function getUser() {
$user=uniqid('test_'); $user = parent::getUser();
$this->users[]=$user; $this->users[]=$user;
return $user; return $user;
} }
public function setUp() { public function setUp() {
$this->backend=new OC_User_Dummy(); $this->backend=new OC_User_Database();
} }
public function tearDown() { public function tearDown() {