1 files changed, 20 insertions, 96 deletions

diff --git a/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php b/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
index 71a4f4adeba..7e054d9a6dc 100644
--- a/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
@@ -1,34 +1,19 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @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/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Files_Sharing\Tests\Controllers;
 
 use OCA\Files_Sharing\Controller\ExternalSharesController;
-use OCP\AppFramework\Http\DataResponse;
+use OCA\Files_Sharing\External\Manager;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\Http\Client\IClientService;
+use OCP\IConfig;
 use OCP\IRequest;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class ExternalShareControllerTest
@@ -40,17 +25,17 @@ class ExternalShareControllerTest extends \Test\TestCase {
 	private $request;
 	/** @var \OCA\Files_Sharing\External\Manager */
 	private $externalManager;
+	/** @var IConfig|MockObject */
+	private $config;
 	/** @var IClientService */
 	private $clientService;
 
-	public function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
-		$this->request = $this->getMockBuilder('\\OCP\\IRequest')
-			->disableOriginalConstructor()->getMock();
-		$this->externalManager = $this->getMockBuilder('\\OCA\\Files_Sharing\\External\\Manager')
-			->disableOriginalConstructor()->getMock();
-		$this->clientService = $this->getMockBuilder('\\OCP\Http\\Client\\IClientService')
-			->disableOriginalConstructor()->getMock();
+		$this->request = $this->createMock(IRequest::class);
+		$this->externalManager = $this->createMock(Manager::class);
+		$this->clientService = $this->createMock(IClientService::class);
+		$this->config = $this->createMock(IConfig::class);
 	}
 
 	/**
@@ -61,20 +46,21 @@ class ExternalShareControllerTest extends \Test\TestCase {
 			'files_sharing',
 			$this->request,
 			$this->externalManager,
-			$this->clientService
+			$this->clientService,
+			$this->config,
 		);
 	}
 
-	public function testIndex() {
+	public function testIndex(): void {
 		$this->externalManager
 			->expects($this->once())
 			->method('getOpenShares')
-			->will($this->returnValue(['MyDummyArray']));
+			->willReturn(['MyDummyArray']);
 
 		$this->assertEquals(new JSONResponse(['MyDummyArray']), $this->getExternalShareController()->index());
 	}
 
-	public function testCreate() {
+	public function testCreate(): void {
 		$this->externalManager
 			->expects($this->once())
 			->method('acceptShare')
@@ -83,7 +69,7 @@ class ExternalShareControllerTest extends \Test\TestCase {
 		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->create(4));
 	}
 
-	public function testDestroy() {
+	public function testDestroy(): void {
 		$this->externalManager
 			->expects($this->once())
 			->method('declineShare')
@@ -91,66 +77,4 @@ class ExternalShareControllerTest extends \Test\TestCase {
 
 		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->destroy(4));
 	}
-
-	public function testRemoteWithValidHttps() {
-		$client = $this->getMockBuilder('\\OCP\\Http\\Client\\IClient')
-			->disableOriginalConstructor()->getMock();
-		$response = $this->getMockBuilder('\\OCP\\Http\\Client\\IResponse')
-			->disableOriginalConstructor()->getMock();
-		$response
-			->expects($this->exactly(2))
-			->method('getBody')
-			->will($this->onConsecutiveCalls('Certainly not a JSON string', '{"installed":true,"maintenance":false,"version":"8.1.0.8","versionstring":"8.1.0","edition":""}'));
-		$client
-			->expects($this->any())
-			->method('get')
-			->will($this->returnValue($response));
-
-		$this->clientService
-			->expects($this->exactly(2))
-			->method('newClient')
-			->will($this->returnValue($client));
-
-		$this->assertEquals(new DataResponse('https'), $this->getExternalShareController()->testRemote('owncloud.org'));
-	}
-
-	public function testRemoteWithWorkingHttp() {
-		$client = $this->getMockBuilder('\\OCP\\Http\\Client\\IClient')
-			->disableOriginalConstructor()->getMock();
-		$response = $this->getMockBuilder('\\OCP\\Http\\Client\\IResponse')
-			->disableOriginalConstructor()->getMock();
-		$client
-			->method('get')
-			->will($this->returnValue($response));
-		$response
-			->expects($this->exactly(5))
-			->method('getBody')
-			->will($this->onConsecutiveCalls('Certainly not a JSON string', 'Certainly not a JSON string', 'Certainly not a JSON string', 'Certainly not a JSON string', '{"installed":true,"maintenance":false,"version":"8.1.0.8","versionstring":"8.1.0","edition":""}'));
-		$this->clientService
-			->expects($this->exactly(5))
-			->method('newClient')
-			->will($this->returnValue($client));
-
-		$this->assertEquals(new DataResponse('http'), $this->getExternalShareController()->testRemote('owncloud.org'));
-	}
-
-	public function testRemoteWithInvalidRemote() {
-		$client = $this->getMockBuilder('\\OCP\\Http\\Client\\IClient')
-			->disableOriginalConstructor()->getMock();
-		$response = $this->getMockBuilder('\\OCP\\Http\\Client\\IResponse')
-			->disableOriginalConstructor()->getMock();
-		$client
-			->method('get')
-			->will($this->returnValue($response));
-		$response
-			->expects($this->exactly(6))
-			->method('getBody')
-			->will($this->returnValue('Certainly not a JSON string'));
-		$this->clientService
-			->expects($this->exactly(6))
-			->method('newClient')
-			->will($this->returnValue($client));
-
-		$this->assertEquals(new DataResponse(false), $this->getExternalShareController()->testRemote('owncloud.org'));
-	}
 }