From cf849e621b378b87d92845f67fe0281770292269 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 12 Jan 2017 10:49:22 +0100
Subject: [PATCH] Fix tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/private/SystemConfig.php                  |  1 -
 tests/Core/Command/Config/ListConfigsTest.php |  6 +++++
 tests/lib/AppConfigTest.php                   | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php
index 1029a6619ff..e5f1adaf004 100644
--- a/lib/private/SystemConfig.php
+++ b/lib/private/SystemConfig.php
@@ -44,7 +44,6 @@ class SystemConfig {
 		'passwordsalt' => true,
 		'secret' => true,
 		'updater.secret' => true,
-		'ldap_agent_password' => true,
 		'proxyuserpwd' => true,
 		'log.condition' => [
 			'shared_secret' => true,
diff --git a/tests/Core/Command/Config/ListConfigsTest.php b/tests/Core/Command/Config/ListConfigsTest.php
index 0f170cee840..861c1f59d5e 100644
--- a/tests/Core/Command/Config/ListConfigsTest.php
+++ b/tests/Core/Command/Config/ListConfigsTest.php
@@ -285,10 +285,16 @@ class ListConfigsTest extends TestCase {
 			$this->systemConfig->expects($this->any())
 				->method('getValue')
 				->willReturnMap($systemConfigMap);
+			$this->appConfig->expects($this->any())
+				->method('getValues')
+				->willReturnMap($appConfig);
 		} else {
 			$this->systemConfig->expects($this->any())
 				->method('getFilteredValue')
 				->willReturnMap($systemConfigMap);
+			$this->appConfig->expects($this->any())
+				->method('getFilteredValues')
+				->willReturnMap($appConfig);
 		}
 
 		$this->appConfig->expects($this->any())
diff --git a/tests/lib/AppConfigTest.php b/tests/lib/AppConfigTest.php
index c4da7507752..fed929352d3 100644
--- a/tests/lib/AppConfigTest.php
+++ b/tests/lib/AppConfigTest.php
@@ -8,6 +8,7 @@
  */
 
 namespace Test;
+use OCP\IConfig;
 
 /**
  * Class AppConfigTest
@@ -305,6 +306,28 @@ class AppConfigTest extends TestCase {
 		$this->assertEquals($expected, $values);
 	}
 
+	public function testGetFilteredValues() {
+		/** @var \OC\AppConfig|\PHPUnit_Framework_MockObject_MockObject $config */
+		$config = $this->getMockBuilder(\OC\AppConfig::class)
+			->setConstructorArgs([\OC::$server->getDatabaseConnection()])
+			->setMethods(['getValues'])
+			->getMock();
+
+		$config->expects($this->once())
+			->method('getValues')
+			->with('user_ldap', false)
+			->willReturn([
+				'ldap_agent_password' => 'secret',
+				'ldap_dn' => 'dn',
+			]);
+
+		$values = $config->getFilteredValues('user_ldap');
+		$this->assertEquals([
+			'ldap_agent_password' => IConfig::SENSITIVE_VALUE,
+			'ldap_dn' => 'dn',
+		], $values);
+	}
+
 	public function testSettingConfigParallel() {
 		$appConfig1 = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 		$appConfig2 = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
-- 
2.39.5