From 00a0588807d718119b52ae66ec7eb01678bf0369 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 29 Sep 2013 22:37:33 +0200 Subject: [PATCH 1/6] Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. --- tests/lib/user/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php index fe7d87c44d..9f21265c98 100644 --- a/tests/lib/user/database.php +++ b/tests/lib/user/database.php @@ -33,7 +33,7 @@ class Test_User_Database extends Test_User_Backend { } public function setUp() { - $this->backend=new OC_User_Dummy(); + $this->backend=new OC_User_Database(); } public function tearDown() { From 46cd3082b013f90fb8ce7269f40bb26d85bbee00 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 8 Oct 2013 19:14:13 +0200 Subject: [PATCH 2/6] Test_User_Backend::getUser() does not return an array, it returns a string. --- tests/lib/user/backend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php index 40674424c9..62ea0befbd 100644 --- a/tests/lib/user/backend.php +++ b/tests/lib/user/backend.php @@ -39,7 +39,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase { /** * get a new unique user name * test cases can override this in order to clean up created user - * @return array + * @return string */ public function getUser() { return uniqid('test_'); From 1f11dc72009e25ba0c6259289431c192eae740df Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 8 Oct 2013 19:22:45 +0200 Subject: [PATCH 3/6] Use parent:: in Test_User_Database::getUser(). --- tests/lib/user/database.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php index 9f21265c98..d7cc39ae38 100644 --- a/tests/lib/user/database.php +++ b/tests/lib/user/database.php @@ -21,13 +21,8 @@ */ 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() { - $user=uniqid('test_'); + $user = parent::getUser(); $this->users[]=$user; return $user; } From 6eab36a89b790e2a9355384010f640c4017c03b2 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 8 Oct 2013 19:48:49 +0200 Subject: [PATCH 4/6] Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. The user id has to be returned. --- lib/private/user/dummy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php index b5b7a6c3c7..f4d11428f2 100644 --- a/lib/private/user/dummy.php +++ b/lib/private/user/dummy.php @@ -88,8 +88,8 @@ class OC_User_Dummy extends OC_User_Backend { * returns the user id or false */ public function checkPassword($uid, $password) { - if (isset($this->users[$uid])) { - return ($this->users[$uid] == $password); + if (isset($this->users[$uid]) && $this->users[$uid] == $password) { + return $uid; } else { return false; } From 114e9d44032bdaf4e1c117e5859f4fe864b23c78 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 8 Oct 2013 19:53:20 +0200 Subject: [PATCH 5/6] Adjust return value tests for checkPassword() to what OC_User_Example says. --- tests/lib/user/backend.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php index 62ea0befbd..1384c54a92 100644 --- a/tests/lib/user/backend.php +++ b/tests/lib/user/backend.php @@ -82,8 +82,8 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase { $this->assertTrue($this->backend->userExists($name1)); $this->assertTrue($this->backend->userExists($name2)); - $this->assertTrue($this->backend->checkPassword($name1, 'pass1')); - $this->assertTrue($this->backend->checkPassword($name2, 'pass2')); + $this->assertSame($name1, $this->backend->checkPassword($name1, 'pass1')); + $this->assertSame($name2, $this->backend->checkPassword($name2, 'pass2')); $this->assertFalse($this->backend->checkPassword($name1, 'pass2')); $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->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')); } } From 75588fc0b6556d64825e842d4cf62ea572792723 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 8 Oct 2013 20:03:16 +0200 Subject: [PATCH 6/6] Use strict comparison === instead of ==. --- lib/private/user/dummy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php index f4d11428f2..52be7edfa7 100644 --- a/lib/private/user/dummy.php +++ b/lib/private/user/dummy.php @@ -88,7 +88,7 @@ class OC_User_Dummy extends OC_User_Backend { * returns the user id or false */ public function checkPassword($uid, $password) { - if (isset($this->users[$uid]) && $this->users[$uid] == $password) { + if (isset($this->users[$uid]) && $this->users[$uid] === $password) { return $uid; } else { return false;