Make the method compatible with all types of extensions
Fix existing tests
This commit is contained in:
parent
60b1643f02
commit
f890c3ffb1
|
@ -42,7 +42,10 @@ class TempManager implements ITempManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function generatePath($postFix) {
|
protected function generatePath($postFix) {
|
||||||
return $this->tmpBaseDir . '/oc_tmp_' . md5(time() . rand()) . '.' . $postFix;
|
if ($postFix) {
|
||||||
|
$postFix = '.' . ltrim($postFix, '.');
|
||||||
|
}
|
||||||
|
return $this->tmpBaseDir . '/oc_tmp_' . md5(time() . rand()) . $postFix;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -51,7 +51,7 @@ class TempManager extends \Test\TestCase {
|
||||||
|
|
||||||
public function testGetFile() {
|
public function testGetFile() {
|
||||||
$manager = $this->getManager();
|
$manager = $this->getManager();
|
||||||
$file = $manager->getTemporaryFile('.txt');
|
$file = $manager->getTemporaryFile('txt');
|
||||||
$this->assertStringEndsWith('.txt', $file);
|
$this->assertStringEndsWith('.txt', $file);
|
||||||
$this->assertTrue(is_file($file));
|
$this->assertTrue(is_file($file));
|
||||||
$this->assertTrue(is_writable($file));
|
$this->assertTrue(is_writable($file));
|
||||||
|
@ -73,8 +73,8 @@ class TempManager extends \Test\TestCase {
|
||||||
|
|
||||||
public function testCleanFiles() {
|
public function testCleanFiles() {
|
||||||
$manager = $this->getManager();
|
$manager = $this->getManager();
|
||||||
$file1 = $manager->getTemporaryFile('.txt');
|
$file1 = $manager->getTemporaryFile('txt');
|
||||||
$file2 = $manager->getTemporaryFile('.txt');
|
$file2 = $manager->getTemporaryFile('txt');
|
||||||
$this->assertTrue(file_exists($file1));
|
$this->assertTrue(file_exists($file1));
|
||||||
$this->assertTrue(file_exists($file2));
|
$this->assertTrue(file_exists($file2));
|
||||||
|
|
||||||
|
@ -105,8 +105,8 @@ class TempManager extends \Test\TestCase {
|
||||||
|
|
||||||
public function testCleanOld() {
|
public function testCleanOld() {
|
||||||
$manager = $this->getManager();
|
$manager = $this->getManager();
|
||||||
$oldFile = $manager->getTemporaryFile('.txt');
|
$oldFile = $manager->getTemporaryFile('txt');
|
||||||
$newFile = $manager->getTemporaryFile('.txt');
|
$newFile = $manager->getTemporaryFile('txt');
|
||||||
$folder = $manager->getTemporaryFolder();
|
$folder = $manager->getTemporaryFolder();
|
||||||
$nonOcFile = $this->baseDir . '/foo.txt';
|
$nonOcFile = $this->baseDir . '/foo.txt';
|
||||||
file_put_contents($nonOcFile, 'bar');
|
file_put_contents($nonOcFile, 'bar');
|
||||||
|
@ -135,7 +135,7 @@ class TempManager extends \Test\TestCase {
|
||||||
$logger->expects($this->once())
|
$logger->expects($this->once())
|
||||||
->method('warning')
|
->method('warning')
|
||||||
->with($this->stringContains('Can not create a temporary file in directory'));
|
->with($this->stringContains('Can not create a temporary file in directory'));
|
||||||
$this->assertFalse($manager->getTemporaryFile('.txt'));
|
$this->assertFalse($manager->getTemporaryFile('txt'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testLogCantCreateFolder() {
|
public function testLogCantCreateFolder() {
|
||||||
|
|
Loading…
Reference in New Issue