1 files changed, 63 insertions, 18 deletions

diff --git a/apps/user_ldap/tests/HelperTest.php b/apps/user_ldap/tests/HelperTest.php
index 470b67c5531..adea600d900 100644
--- a/apps/user_ldap/tests/HelperTest.php
+++ b/apps/user_ldap/tests/HelperTest.php
@@ -8,7 +8,7 @@ declare(strict_types=1);
 namespace OCA\User_LDAP\Tests;
 
 use OCA\User_LDAP\Helper;
-use OCP\IConfig;
+use OCP\IAppConfig;
 use OCP\IDBConnection;
 use OCP\Server;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -17,45 +17,53 @@ use PHPUnit\Framework\MockObject\MockObject;
  * @group DB
  */
 class HelperTest extends \Test\TestCase {
-	private IConfig&MockObject $config;
+	private IAppConfig&MockObject $appConfig;
 
 	private Helper $helper;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->config = $this->createMock(IConfig::class);
-		$this->helper = new Helper($this->config, Server::get(IDBConnection::class));
+		$this->appConfig = $this->createMock(IAppConfig::class);
+		$this->helper = new Helper(
+			$this->appConfig,
+			Server::get(IDBConnection::class)
+		);
 	}
 
 	public function testGetServerConfigurationPrefixes(): void {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
+		$this->appConfig->method('getKeys')
+			->with('user_ldap')
 			->willReturn([
 				'foo',
 				'ldap_configuration_active',
 				's1ldap_configuration_active',
 			]);
 
+		$this->appConfig->method('getValueArray')
+			->with('user_ldap', 'configuration_prefixes')
+			-> willReturnArgument(2);
+
 		$result = $this->helper->getServerConfigurationPrefixes(false);
 
 		$this->assertEquals(['', 's1'], $result);
 	}
 
 	public function testGetServerConfigurationPrefixesActive(): void {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
+		$this->appConfig->method('getKeys')
+			->with('user_ldap')
 			->willReturn([
 				'foo',
 				'ldap_configuration_active',
 				's1ldap_configuration_active',
 			]);
 
-		$this->config->method('getAppValue')
+		$this->appConfig->method('getValueArray')
+			->with('user_ldap', 'configuration_prefixes')
+			-> willReturnArgument(2);
+
+		$this->appConfig->method('getValueString')
 			->willReturnCallback(function ($app, $key, $default) {
-				if ($app !== 'user_ldap') {
-					$this->fail('wrong app');
-				}
 				if ($key === 's1ldap_configuration_active') {
 					return '1';
 				}
@@ -67,21 +75,58 @@ class HelperTest extends \Test\TestCase {
 		$this->assertEquals(['s1'], $result);
 	}
 
-	public function testGetServerConfigurationHost(): void {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
+	public function testGetServerConfigurationHostFromAppKeys(): void {
+		$this->appConfig->method('getKeys')
+			->with('user_ldap')
 			->willReturn([
 				'foo',
 				'ldap_host',
 				's1ldap_host',
 				's02ldap_host',
+				'ldap_configuration_active',
+				's1ldap_configuration_active',
+				's02ldap_configuration_active',
 			]);
 
-		$this->config->method('getAppValue')
+		$this->appConfig->method('getValueArray')
+			->with('user_ldap', 'configuration_prefixes')
+			-> willReturnArgument(2);
+
+		$this->appConfig->method('getValueString')
 			->willReturnCallback(function ($app, $key, $default) {
-				if ($app !== 'user_ldap') {
-					$this->fail('wrong app');
+				if ($key === 'ldap_host') {
+					return 'example.com';
 				}
+				if ($key === 's1ldap_host') {
+					return 'foo.bar.com';
+				}
+				return $default;
+			});
+
+		$result = $this->helper->getServerConfigurationHosts();
+
+		$this->assertEquals([
+			'' => 'example.com',
+			's1' => 'foo.bar.com',
+			's02' => '',
+		], $result);
+	}
+
+	public function testGetServerConfigurationHost(): void {
+		$this->appConfig
+			->expects(self::never())
+			->method('getKeys');
+
+		$this->appConfig->method('getValueArray')
+			->with('user_ldap', 'configuration_prefixes')
+			-> willReturn([
+				'',
+				's1',
+				's02',
+			]);
+
+		$this->appConfig->method('getValueString')
+			->willReturnCallback(function ($app, $key, $default) {
 				if ($key === 'ldap_host') {
 					return 'example.com';
 				}