Fix getMock TempManagerTest
This commit is contained in:
parent
80c519fe89
commit
9d4729cb6a
|
@ -10,6 +10,7 @@
|
||||||
namespace Test;
|
namespace Test;
|
||||||
|
|
||||||
use OC\Log;
|
use OC\Log;
|
||||||
|
use OCP\IConfig;
|
||||||
|
|
||||||
class NullLogger extends Log {
|
class NullLogger extends Log {
|
||||||
public function __construct($logger = null) {
|
public function __construct($logger = null) {
|
||||||
|
@ -50,7 +51,7 @@ class TempManagerTest extends \Test\TestCase {
|
||||||
$logger = new NullLogger();
|
$logger = new NullLogger();
|
||||||
}
|
}
|
||||||
if (!$config) {
|
if (!$config) {
|
||||||
$config = $this->getMock('\OCP\IConfig');
|
$config = $this->createMock(IConfig::class);
|
||||||
$config->method('getSystemValue')
|
$config->method('getSystemValue')
|
||||||
->with('tempdirectory', null)
|
->with('tempdirectory', null)
|
||||||
->willReturn('/tmp');
|
->willReturn('/tmp');
|
||||||
|
@ -140,7 +141,7 @@ class TempManagerTest extends \Test\TestCase {
|
||||||
public function testLogCantCreateFile() {
|
public function testLogCantCreateFile() {
|
||||||
$this->markTestSkipped('TODO: Disable because fails on drone');
|
$this->markTestSkipped('TODO: Disable because fails on drone');
|
||||||
|
|
||||||
$logger = $this->getMock('\Test\NullLogger');
|
$logger = $this->createMock(NullLogger::class);
|
||||||
$manager = $this->getManager($logger);
|
$manager = $this->getManager($logger);
|
||||||
chmod($this->baseDir, 0500);
|
chmod($this->baseDir, 0500);
|
||||||
$logger->expects($this->once())
|
$logger->expects($this->once())
|
||||||
|
@ -152,7 +153,7 @@ class TempManagerTest extends \Test\TestCase {
|
||||||
public function testLogCantCreateFolder() {
|
public function testLogCantCreateFolder() {
|
||||||
$this->markTestSkipped('TODO: Disable because fails on drone');
|
$this->markTestSkipped('TODO: Disable because fails on drone');
|
||||||
|
|
||||||
$logger = $this->getMock('\Test\NullLogger');
|
$logger = $this->createMock(NullLogger::class);
|
||||||
$manager = $this->getManager($logger);
|
$manager = $this->getManager($logger);
|
||||||
chmod($this->baseDir, 0500);
|
chmod($this->baseDir, 0500);
|
||||||
$logger->expects($this->once())
|
$logger->expects($this->once())
|
||||||
|
@ -162,7 +163,7 @@ class TempManagerTest extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testBuildFileNameWithPostfix() {
|
public function testBuildFileNameWithPostfix() {
|
||||||
$logger = $this->getMock('\Test\NullLogger');
|
$logger = $this->createMock(NullLogger::class);
|
||||||
$tmpManager = self::invokePrivate(
|
$tmpManager = self::invokePrivate(
|
||||||
$this->getManager($logger),
|
$this->getManager($logger),
|
||||||
'buildFileNameWithSuffix',
|
'buildFileNameWithSuffix',
|
||||||
|
@ -173,7 +174,7 @@ class TempManagerTest extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testBuildFileNameWithoutPostfix() {
|
public function testBuildFileNameWithoutPostfix() {
|
||||||
$logger = $this->getMock('\Test\NullLogger');
|
$logger = $this->createMock(NullLogger::class);
|
||||||
$tmpManager = self::invokePrivate(
|
$tmpManager = self::invokePrivate(
|
||||||
$this->getManager($logger),
|
$this->getManager($logger),
|
||||||
'buildFileNameWithSuffix',
|
'buildFileNameWithSuffix',
|
||||||
|
@ -184,7 +185,7 @@ class TempManagerTest extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testBuildFileNameWithSuffixPathTraversal() {
|
public function testBuildFileNameWithSuffixPathTraversal() {
|
||||||
$logger = $this->getMock('\Test\NullLogger');
|
$logger = $this->createMock(NullLogger::class);
|
||||||
$tmpManager = self::invokePrivate(
|
$tmpManager = self::invokePrivate(
|
||||||
$this->getManager($logger),
|
$this->getManager($logger),
|
||||||
'buildFileNameWithSuffix',
|
'buildFileNameWithSuffix',
|
||||||
|
@ -198,7 +199,7 @@ class TempManagerTest extends \Test\TestCase {
|
||||||
public function testGetTempBaseDirFromConfig() {
|
public function testGetTempBaseDirFromConfig() {
|
||||||
$dir = $this->getManager()->getTemporaryFolder();
|
$dir = $this->getManager()->getTemporaryFolder();
|
||||||
|
|
||||||
$config = $this->getMock('\OCP\IConfig');
|
$config = $this->createMock(IConfig::class);
|
||||||
$config->expects($this->once())
|
$config->expects($this->once())
|
||||||
->method('getSystemValue')
|
->method('getSystemValue')
|
||||||
->with('tempdirectory', null)
|
->with('tempdirectory', null)
|
||||||
|
|
Loading…
Reference in New Issue