diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/Files/FilesystemTest.php | 33 | ||||
| -rw-r--r-- | tests/lib/User/ManagerTest.php | 28 | ||||
| -rw-r--r-- | tests/lib/Util/User/Dummy.php | 7 |
3 files changed, 35 insertions, 33 deletions
diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index 1eb6c4fc54b..a98af220ba1 100644 --- a/tests/lib/Files/FilesystemTest.php +++ b/tests/lib/Files/FilesystemTest.php @@ -368,39 +368,6 @@ class FilesystemTest extends \Test\TestCase { $this->assertEquals(2, $thrown); } - public function testUserNameCasing() { - $this->logout(); - $userId = $this->getUniqueID('user_'); - - \OC_User::clearBackends(); - // needed for loginName2UserName mapping - $userBackend = $this->createMock(\OC\User\Database::class); - \OC::$server->getUserManager()->registerBackend($userBackend); - - $userBackend->expects($this->once()) - ->method('userExists') - ->with(strtoupper($userId)) - ->will($this->returnValue(true)); - $userBackend->expects($this->once()) - ->method('loginName2UserName') - ->with(strtoupper($userId)) - ->will($this->returnValue($userId)); - - $view = new \OC\Files\View(); - $this->assertFalse($view->file_exists('/' . $userId)); - - \OC\Files\Filesystem::initMountPoints(strtoupper($userId)); - - list($storage1, $path1) = $view->resolvePath('/' . $userId); - list($storage2, $path2) = $view->resolvePath('/' . strtoupper($userId)); - - $this->assertTrue($storage1->instanceOfStorage('\OCP\Files\IHomeStorage')); - $this->assertEquals('', $path1); - - // not mounted, still on the local root storage - $this->assertEquals(strtoupper($userId), $path2); - } - /** * Tests that the home storage is used for the user's mount point */ diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index 0d98a9825de..f6a362a5031 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -185,6 +185,8 @@ class ManagerTest extends TestCase { ->method('userExists') ->with($this->equalTo('foo')) ->will($this->returnValue(true)); + $backend->expects($this->never()) + ->method('loginName2UserName'); $manager = new \OC\User\Manager($this->config); $manager->registerBackend($backend); @@ -208,6 +210,24 @@ class ManagerTest extends TestCase { $this->assertEquals(null, $manager->get('foo')); } + public function testGetOneBackendDoNotTranslateLoginNames() { + /** + * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->createMock(\Test\Util\User\Dummy::class); + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('bLeNdEr')) + ->will($this->returnValue(true)); + $backend->expects($this->never()) + ->method('loginName2UserName'); + + $manager = new \OC\User\Manager($this->config); + $manager->registerBackend($backend); + + $this->assertEquals('bLeNdEr', $manager->get('bLeNdEr')->getUID()); + } + public function testSearchOneBackend() { /** * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend @@ -217,6 +237,8 @@ class ManagerTest extends TestCase { ->method('getUsers') ->with($this->equalTo('fo')) ->will($this->returnValue(array('foo', 'afoo'))); + $backend->expects($this->never()) + ->method('loginName2UserName'); $manager = new \OC\User\Manager($this->config); $manager->registerBackend($backend); @@ -236,6 +258,8 @@ class ManagerTest extends TestCase { ->method('getUsers') ->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1)) ->will($this->returnValue(array('foo1', 'foo2'))); + $backend1->expects($this->never()) + ->method('loginName2UserName'); /** * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 @@ -245,6 +269,8 @@ class ManagerTest extends TestCase { ->method('getUsers') ->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1)) ->will($this->returnValue(array('foo3'))); + $backend2->expects($this->never()) + ->method('loginName2UserName'); $manager = new \OC\User\Manager($this->config); $manager->registerBackend($backend1); @@ -324,6 +350,8 @@ class ManagerTest extends TestCase { ->method('userExists') ->with($this->equalTo('foo')) ->will($this->returnValue(false)); + $backend->expects($this->never()) + ->method('loginName2UserName'); $manager = new \OC\User\Manager($this->config); $manager->registerBackend($backend); diff --git a/tests/lib/Util/User/Dummy.php b/tests/lib/Util/User/Dummy.php index 806a97bacba..e77902d6f4e 100644 --- a/tests/lib/Util/User/Dummy.php +++ b/tests/lib/Util/User/Dummy.php @@ -108,6 +108,13 @@ class Dummy extends Backend implements \OCP\IUserBackend { return false; } + public function loginName2UserName($loginName) { + if(isset($this->users[strtolower($loginName)])) { + return strtolower($loginName); + } + return false; + } + /** * Get a list of all users * |