Adjust Tests and satisfy them

diff --git a/lib/user/manager.php b/lib/user/manager.php
index 2de694a3d9fc2ae9924cba98c05e901cf937209e..13286bc28a48ad964ca7278de0373c554e8654c9 100644 (file)
--- a/lib/user/manager.php
+++ b/lib/user/manager.php
@@ -127,12 +127,14 @@ class Manager extends PublicEmitter {
         */
        public function checkPassword($loginname, $password) {
                foreach ($this->backends as $backend) {
-                       $uid = $backend->checkPassword($loginname, $password);
-                       if ($uid !== false) {
-                               return $this->getUserObject($uid, $backend);
+                       if($backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
+                               $uid = $backend->checkPassword($loginname, $password);
+                               if ($uid !== false) {
+                                       return $this->getUserObject($uid, $backend);
+                               }
                        }
                }
-               return null;
+               return false;
        }
 
        /**

diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index bc49f6db4b281e3c58b2d9051c923c06a04f1d30..00901dd4115c7e83aa4af3859b71957fbfa73dfb 100644 (file)
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -98,6 +98,51 @@ class Manager extends \PHPUnit_Framework_TestCase {
                $this->assertTrue($manager->userExists('foo'));
        }
 
+       public function testCheckPassword() {
+               /**
+                * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+                */
+               $backend = $this->getMock('\OC_User_Dummy');
+               $backend->expects($this->once())
+                       ->method('checkPassword')
+                       ->with($this->equalTo('foo'), $this->equalTo('bar'))
+                       ->will($this->returnValue(true));
+
+               $backend->expects($this->any())
+                       ->method('implementsActions')
+                       ->will($this->returnCallback(function ($actions) {
+                               if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
+                                       return true;
+                               } else {
+                                       return false;
+                               }
+                       }));
+
+               $manager = new \OC\User\Manager();
+               $manager->registerBackend($backend);
+
+               $user = $manager->checkPassword('foo', 'bar');
+               $this->assertTrue($user instanceof \OC\User\User);
+       }
+
+       public function testCheckPasswordNotSupported() {
+               /**
+                * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+                */
+               $backend = $this->getMock('\OC_User_Dummy');
+               $backend->expects($this->never())
+                       ->method('checkPassword');
+
+               $backend->expects($this->any())
+                       ->method('implementsActions')
+                       ->will($this->returnValue(false));
+
+               $manager = new \OC\User\Manager();
+               $manager->registerBackend($backend);
+
+               $this->assertFalse($manager->checkPassword('foo', 'bar'));
+       }
+
        public function testGetOneBackendExists() {
                /**
                 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend

diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index b0d170cbfc56db3016e1859084d1dd8f6c64cdae..de5ccbf38c101912de766d1c0eeb67a20cba27fc 100644 (file)
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -100,46 +100,6 @@ class User extends \PHPUnit_Framework_TestCase {
                $this->assertTrue($user->delete());
        }
 
-       public function testCheckPassword() {
-               /**
-                * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
-                */
-               $backend = $this->getMock('\OC_User_Dummy');
-               $backend->expects($this->once())
-                       ->method('checkPassword')
-                       ->with($this->equalTo('foo'), $this->equalTo('bar'))
-                       ->will($this->returnValue(true));
-
-               $backend->expects($this->any())
-                       ->method('implementsActions')
-                       ->will($this->returnCallback(function ($actions) {
-                               if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
-                                       return true;
-                               } else {
-                                       return false;
-                               }
-                       }));
-
-               $user = new \OC\User\User('foo', $backend);
-               $this->assertTrue($user->checkPassword('bar'));
-       }
-
-       public function testCheckPasswordNotSupported() {
-               /**
-                * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
-                */
-               $backend = $this->getMock('\OC_User_Dummy');
-               $backend->expects($this->never())
-                       ->method('checkPassword');
-
-               $backend->expects($this->any())
-                       ->method('implementsActions')
-                       ->will($this->returnValue(false));
-
-               $user = new \OC\User\User('foo', $backend);
-               $this->assertFalse($user->checkPassword('bar'));
-       }
-
        public function testGetHome() {
                /**
                 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend