Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/Http')
-rw-r--r--tests/lib/Http/Client/ClientServiceTest.php4
-rw-r--r--tests/lib/Http/Client/ClientTest.php11
-rw-r--r--tests/lib/Http/Client/LocalAddressCheckerTest.php4
3 files changed, 5 insertions, 14 deletions
diff --git a/tests/lib/Http/Client/ClientServiceTest.php b/tests/lib/Http/Client/ClientServiceTest.php
index f529e25966e..94f4d51ecee 100644
--- a/tests/lib/Http/Client/ClientServiceTest.php
+++ b/tests/lib/Http/Client/ClientServiceTest.php
@@ -17,7 +17,6 @@ use OC\Http\Client\DnsPinMiddleware;
use OC\Http\Client\LocalAddressChecker;
use OCP\ICertificateManager;
use OCP\IConfig;
-use OCP\ILogger;
/**
* Class ClientServiceTest
@@ -28,7 +27,6 @@ class ClientServiceTest extends \Test\TestCase {
$config = $this->createMock(IConfig::class);
/** @var ICertificateManager $certificateManager */
$certificateManager = $this->createMock(ICertificateManager::class);
- $logger = $this->createMock(ILogger::class);
$dnsPinMiddleware = $this->createMock(DnsPinMiddleware::class);
$dnsPinMiddleware
->expects($this->atLeastOnce())
@@ -39,7 +37,6 @@ class ClientServiceTest extends \Test\TestCase {
$clientService = new ClientService(
$config,
- $logger,
$certificateManager,
$dnsPinMiddleware,
$localAddressChecker
@@ -53,7 +50,6 @@ class ClientServiceTest extends \Test\TestCase {
$this->assertEquals(
new Client(
$config,
- $logger,
$certificateManager,
$guzzleClient,
$localAddressChecker
diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php
index 395e82b8a4c..63835a4d4cd 100644
--- a/tests/lib/Http/Client/ClientTest.php
+++ b/tests/lib/Http/Client/ClientTest.php
@@ -15,7 +15,6 @@ use OC\Security\CertificateManager;
use OCP\Http\Client\LocalServerException;
use OCP\ICertificateManager;
use OCP\IConfig;
-use OCP\ILogger;
use PHPUnit\Framework\MockObject\MockObject;
/**
@@ -30,8 +29,6 @@ class ClientTest extends \Test\TestCase {
private $client;
/** @var IConfig|MockObject */
private $config;
- /** @var ILogger|MockObject */
- private $logger;
/** @var LocalAddressChecker|MockObject */
private $localAddressChecker;
/** @var array */
@@ -40,13 +37,11 @@ class ClientTest extends \Test\TestCase {
protected function setUp(): void {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
- $this->logger = $this->createMock(ILogger::class);
$this->guzzleClient = $this->createMock(\GuzzleHttp\Client::class);
$this->certificateManager = $this->createMock(ICertificateManager::class);
$this->localAddressChecker = $this->createMock(LocalAddressChecker::class);
$this->client = new Client(
$this->config,
- $this->logger,
$this->certificateManager,
$this->guzzleClient,
$this->localAddressChecker
@@ -244,7 +239,7 @@ class ClientTest extends \Test\TestCase {
->method('ThrowIfLocalAddress')
->with('http://' . $uri)
->will($this->throwException(new LocalServerException()));
-
+
$this->client->post('http://' . $uri);
}
@@ -259,7 +254,7 @@ class ClientTest extends \Test\TestCase {
->method('ThrowIfLocalAddress')
->with('http://' . $uri)
->will($this->throwException(new LocalServerException()));
-
+
$this->client->put('http://' . $uri);
}
@@ -292,7 +287,7 @@ class ClientTest extends \Test\TestCase {
->method('getSystemValueBool')
->with('allow_local_remote_servers', false)
->willReturn(true);
-
+
$this->certificateManager
->expects($this->once())
->method('getAbsoluteBundlePath')
diff --git a/tests/lib/Http/Client/LocalAddressCheckerTest.php b/tests/lib/Http/Client/LocalAddressCheckerTest.php
index b2e09c0700b..0bba1cee5f4 100644
--- a/tests/lib/Http/Client/LocalAddressCheckerTest.php
+++ b/tests/lib/Http/Client/LocalAddressCheckerTest.php
@@ -26,9 +26,9 @@ declare(strict_types=1);
namespace Test\Http\Client;
-use OCP\ILogger;
use OCP\Http\Client\LocalServerException;
use OC\Http\Client\LocalAddressChecker;
+use Psr\Log\LoggerInterface;
class LocalAddressCheckerTest extends \Test\TestCase {
/** @var LocalAddressChecker */
@@ -37,7 +37,7 @@ class LocalAddressCheckerTest extends \Test\TestCase {
protected function setUp(): void {
parent::setUp();
- $logger = $this->createMock(ILogger::class);
+ $logger = $this->createMock(LoggerInterface::class);
$this->localAddressChecker = new LocalAddressChecker($logger);
}