1 files changed, 81 insertions, 50 deletions

diff --git a/apps/user_ldap/tests/HelperTest.php b/apps/user_ldap/tests/HelperTest.php
index 31d17cbaede..adea600d900 100644
--- a/apps/user_ldap/tests/HelperTest.php
+++ b/apps/user_ldap/tests/HelperTest.php
@@ -1,101 +1,132 @@
 <?php
+
+declare(strict_types=1);
 /**
- *
- *
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @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/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 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;
 
+/**
+ * @group DB
+ */
 class HelperTest extends \Test\TestCase {
+	private IAppConfig&MockObject $appConfig;
 
-	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
-	private $config;
+	private Helper $helper;
 
-	/** @var Helper */
-	private $helper;
-
-	public function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
-		$this->config = $this->createMock(IConfig::class);
-		$this->helper = new Helper($this->config);
+		$this->appConfig = $this->createMock(IAppConfig::class);
+		$this->helper = new Helper(
+			$this->appConfig,
+			Server::get(IDBConnection::class)
+		);
 	}
 
-	public function testGetServerConfigurationPrefixes() {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
+	public function testGetServerConfigurationPrefixes(): void {
+		$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() {
-		$this->config->method('getAppKeys')
-			->with($this->equalTo('user_ldap'))
+	public function testGetServerConfigurationPrefixesActive(): void {
+		$this->appConfig->method('getKeys')
+			->with('user_ldap')
 			->willReturn([
 				'foo',
 				'ldap_configuration_active',
 				's1ldap_configuration_active',
 			]);
 
-		$this->config->method('getAppValue')
-			->will($this->returnCallback(function($app, $key, $default) {
-				if ($app !== 'user_ldap') {
-					$this->fail('wrong app');
-				}
+		$this->appConfig->method('getValueArray')
+			->with('user_ldap', 'configuration_prefixes')
+			-> willReturnArgument(2);
+
+		$this->appConfig->method('getValueString')
+			->willReturnCallback(function ($app, $key, $default) {
 				if ($key === 's1ldap_configuration_active') {
 					return '1';
 				}
 				return $default;
-			}));
+			});
 
 		$result = $this->helper->getServerConfigurationPrefixes(true);
 
 		$this->assertEquals(['s1'], $result);
 	}
 
-	public function testGetServerConfigurationHost() {
-		$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')
-			->will($this->returnCallback(function($app, $key, $default) {
-				if ($app !== 'user_ldap') {
-					$this->fail('wrong app');
+		$this->appConfig->method('getValueArray')
+			->with('user_ldap', 'configuration_prefixes')
+			-> willReturnArgument(2);
+
+		$this->appConfig->method('getValueString')
+			->willReturnCallback(function ($app, $key, $default) {
+				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';
 				}
@@ -103,7 +134,7 @@ class HelperTest extends \Test\TestCase {
 					return 'foo.bar.com';
 				}
 				return $default;
-			}));
+			});
 
 		$result = $this->helper->getServerConfigurationHosts();