From fafecd1c05cebbd983d8c770d36c5d546a83b16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 9 Apr 2015 14:03:30 +0200 Subject: [PATCH] fix cherrypicking --- apps/user_ldap/lib/connection.php | 2 +- apps/user_ldap/tests/user/manager.php | 4 ++ apps/user_ldap/tests/user_ldap.php | 27 +++++++------- lib/private/hook.php | 2 +- tests/lib/files/filesystem.php | 11 +++++- tests/lib/preview.php | 54 +++++++++++++-------------- 6 files changed, 56 insertions(+), 44 deletions(-) diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index fa6258445d..b9d83aad68 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -30,10 +30,10 @@ namespace OCA\user_ldap\lib; -//magic properties (incomplete) use OC\ServerNotAvailableException; /** + * magic properties (incomplete) * responsible for LDAP connections in context with the provided configuration * * @property string ldapUserFilter diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php index e1e98b57f8..e86db6b9f8 100644 --- a/apps/user_ldap/tests/user/manager.php +++ b/apps/user_ldap/tests/user/manager.php @@ -145,6 +145,8 @@ class Test_User_Manager extends \Test\TestCase { $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); $manager->setLdapAccess($access); $user = $manager->get($inputDN); + + $this->assertNull($user); } public function testGetByUidExisting() { @@ -192,6 +194,8 @@ class Test_User_Manager extends \Test\TestCase { $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); $manager->setLdapAccess($access); $user = $manager->get($uid); + + $this->assertNull($user); } } diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index 9b4da00a3a..53229e2d64 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -435,7 +435,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase { */ public function testUserExistsForDeleted() { $access = $this->getAccessMock(); - $backend = new UserLDAP($access); + $backend = new UserLDAP($access, $this->getMock('\OCP\IConfig')); $this->prepareMockForUserExists($access); $access->expects($this->any()) @@ -453,7 +453,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase { public function testUserExistsForNeverExisting() { $access = $this->getAccessMock(); - $backend = new UserLDAP($access); + $backend = new UserLDAP($access, $this->getMock('\OCP\IConfig')); $this->prepareMockForUserExists($access); $access->expects($this->any()) @@ -495,7 +495,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase { */ public function testUserExistsPublicAPIForDeleted() { $access = $this->getAccessMock(); - $backend = new UserLDAP($access); + $backend = new UserLDAP($access, $this->getMock('\OCP\IConfig')); $this->prepareMockForUserExists($access); \OC_User::useBackend($backend); @@ -514,7 +514,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase { public function testUserExistsPublicAPIForNeverExisting() { $access = $this->getAccessMock(); - $backend = new UserLDAP($access); + $backend = new UserLDAP($access, $this->getMock('\OCP\IConfig')); $this->prepareMockForUserExists($access); \OC_User::useBackend($backend); @@ -571,19 +571,15 @@ class Test_User_Ldap_Direct extends \Test\TestCase { } })); - $datadir = '/my/data/dir'; - $config->expects($this->once()) - ->method('getSystemValue') - ->will($this->returnValue($datadir)); - //absolut path $result = $backend->getHome('gunslinger'); $this->assertEquals('/tmp/rolandshome/', $result); } - public function testGetHomeDatadirRelative() { + public function testGetHomeRelative() { $access = $this->getAccessMock(); - $backend = new UserLDAP($access); + $config = $this->getMock('\OCP\IConfig'); + $backend = new UserLDAP($access, $config); $this->prepareMockForUserExists($access); $access->connection->expects($this->any()) @@ -610,9 +606,12 @@ class Test_User_Ldap_Direct extends \Test\TestCase { } })); //datadir-relativ path + $datadir = '/my/data/dir'; + $config->expects($this->once()) + ->method('getSystemValue') + ->will($this->returnValue($datadir)); + $result = $backend->getHome('ladyofshadows'); - $datadir = \OCP\Config::getSystemValue('datadirectory', - \OC::$SERVERROOT.'/data'); $this->assertEquals($datadir.'/susannah/', $result); } @@ -621,7 +620,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase { */ public function testGetHomeNoPath() { $access = $this->getAccessMock(); - $backend = new UserLDAP($access); + $backend = new UserLDAP($access, $this->getMock('\OCP\IConfig')); $this->prepareMockForUserExists($access); $access->connection->expects($this->any()) diff --git a/lib/private/hook.php b/lib/private/hook.php index 1e7a084bc3..b6e97b3f54 100644 --- a/lib/private/hook.php +++ b/lib/private/hook.php @@ -114,7 +114,7 @@ class OC_Hook{ OC_Log::write('hook', 'error while running hook (' . $class . '::' . $i["name"] . '): ' . $message, OC_Log::ERROR); - if($e instanceof \OC\ServerNotAvailableException && $signalclass === 'OC_Filesystem' && $signalname === 'setup') { + if($e instanceof \OC\ServerNotAvailableException && $signalClass === 'OC_Filesystem' && $signalName === 'setup') { throw $e; } } diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php index a01b15eb2d..082d22781f 100644 --- a/tests/lib/files/filesystem.php +++ b/tests/lib/files/filesystem.php @@ -25,6 +25,9 @@ namespace Test\Files; use OC\User\NoUserException; class Filesystem extends \Test\TestCase { + + const TEST_FILESYSTEM_USER1 = "test-filesystem-user1"; + /** * @var array tmpDirs */ @@ -238,8 +241,14 @@ class Filesystem extends \Test\TestCase { if (\OC\Files\Filesystem::getView()) { $user = \OC_User::getUser(); } else { - $user = $this->getUniqueID(); + $user = self::TEST_FILESYSTEM_USER1; + $backend = new \OC_User_Dummy(); + \OC_User::useBackend($backend); + $backend->createUser($user, $user); + $userObj = \OC::$server->getUserManager()->get($user); + \OC::$server->getUserSession()->setUser($userObj); \OC\Files\Filesystem::init($user, '/' . $user . '/files'); + } \OC_Hook::clear('OC_Filesystem'); \OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook'); diff --git a/tests/lib/preview.php b/tests/lib/preview.php index ea9de9b777..20e4209ded 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -10,10 +10,7 @@ namespace Test; class Preview extends TestCase { - /** - * @var string - */ - private $user; + const TEST_PREVIEW_USER1 = "test-preview-user1"; /** * @var \OC\Files\View @@ -32,15 +29,18 @@ class Preview extends TestCase { // create a new user with his own filesystem view // this gets called by each test in this test class - $this->user = $this->getUniqueID(); - \OC_User::setUserId($this->user); - \OC\Files\Filesystem::init($this->user, '/' . $this->user . '/files'); + $backend = new \OC_User_Dummy(); + \OC_User::useBackend($backend); + $backend->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1); + $user = \OC::$server->getUserManager()->get(self::TEST_PREVIEW_USER1); + \OC::$server->getUserSession()->setUser($user); + \OC\Files\Filesystem::init(self::TEST_PREVIEW_USER1, '/' . self::TEST_PREVIEW_USER1 . '/files'); \OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/'); $this->rootView = new \OC\Files\View(''); - $this->rootView->mkdir('/'.$this->user); - $this->rootView->mkdir('/'.$this->user.'/files'); + $this->rootView->mkdir('/'.self::TEST_PREVIEW_USER1); + $this->rootView->mkdir('/'.self::TEST_PREVIEW_USER1.'/files'); } protected function tearDown() { @@ -59,14 +59,14 @@ class Preview extends TestCase { \OC::$server->getConfig()->setSystemValue('preview_max_y', $maxY); // Sample is 1680x1050 JPEG - $sampleFile = '/' . $this->user . '/files/testimage.jpg'; + $sampleFile = '/' . self::TEST_PREVIEW_USER1 . '/files/testimage.jpg'; $this->rootView->file_put_contents($sampleFile, file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg')); $fileInfo = $this->rootView->getFileInfo($sampleFile); $fileId = $fileInfo['fileid']; $largeX = 1920; $largeY = 1080; - $preview = new \OC\Preview($this->user, 'files/', 'testimage.jpg', $largeX, $largeY); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg', $largeX, $largeY); $this->assertEquals($preview->isFileValid(), true); @@ -84,7 +84,7 @@ class Preview extends TestCase { $this->assertEquals($image->height(), $maxY); // The max thumbnail should be created - $maxThumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $maxX . '-' . $maxY . '-max.png'; + $maxThumbCacheFile = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $maxX . '-' . $maxY . '-max.png'; $this->assertEquals($this->rootView->file_exists($maxThumbCacheFile), true); @@ -100,7 +100,7 @@ class Preview extends TestCase { // Smaller previews should be based on the cached max preview $smallX = 50; $smallY = 50; - $preview = new \OC\Preview($this->user, 'files/', 'testimage.jpg', $smallX, $smallY); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg', $smallX, $smallY); $isCached = $preview->isCached($fileId); $this->assertEquals(\OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $maxX . '-' . $maxY . '.png', $isCached); @@ -111,7 +111,7 @@ class Preview extends TestCase { $this->assertEquals($image->height(), $smallY); // The cache should contain the small preview - $thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $smallX . '-' . $smallY . '.png'; + $thumbCacheFile = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $smallX . '-' . $smallY . '.png'; $this->assertEquals($this->rootView->file_exists($thumbCacheFile), true); @@ -123,20 +123,20 @@ class Preview extends TestCase { public function testIsPreviewDeleted() { - $sampleFile = '/'.$this->user.'/files/test.txt'; + $sampleFile = '/'.self::TEST_PREVIEW_USER1.'/files/test.txt'; $this->rootView->file_put_contents($sampleFile, 'dummy file data'); $x = 50; $y = 50; - $preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y); $preview->getPreview(); $fileInfo = $this->rootView->getFileInfo($sampleFile); $fileId = $fileInfo['fileid']; - $thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; + $thumbCacheFile = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; $this->assertEquals($this->rootView->file_exists($thumbCacheFile), true); @@ -147,20 +147,20 @@ class Preview extends TestCase { public function testAreAllPreviewsDeleted() { - $sampleFile = '/'.$this->user.'/files/test.txt'; + $sampleFile = '/'.self::TEST_PREVIEW_USER1.'/files/test.txt'; $this->rootView->file_put_contents($sampleFile, 'dummy file data'); $x = 50; $y = 50; - $preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y); $preview->getPreview(); $fileInfo = $this->rootView->getFileInfo($sampleFile); $fileId = $fileInfo['fileid']; - $thumbCacheFolder = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/'; + $thumbCacheFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/'; $this->assertEquals($this->rootView->is_dir($thumbCacheFolder), true); @@ -185,9 +185,9 @@ class Preview extends TestCase { $x = 32; $y = 32; - $sample = '/'.$this->user.'/files/test.'.$extension; + $sample = '/'.self::TEST_PREVIEW_USER1.'/files/test.'.$extension; $this->rootView->file_put_contents($sample, $data); - $preview = new \OC\Preview($this->user, 'files/', 'test.'.$extension, $x, $y); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.'.$extension, $x, $y); $image = $preview->getPreview(); $resource = $image->resource(); @@ -203,7 +203,7 @@ class Preview extends TestCase { public function testCreationFromCached() { - $sampleFile = '/'.$this->user.'/files/test.txt'; + $sampleFile = '/'.self::TEST_PREVIEW_USER1.'/files/test.txt'; $this->rootView->file_put_contents($sampleFile, 'dummy file data'); @@ -211,22 +211,22 @@ class Preview extends TestCase { $x = 150; $y = 150; - $preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y); $preview->getPreview(); $fileInfo = $this->rootView->getFileInfo($sampleFile); $fileId = $fileInfo['fileid']; - $thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; + $thumbCacheFile = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; $this->assertEquals($this->rootView->file_exists($thumbCacheFile), true); // create smaller previews - $preview = new \OC\Preview($this->user, 'files/', 'test.txt', 50, 50); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', 50, 50); $isCached = $preview->isCached($fileId); - $this->assertEquals($this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/150-150.png', $isCached); + $this->assertEquals(self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/150-150.png', $isCached); } /*