Merge pull request #15965 from owncloud/conditional-logging

Conditional logging

1 files changed, 27 insertions, 3 deletions

diff --git a/tests/lib/logger.php b/tests/lib/logger.php
index 700a847917b..9a9f5be12fc 100644
--- a/tests/lib/logger.php
+++ b/tests/lib/logger.php
@@ -21,14 +21,38 @@ class Logger extends TestCase {
 		parent::setUp();
 
 		self::$logs = array();
-		$this->logger = new Log('Test\Logger');
+		$this->config = $this->getMockBuilder(
+			'\OC\SystemConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->logger = new Log('Test\Logger', $this->config);
 	}
 
 	public function testInterpolation() {
 		$logger = $this->logger;
-		$logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+		$logger->warning('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
 
-		$expected = array('1 {Message {nothing} Bob Bar a}');
+		$expected = array('2 {Message {nothing} Bob Bar a}');
+		$this->assertEquals($expected, $this->getLogs());
+	}
+
+	public function testAppCondition() {
+		$this->config->expects($this->any())
+			->method('getValue')
+			->will(($this->returnValueMap([
+				['loglevel', \OC_Log::WARN, \OC_Log::WARN],
+				['log.condition', [], ['apps' => ['files']]]
+			])));
+		$logger = $this->logger;
+
+		$logger->info('Don\'t display info messages');
+		$logger->info('Show info messages of files app', ['app' => 'files']);
+		$logger->warning('Show warning messages of other apps');
+
+		$expected = [
+			'1 Show info messages of files app',
+			'2 Show warning messages of other apps',
+		];
 		$this->assertEquals($expected, $this->getLogs());
 	}