1 files changed, 21 insertions, 30 deletions

diff --git a/tests/lib/TempManagerTest.php b/tests/lib/TempManagerTest.php
index 89b66654570..ee7778c7e88 100644
--- a/tests/lib/TempManagerTest.php
+++ b/tests/lib/TempManagerTest.php
@@ -9,6 +9,8 @@
 namespace Test;
 
 use bantu\IniGetWrapper\IniGetWrapper;
+use OC\TempManager;
+use OCP\Files;
 use OCP\IConfig;
 use Psr\Log\LoggerInterface;
 
@@ -26,15 +28,15 @@ class TempManagerTest extends \Test\TestCase {
 
 	protected function tearDown(): void {
 		if ($this->baseDir !== null) {
-			\OC_Helper::rmdirr($this->baseDir);
+			Files::rmdirr($this->baseDir);
 		}
 		$this->baseDir = null;
 		parent::tearDown();
 	}
 
 	/**
-	 * @param  ?LoggerInterface $logger
-	 * @param  ?IConfig $config
+	 * @param ?LoggerInterface $logger
+	 * @param ?IConfig $config
 	 * @return \OC\TempManager
 	 */
 	protected function getManager($logger = null, $config = null) {
@@ -48,14 +50,14 @@ class TempManagerTest extends \Test\TestCase {
 				->willReturn('/tmp');
 		}
 		$iniGetWrapper = $this->createMock(IniGetWrapper::class);
-		$manager = new \OC\TempManager($logger, $config, $iniGetWrapper);
+		$manager = new TempManager($logger, $config, $iniGetWrapper);
 		if ($this->baseDir) {
 			$manager->overrideTempBaseDir($this->baseDir);
 		}
 		return $manager;
 	}
 
-	public function testGetFile() {
+	public function testGetFile(): void {
 		$manager = $this->getManager();
 		$file = $manager->getTemporaryFile('txt');
 		$this->assertStringEndsWith('.txt', $file);
@@ -66,7 +68,7 @@ class TempManagerTest extends \Test\TestCase {
 		$this->assertEquals('bar', file_get_contents($file));
 	}
 
-	public function testGetFolder() {
+	public function testGetFolder(): void {
 		$manager = $this->getManager();
 		$folder = $manager->getTemporaryFolder();
 		$this->assertStringEndsWith('/', $folder);
@@ -77,7 +79,7 @@ class TempManagerTest extends \Test\TestCase {
 		$this->assertEquals('bar', file_get_contents($folder . 'foo.txt'));
 	}
 
-	public function testCleanFiles() {
+	public function testCleanFiles(): void {
 		$manager = $this->getManager();
 		$file1 = $manager->getTemporaryFile('txt');
 		$file2 = $manager->getTemporaryFile('txt');
@@ -90,7 +92,7 @@ class TempManagerTest extends \Test\TestCase {
 		$this->assertFalse(file_exists($file2));
 	}
 
-	public function testCleanFolder() {
+	public function testCleanFolder(): void {
 		$manager = $this->getManager();
 		$folder1 = $manager->getTemporaryFolder();
 		$folder2 = $manager->getTemporaryFolder();
@@ -109,7 +111,7 @@ class TempManagerTest extends \Test\TestCase {
 		$this->assertFalse(file_exists($folder1 . 'bar.txt'));
 	}
 
-	public function testCleanOld() {
+	public function testCleanOld(): void {
 		$manager = $this->getManager();
 		$oldFile = $manager->getTemporaryFile('txt');
 		$newFile = $manager->getTemporaryFile('txt');
@@ -130,7 +132,7 @@ class TempManagerTest extends \Test\TestCase {
 		$this->assertTrue(file_exists($newFile));
 	}
 
-	public function testLogCantCreateFile() {
+	public function testLogCantCreateFile(): void {
 		$this->markTestSkipped('TODO: Disable because fails on drone');
 
 		$logger = $this->createMock(LoggerInterface::class);
@@ -142,7 +144,7 @@ class TempManagerTest extends \Test\TestCase {
 		$this->assertFalse($manager->getTemporaryFile('txt'));
 	}
 
-	public function testLogCantCreateFolder() {
+	public function testLogCantCreateFolder(): void {
 		$this->markTestSkipped('TODO: Disable because fails on drone');
 
 		$logger = $this->createMock(LoggerInterface::class);
@@ -154,41 +156,30 @@ class TempManagerTest extends \Test\TestCase {
 		$this->assertFalse($manager->getTemporaryFolder());
 	}
 
-	public function testBuildFileNameWithPostfix() {
+	public function testGenerateTemporaryPathWithPostfix(): void {
 		$logger = $this->createMock(LoggerInterface::class);
 		$tmpManager = self::invokePrivate(
 			$this->getManager($logger),
-			'buildFileNameWithSuffix',
-			['/tmp/myTemporaryFile', 'postfix']
+			'generateTemporaryPath',
+			['postfix']
 		);
 
-		$this->assertEquals('/tmp/myTemporaryFile-.postfix', $tmpManager);
+		$this->assertStringEndsWith('.postfix', $tmpManager);
 	}
 
-	public function testBuildFileNameWithoutPostfix() {
+	public function testGenerateTemporaryPathTraversal(): void {
 		$logger = $this->createMock(LoggerInterface::class);
 		$tmpManager = self::invokePrivate(
 			$this->getManager($logger),
-			'buildFileNameWithSuffix',
-			['/tmp/myTemporaryFile', '']
-		);
-
-		$this->assertEquals('/tmp/myTemporaryFile', $tmpManager);
-	}
-
-	public function testBuildFileNameWithSuffixPathTraversal() {
-		$logger = $this->createMock(LoggerInterface::class);
-		$tmpManager = self::invokePrivate(
-			$this->getManager($logger),
-			'buildFileNameWithSuffix',
-			['foo', '../Traversal\\../FileName']
+			'generateTemporaryPath',
+			['../Traversal\\../FileName']
 		);
 
 		$this->assertStringEndsNotWith('./Traversal\\../FileName', $tmpManager);
 		$this->assertStringEndsWith('.Traversal..FileName', $tmpManager);
 	}
 
-	public function testGetTempBaseDirFromConfig() {
+	public function testGetTempBaseDirFromConfig(): void {
 		$dir = $this->getManager()->getTemporaryFolder();
 
 		$config = $this->createMock(IConfig::class);