destaticfy Log classes

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

3 files changed, 163 insertions, 30 deletions

diff --git a/tests/lib/Log/FileTest.php b/tests/lib/Log/FileTest.php
index 53b5c62e81a..33f0ee8dd19 100644
--- a/tests/lib/Log/FileTest.php
+++ b/tests/lib/Log/FileTest.php
@@ -31,6 +31,9 @@ class FileTest extends TestCase
 	private $restore_logfile;
 	private $restore_logdateformat;
 
+	/** @var File */
+	protected $logFile;
+
 	protected function setUp() {
 		parent::setUp();
 		$config = \OC::$server->getConfig();
@@ -38,7 +41,7 @@ class FileTest extends TestCase
 		$this->restore_logdateformat = $config->getSystemValue('logdateformat');
 		
 		$config->setSystemValue("logfile", $config->getSystemValue('datadirectory') . "/logtest");
-		File::init();
+		$this->logFile = new File($config->getSystemValue('datadirectory') . '/logtest');
 	}
 	protected function tearDown() {
 		$config = \OC::$server->getConfig();
@@ -51,8 +54,8 @@ class FileTest extends TestCase
 			$config->getSystemValue("logdateformat", $this->restore_logdateformat);
 		} else {
 			$config->deleteSystemValue("logdateformat");
-		}		
-		File::init();
+		}
+		$this->logFile = new File($this->restore_logfile);
 		parent::tearDown();
 	}
 	
@@ -63,7 +66,7 @@ class FileTest extends TestCase
 
 		# set format & write log line
 		$config->setSystemValue('logdateformat', 'u');
-		File::write('test', 'message', ILogger::ERROR);
+		$this->logFile->write('test', 'message', ILogger::ERROR);
 
 		# read log line
 		$handle = @fopen($config->getSystemValue('logfile'), 'r');
diff --git a/tests/lib/Log/LogFactoryTest.php b/tests/lib/Log/LogFactoryTest.php
new file mode 100644
index 00000000000..8c1b7f08c74
--- /dev/null
+++ b/tests/lib/Log/LogFactoryTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\Log;
+use OC\Log\Errorlog;
+use OC\Log\File;
+use OC\Log\LogFactory;
+use OC\Log\Syslog;
+use OCP\IConfig;
+use OCP\IServerContainer;
+use Test\TestCase;
+
+/**
+ * Class LogFactoryTest
+ *
+ * @package Test\Log
+ */
+class LogFactoryTest extends TestCase {
+	/** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */
+	protected $c;
+
+	/** @var LogFactory */
+	protected $factory;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->c = $this->createMock(IServerContainer::class);
+
+		$this->factory = new LogFactory($this->c);
+	}
+
+	public function fileTypeProvider(): array {
+		return [
+			[
+				'file'
+			],
+			[
+				'nextcloud'
+			],
+			[
+				'owncloud'
+			],
+			[
+				'krzxkyr_default'
+			]
+		];
+	}
+
+	/**
+	 * @param string $type
+	 * @dataProvider fileTypeProvider
+	 * @throws \OCP\AppFramework\QueryException
+	 */
+	public function testFile(string $type) {
+		$datadir = \OC::$SERVERROOT.'/data';
+		$defaultLog = $datadir . '/nextcloud.log';
+
+		$config = $this->createMock(IConfig::class);
+		$config->expects($this->exactly(2))
+			->method('getSystemValue')
+			->withConsecutive(['datadirectory', $datadir], ['logfile', $defaultLog])
+			->willReturnOnConsecutiveCalls($datadir, $defaultLog);
+
+		$this->c->expects($this->any())
+			->method('getConfig')
+			->willReturn($config);
+
+		$log = $this->factory->get($type);
+		$this->assertInstanceOf(File::class, $log);
+	}
+
+	public function logFilePathProvider():array {
+		return [
+			[
+				'/dev/null',
+				'/dev/null'
+			],
+			[
+				'/xdev/youshallfallback',
+				\OC::$SERVERROOT.'/data/nextcloud.log'
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider logFilePathProvider
+	 * @throws \OCP\AppFramework\QueryException
+	 */
+	public function testFileCustomPath($path, $expected) {
+		$datadir = \OC::$SERVERROOT.'/data';
+		$defaultLog = $datadir . '/nextcloud.log';
+
+		$config = $this->createMock(IConfig::class);
+		$config->expects($this->exactly(2))
+			->method('getSystemValue')
+			->withConsecutive(['datadirectory', $datadir], ['logfile', $defaultLog])
+			->willReturnOnConsecutiveCalls($datadir, $path);
+
+		$this->c->expects($this->any())
+			->method('getConfig')
+			->willReturn($config);
+
+		$log = $this->factory->get('file');
+		$this->assertInstanceOf(File::class, $log);
+		$this->assertSame($expected, $log->getLogFilePath());
+	}
+
+	/**
+	 * @throws \OCP\AppFramework\QueryException
+	 */
+	public function testErrorLog() {
+		$log = $this->factory->get('errorlog');
+		$this->assertInstanceOf(Errorlog::class, $log);
+	}
+
+	/**
+	 * @throws \OCP\AppFramework\QueryException
+	 */
+	public function testSystemLog() {
+		$this->c->expects($this->once())
+			->method('resolve')
+			->with(Syslog::class)
+			->willReturn($this->createMock(Syslog::class));
+
+		$log = $this->factory->get('syslog');
+		$this->assertInstanceOf(Syslog::class, $log);
+	}
+}
diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php
index 6b9c9af8639..3d0847d6c8a 100644
--- a/tests/lib/LoggerTest.php
+++ b/tests/lib/LoggerTest.php
@@ -11,7 +11,7 @@ namespace Test;
 use OC\Log;
 use OCP\ILogger;
 
-class LoggerTest extends TestCase {
+class LoggerTest extends TestCase implements Log\IWritable {
 
 	/** @var \OC\SystemConfig|\PHPUnit_Framework_MockObject_MockObject */
 	private $config;
@@ -23,15 +23,15 @@ class LoggerTest extends TestCase {
 	private $logger;
 
 	/** @var array */
-	static private $logs = array();
+	private $logs = [];
 
 	protected function setUp() {
 		parent::setUp();
 
-		self::$logs = array();
+		$this->logs = [];
 		$this->config = $this->createMock(\OC\SystemConfig::class);
 		$this->registry = $this->createMock(\OCP\Support\CrashReport\IRegistry::class);
-		$this->logger = new Log('Test\LoggerTest', $this->config, null, $this->registry);
+		$this->logger = new Log($this, $this->config, null, $this->registry);
 	}
 
 	public function testInterpolation() {
@@ -63,11 +63,11 @@ class LoggerTest extends TestCase {
 	}
 
 	private function getLogs() {
-		return self::$logs;
+		return $this->logs;
 	}
 
-	public static function write($app, $message, $level) {
-		self::$logs[]= "$level $message";
+	public function write($app, $message, $level) {
+		$this->logs[]= "$level $message";
 	}
 
 	public function userAndPasswordData() {
@@ -202,23 +202,4 @@ class LoggerTest extends TestCase {
 			$this->assertContains('*** sensitive parameters replaced ***', $logLine);
 		}
 	}
-
-	public function dataGetLogClass() {
-		return [
-			['file', \OC\Log\File::class],
-			['errorlog', \OC\Log\Errorlog::class],
-			['syslog', \OC\Log\Syslog::class],
-
-			['owncloud', \OC\Log\File::class],
-			['nextcloud', \OC\Log\File::class],
-			['foobar', \OC\Log\File::class],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetLogClass
-	 */
-	public function testGetLogClass($type, $class) {
-		$this->assertEquals($class, Log::getLogClass($type));
-	}
 }