aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Core/Command/Config/ListConfigsTest.php16
-rw-r--r--tests/lib/AppFramework/Http/RequestTest.php26
-rw-r--r--tests/lib/Collaboration/Collaborators/MailPluginTest.php4
-rw-r--r--tests/lib/Collaboration/Collaborators/RemotePluginTest.php4
-rw-r--r--tests/lib/Federation/CloudIdManagerTest.php4
-rw-r--r--tests/lib/Share20/DefaultShareProviderTest.php10
6 files changed, 47 insertions, 17 deletions
diff --git a/tests/Core/Command/Config/ListConfigsTest.php b/tests/Core/Command/Config/ListConfigsTest.php
index 2f2de288e9d..e4af55116c0 100644
--- a/tests/Core/Command/Config/ListConfigsTest.php
+++ b/tests/Core/Command/Config/ListConfigsTest.php
@@ -70,10 +70,10 @@ class ListConfigsTest extends TestCase {
],
// app config
[
- ['files', false, [
+ ['files', [
'enabled' => 'yes',
]],
- ['core', false, [
+ ['core', [
'global_cache_gc_lastrun' => '1430388388',
]],
],
@@ -150,10 +150,10 @@ class ListConfigsTest extends TestCase {
],
// app config
[
- ['files', false, [
+ ['files', [
'enabled' => 'yes',
]],
- ['core', false, [
+ ['core', [
'global_cache_gc_lastrun' => '1430388388',
]],
],
@@ -185,10 +185,10 @@ class ListConfigsTest extends TestCase {
],
// app config
[
- ['files', false, [
+ ['files', [
'enabled' => 'yes',
]],
- ['core', false, [
+ ['core', [
'global_cache_gc_lastrun' => '1430388388',
]],
],
@@ -213,10 +213,10 @@ class ListConfigsTest extends TestCase {
],
// app config
[
- ['files', false, [
+ ['files', [
'enabled' => 'yes',
]],
- ['core', false, [
+ ['core', [
'global_cache_gc_lastrun' => '1430388388',
]],
],
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index a7ff123fc25..7ea2cb31482 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -777,12 +777,12 @@ class RequestTest extends \Test\TestCase {
$this->assertSame($expected, $request->getHttpProtocol());
}
- public function testGetServerProtocolWithOverride(): void {
+ public function testGetServerProtocolWithOverrideValid(): void {
$this->config
->expects($this->exactly(3))
->method('getSystemValueString')
->willReturnMap([
- ['overwriteprotocol', '', 'customProtocol'],
+ ['overwriteprotocol', '', 'HTTPS'], // should be automatically lowercased
['overwritecondaddr', '', ''],
]);
@@ -794,7 +794,27 @@ class RequestTest extends \Test\TestCase {
$this->stream
);
- $this->assertSame('customProtocol', $request->getServerProtocol());
+ $this->assertSame('https', $request->getServerProtocol());
+ }
+
+ public function testGetServerProtocolWithOverrideInValid(): void {
+ $this->config
+ ->expects($this->exactly(3))
+ ->method('getSystemValueString')
+ ->willReturnMap([
+ ['overwriteprotocol', '', 'bogusProtocol'], // should trigger fallback to http
+ ['overwritecondaddr', '', ''],
+ ]);
+
+ $request = new Request(
+ [],
+ $this->requestId,
+ $this->config,
+ $this->csrfTokenManager,
+ $this->stream
+ );
+
+ $this->assertSame('http', $request->getServerProtocol());
}
public function testGetServerProtocolWithProtoValid(): void {
diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
index 502b7844a2a..b38b961a512 100644
--- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
@@ -64,11 +64,11 @@ class MailPluginTest extends TestCase {
$this->userSession = $this->createMock(IUserSession::class);
$this->mailer = $this->createMock(IMailer::class);
$this->cloudIdManager = new CloudIdManager(
+ $this->createMock(ICacheFactory::class),
+ $this->createMock(IEventDispatcher::class),
$this->contactsManager,
$this->createMock(IURLGenerator::class),
$this->createMock(IUserManager::class),
- $this->createMock(ICacheFactory::class),
- $this->createMock(IEventDispatcher::class)
);
$this->searchResult = new SearchResult();
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index ea81b1cbcdc..a9a5e05dfe4 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -49,11 +49,11 @@ class RemotePluginTest extends TestCase {
$this->config = $this->createMock(IConfig::class);
$this->contactsManager = $this->createMock(IManager::class);
$this->cloudIdManager = new CloudIdManager(
+ $this->createMock(ICacheFactory::class),
+ $this->createMock(IEventDispatcher::class),
$this->contactsManager,
$this->createMock(IURLGenerator::class),
$this->createMock(IUserManager::class),
- $this->createMock(ICacheFactory::class),
- $this->createMock(IEventDispatcher::class)
);
$this->searchResult = new SearchResult();
}
diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/lib/Federation/CloudIdManagerTest.php
index 3bd3cf6149d..cf97c895dc1 100644
--- a/tests/lib/Federation/CloudIdManagerTest.php
+++ b/tests/lib/Federation/CloudIdManagerTest.php
@@ -47,11 +47,11 @@ class CloudIdManagerTest extends TestCase {
->willReturn(new ArrayCache(''));
$this->cloudIdManager = new CloudIdManager(
+ $this->cacheFactory,
+ $this->createMock(IEventDispatcher::class),
$this->contactsManager,
$this->urlGenerator,
$this->userManager,
- $this->cacheFactory,
- $this->createMock(IEventDispatcher::class)
);
$this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
}
diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index eaf17fa1a26..bacf2b61ee3 100644
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -20,6 +20,7 @@ use OCP\Defaults;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
+use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IGroup;
use OCP\IGroupManager;
@@ -79,6 +80,8 @@ class DefaultShareProviderTest extends \Test\TestCase {
/** @var LoggerInterface|MockObject */
protected $logger;
+ protected IConfig&MockObject $config;
+
protected IShareManager&MockObject $shareManager;
protected function setUp(): void {
@@ -94,6 +97,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->logger = $this->createMock(LoggerInterface::class);
$this->shareManager = $this->createMock(IShareManager::class);
+ $this->config = $this->createMock(IConfig::class);
$this->userManager->expects($this->any())->method('userExists')->willReturn(true);
$this->timeFactory->expects($this->any())->method('now')->willReturn(new \DateTimeImmutable('2023-05-04 00:00 Europe/Berlin'));
@@ -113,6 +117,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->timeFactory,
$this->logger,
$this->shareManager,
+ $this->config,
);
}
@@ -477,6 +482,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->timeFactory,
$this->logger,
$this->shareManager,
+ $this->config,
])
->onlyMethods(['getShareById'])
->getMock();
@@ -574,6 +580,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->timeFactory,
$this->logger,
$this->shareManager,
+ $this->config,
])
->onlyMethods(['getShareById'])
->getMock();
@@ -2566,6 +2573,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->timeFactory,
$this->logger,
$this->shareManager,
+ $this->config,
);
$password = md5(time());
@@ -2666,6 +2674,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->timeFactory,
$this->logger,
$this->shareManager,
+ $this->config,
);
$u1 = $userManager->createUser('testShare1', 'test');
@@ -2769,6 +2778,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->timeFactory,
$this->logger,
$this->shareManager,
+ $this->config,
);
$u1 = $userManager->createUser('testShare1', 'test');
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-04 07:51:40 +0000