From 7785c3752fbfef792cd33dc5da2ee63e8263b9fa Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 13 Mar 2018 16:30:41 +0100
Subject: Remove deprecated HTTPHelper

* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 .../Controller/RequestHandlerControllerTest.php    | 32 ----------------------
 1 file changed, 32 deletions(-)

(limited to 'apps')

diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
index d04c75b9a86..035b7da15ca 100644
--- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
+++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
@@ -85,13 +85,6 @@ class RequestHandlerControllerTest extends TestCase {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 		\OC\Share\Share::registerBackend('test', 'Test\Share\Backend');
 
-		$config = $this->getMockBuilder(IConfig::class)
-				->disableOriginalConstructor()->getMock();
-		$clientService = $this->getMockBuilder(IClientService::class)->getMock();
-		$httpHelperMock = $this->getMockBuilder('\OC\HTTPHelper')
-				->setConstructorArgs([$config, $clientService])
-				->getMock();
-		$httpHelperMock->expects($this->any())->method('post')->with($this->anything())->will($this->returnValue(true));
 		$this->share = $this->getMockBuilder(IShare::class)->getMock();
 		$this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider')
 			->disableOriginalConstructor()->getMock();
@@ -110,8 +103,6 @@ class RequestHandlerControllerTest extends TestCase {
 
 		$this->cloudIdManager = new CloudIdManager();
 
-		$this->registerHttpHelper($httpHelperMock);
-
 		$this->s2s = new RequestHandlerController(
 			'federatedfilesharing',
 			\OC::$server->getRequest(),
@@ -134,32 +125,9 @@ class RequestHandlerControllerTest extends TestCase {
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`');
 		$query->execute();
 
-		$this->restoreHttpHelper();
-
 		parent::tearDown();
 	}
 
-	/**
-	 * Register an http helper mock for testing purposes.
-	 * @param \OC\HTTPHelper $httpHelper helper mock
-	 */
-	private function registerHttpHelper($httpHelper) {
-		$this->oldHttpHelper = \OC::$server->query('HTTPHelper');
-		\OC::$server->registerService('HTTPHelper', function ($c) use ($httpHelper) {
-			return $httpHelper;
-		});
-	}
-
-	/**
-	 * Restore the original http helper
-	 */
-	private function restoreHttpHelper() {
-		$oldHttpHelper = $this->oldHttpHelper;
-		\OC::$server->registerService('HTTPHelper', function ($c) use ($oldHttpHelper) {
-			return $oldHttpHelper;
-		});
-	}
-
 	/**
 	 * @medium
 	 */
-- 
cgit v1.2.3