From e9eccf34f9258a3720afb3cde218275f4b35f884 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 3 Jan 2018 21:44:30 +0100 Subject: [PATCH] removes invalid tests, adapts another one Signed-off-by: Arthur Schiwon --- apps/user_ldap/tests/User_LDAPTest.php | 7 +++--- tests/lib/Files/FilesystemTest.php | 33 -------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 5b53cc3da2..3262a2360a 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -1343,10 +1343,6 @@ class User_LDAPTest extends TestCase { } return true; })); - - $access->userManager->expects($this->atLeastOnce()) - ->method('get') - ->willReturn($this->createMock(User::class)); } /** @@ -1357,6 +1353,9 @@ class User_LDAPTest extends TestCase { $access = $this->getAccessMock(); $this->prepareAccessForSetPassword($access); + $access->userManager->expects($this->atLeastOnce()) + ->method('get') + ->willReturn($this->createMock(User::class)); $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); \OC_User::useBackend($backend); diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index 1eb6c4fc54..a98af220ba 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 */