More cleaning after auto-add removal

Signed-off-by: Joas Schilling <coding@schilljs.com>

3 files changed, 0 insertions, 124 deletions

diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php
deleted file mode 100644
index 8741ddb9fd6..00000000000
--- a/apps/federation/tests/HooksTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Federation\Tests;
-
-use OCA\Federation\Hooks;
-use OCA\Federation\TrustedServers;
-use Test\TestCase;
-
-class HooksTest extends TestCase {
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */
-	private $trustedServers;
-
-	/** @var  Hooks */
-	private $hooks;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
-			->disableOriginalConstructor()->getMock();
-
-		$this->hooks = new Hooks($this->trustedServers);
-	}
-
-	/**
-	 * @dataProvider dataTestAddServerHook
-	 *
-	 * @param bool $autoAddEnabled is auto-add enabled
-	 * @param bool $isTrustedServer is the server already in the list of trusted servers
-	 * @param bool $addServer should the server be added
-	 */
-	public function testAddServerHook($autoAddEnabled, $isTrustedServer, $addServer) {
-		$this->trustedServers->expects($this->any())->method('getAutoAddServers')
-			->willReturn($autoAddEnabled);
-		$this->trustedServers->expects($this->any())->method('isTrustedServer')
-				->with('url')->willReturn($isTrustedServer);
-
-		if ($addServer) {
-			$this->trustedServers->expects($this->once())->method('addServer')
-				->with('url');
-		} else {
-			$this->trustedServers->expects($this->never())->method('addServer');
-		}
-
-		$this->hooks->addServerHook(['server' => 'url']);
-	}
-
-	public function dataTestAddServerHook() {
-		return [
-			[true, true, false],
-			[false, true, false],
-			[true, false, true],
-			[false, false, false],
-		];
-	}
-}
diff --git a/apps/federation/tests/Settings/AdminTest.php b/apps/federation/tests/Settings/AdminTest.php
index 75ccabb968f..9c60f732f96 100644
--- a/apps/federation/tests/Settings/AdminTest.php
+++ b/apps/federation/tests/Settings/AdminTest.php
@@ -48,14 +48,9 @@ class AdminTest extends TestCase {
 			->expects($this->once())
 			->method('getServers')
 			->willReturn(['myserver', 'secondserver']);
-		$this->trustedServers
-			->expects($this->once())
-			->method('getAutoAddServers')
-			->willReturn(['autoserver1', 'autoserver2']);
 
 		$params = [
 			'trustedServers' => ['myserver', 'secondserver'],
-			'autoAddServers' => ['autoserver1', 'autoserver2'],
 		];
 		$expected = new TemplateResponse('federation', 'settings-admin', $params, '');
 		$this->assertEquals($expected, $this->admin->getForm());
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index 5cb494643b8..bc16f14eedd 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -156,45 +156,6 @@ class TrustedServersTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataTrueFalse
-	 *
-	 * @param bool $status
-	 */
-	public function testSetAutoAddServers($status) {
-		if ($status) {
-			$this->config->expects($this->once())->method('setAppValue')
-				->with('federation', 'autoAddServers', '1');
-		} else {
-			$this->config->expects($this->once())->method('setAppValue')
-				->with('federation', 'autoAddServers', '0');
-		}
-
-		$this->trustedServers->setAutoAddServers($status);
-	}
-
-	/**
-	 * @dataProvider dataTestGetAutoAddServers
-	 *
-	 * @param string $status
-	 * @param bool $expected
-	 */
-	public function testGetAutoAddServers($status, $expected) {
-		$this->config->expects($this->once())->method('getAppValue')
-			->with('federation', 'autoAddServers', '0')->willReturn($status);
-
-		$this->assertSame($expected,
-			$this->trustedServers->getAutoAddServers()
-		);
-	}
-
-	public function dataTestGetAutoAddServers() {
-		return [
-			['1', true],
-			['0', false]
-		];
-	}
-
 	public function testAddSharedSecret() {
 		$this->dbHandler->expects($this->once())->method('addSharedSecret')
 			->with('url', 'secret');