aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/App/AppStore/Fetcher/FetcherBase.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/App/AppStore/Fetcher/FetcherBase.php')
-rw-r--r--tests/lib/App/AppStore/Fetcher/FetcherBase.php330
1 files changed, 147 insertions, 183 deletions
diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
index 531fdf41e78..a5a9cc73974 100644
--- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php
+++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
@@ -1,22 +1,8 @@
<?php
+
/**
- * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * 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
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace Test\App\AppStore\Fetcher;
@@ -33,7 +19,8 @@ use OCP\Http\Client\IClient;
use OCP\Http\Client\IClientService;
use OCP\Http\Client\IResponse;
use OCP\IConfig;
-use OCP\ILogger;
+use OCP\Support\Subscription\IRegistry;
+use Psr\Log\LoggerInterface;
use Test\TestCase;
abstract class FetcherBase extends TestCase {
@@ -47,8 +34,10 @@ abstract class FetcherBase extends TestCase {
protected $timeFactory;
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
protected $config;
- /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
+ /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
protected $logger;
+ /** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
+ protected $registry;
/** @var Fetcher */
protected $fetcher;
/** @var string */
@@ -67,27 +56,21 @@ abstract class FetcherBase extends TestCase {
$this->clientService = $this->createMock(IClientService::class);
$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->config = $this->createMock(IConfig::class);
- $this->logger = $this->createMock(ILogger::class);
+ $this->logger = $this->createMock(LoggerInterface::class);
+ $this->registry = $this->createMock(IRegistry::class);
}
- public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->willReturn(true);
+ public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion(): void {
$this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('has_internet_connection', true)
- ->willReturn(true);
- $this->config
- ->expects($this->at(2))
- ->method('getSystemValue')
- ->with(
- $this->equalTo('version'),
- $this->anything()
- )->willReturn('11.0.0.2');
+ ->method('getSystemValueString')
+ ->willReturnCallback(function ($var, $default) {
+ if ($var === 'version') {
+ return '11.0.0.2';
+ }
+ return $default;
+ });
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -118,21 +101,19 @@ abstract class FetcherBase extends TestCase {
$this->assertSame($expected, $this->fetcher->get());
}
- public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion() {
+ public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion(): void {
$this->config
- ->method('getSystemValue')
+ ->method('getSystemValueString')
->willReturnCallback(function ($var, $default) {
- if ($var === 'appstoreenabled') {
- return true;
- } elseif ($var === 'has_internet_connection') {
- return true;
- } elseif ($var === 'appstoreurl') {
+ if ($var === 'appstoreurl') {
return 'https://apps.nextcloud.com/api/v1';
} elseif ($var === 'version') {
return '11.0.0.2';
}
return $default;
});
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -142,12 +123,12 @@ abstract class FetcherBase extends TestCase {
->with('/')
->willReturn($folder);
$folder
- ->expects($this->at(0))
+ ->expects($this->once())
->method('getFile')
->with($this->fileName)
->willThrowException(new NotFoundException());
$folder
- ->expects($this->at(1))
+ ->expects($this->once())
->method('newFile')
->with($this->fileName)
->willReturn($file);
@@ -171,15 +152,15 @@ abstract class FetcherBase extends TestCase {
->willReturn('"myETag"');
$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
$file
- ->expects($this->at(0))
+ ->expects($this->once())
->method('putContent')
->with($fileData);
$file
- ->expects($this->at(1))
+ ->expects($this->once())
->method('getContent')
->willReturn($fileData);
$this->timeFactory
- ->expects($this->at(0))
+ ->expects($this->once())
->method('getTime')
->willReturn(1502);
@@ -195,17 +176,17 @@ abstract class FetcherBase extends TestCase {
$this->assertSame($expected, $this->fetcher->get());
}
- public function testGetWithAlreadyExistingFileAndOutdatedTimestamp() {
- $this->config->method('getSystemValue')
+ public function testGetWithAlreadyExistingFileAndOutdatedTimestamp(): void {
+ $this->config->method('getSystemValueString')
->willReturnCallback(function ($key, $default) {
- if ($key === 'appstoreenabled') {
- return true;
- } elseif ($key === 'version') {
+ if ($key === 'version') {
return '11.0.0.2';
} else {
return $default;
}
});
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -219,14 +200,25 @@ abstract class FetcherBase extends TestCase {
->method('getFile')
->with($this->fileName)
->willReturn($file);
+ $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
$file
- ->expects($this->at(0))
+ ->expects($this->once())
+ ->method('putContent')
+ ->with($fileData);
+ $file
+ ->expects($this->exactly(2))
->method('getContent')
- ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.2"}');
+ ->willReturnOnConsecutiveCalls(
+ '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.2"}',
+ $fileData
+ );
$this->timeFactory
- ->expects($this->at(0))
+ ->expects($this->exactly(2))
->method('getTime')
- ->willReturn(4801);
+ ->willReturnOnConsecutiveCalls(
+ 4801,
+ 1502
+ );
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
@@ -245,19 +237,6 @@ abstract class FetcherBase extends TestCase {
$response->method('getHeader')
->with($this->equalTo('ETag'))
->willReturn('"myETag"');
- $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
- $file
- ->expects($this->at(1))
- ->method('putContent')
- ->with($fileData);
- $file
- ->expects($this->at(2))
- ->method('getContent')
- ->willReturn($fileData);
- $this->timeFactory
- ->expects($this->at(1))
- ->method('getTime')
- ->willReturn(1502);
$expected = [
[
@@ -271,21 +250,19 @@ abstract class FetcherBase extends TestCase {
$this->assertSame($expected, $this->fetcher->get());
}
- public function testGetWithAlreadyExistingFileAndNoVersion() {
+ public function testGetWithAlreadyExistingFileAndNoVersion(): void {
$this->config
- ->method('getSystemValue')
+ ->method('getSystemValueString')
->willReturnCallback(function ($var, $default) {
- if ($var === 'appstoreenabled') {
- return true;
- } elseif ($var === 'has_internet_connection') {
- return true;
- } elseif ($var === 'appstoreurl') {
+ if ($var === 'appstoreurl') {
return 'https://apps.nextcloud.com/api/v1';
} elseif ($var === 'version') {
return '11.0.0.2';
}
return $default;
});
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -299,12 +276,20 @@ abstract class FetcherBase extends TestCase {
->method('getFile')
->with($this->fileName)
->willReturn($file);
+ $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+ $file
+ ->expects($this->once())
+ ->method('putContent')
+ ->with($fileData);
$file
- ->expects($this->at(0))
+ ->expects($this->exactly(2))
->method('getContent')
- ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}');
+ ->willReturnOnConsecutiveCalls(
+ '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}',
+ $fileData
+ );
$this->timeFactory
- ->expects($this->at(0))
+ ->expects($this->once())
->method('getTime')
->willReturn(1201);
$client = $this->createMock(IClient::class);
@@ -325,15 +310,6 @@ abstract class FetcherBase extends TestCase {
$response->method('getHeader')
->with($this->equalTo('ETag'))
->willReturn('"myETag"');
- $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
- $file
- ->expects($this->at(1))
- ->method('putContent')
- ->with($fileData);
- $file
- ->expects($this->at(2))
- ->method('getContent')
- ->willReturn($fileData);
$expected = [
[
@@ -347,21 +323,19 @@ abstract class FetcherBase extends TestCase {
$this->assertSame($expected, $this->fetcher->get());
}
- public function testGetWithAlreadyExistingFileAndOutdatedVersion() {
+ public function testGetWithAlreadyExistingFileAndOutdatedVersion(): void {
$this->config
- ->method('getSystemValue')
+ ->method('getSystemValueString')
->willReturnCallback(function ($var, $default) {
- if ($var === 'appstoreenabled') {
- return true;
- } elseif ($var === 'has_internet_connection') {
- return true;
- } elseif ($var === 'appstoreurl') {
+ if ($var === 'appstoreurl') {
return 'https://apps.nextcloud.com/api/v1';
} elseif ($var === 'version') {
return '11.0.0.2';
}
return $default;
});
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -375,10 +349,18 @@ abstract class FetcherBase extends TestCase {
->method('getFile')
->with($this->fileName)
->willReturn($file);
+ $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
$file
- ->expects($this->at(0))
+ ->expects($this->once())
+ ->method('putContent')
+ ->with($fileData);
+ $file
+ ->expects($this->exactly(2))
->method('getContent')
- ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.1"');
+ ->willReturnOnConsecutiveCalls(
+ '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.1"',
+ $fileData
+ );
$this->timeFactory
->method('getTime')
->willReturn(1201);
@@ -400,15 +382,6 @@ abstract class FetcherBase extends TestCase {
$response->method('getHeader')
->with($this->equalTo('ETag'))
->willReturn('"myETag"');
- $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
- $file
- ->expects($this->at(1))
- ->method('putContent')
- ->with($fileData);
- $file
- ->expects($this->at(2))
- ->method('getContent')
- ->willReturn($fileData);
$expected = [
[
@@ -422,15 +395,11 @@ abstract class FetcherBase extends TestCase {
$this->assertSame($expected, $this->fetcher->get());
}
- public function testGetWithExceptionInClient() {
- $this->config->method('getSystemValue')
- ->willReturnCallback(function ($key, $default) {
- if ($key === 'appstoreenabled') {
- return true;
- } else {
- return $default;
- }
- });
+ public function testGetWithExceptionInClient(): void {
+ $this->config->method('getSystemValueString')
+ ->willReturnArgument(1);
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -445,7 +414,7 @@ abstract class FetcherBase extends TestCase {
->with($this->fileName)
->willReturn($file);
$file
- ->expects($this->at(0))
+ ->expects($this->once())
->method('getContent')
->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
$client = $this->createMock(IClient::class);
@@ -462,17 +431,17 @@ abstract class FetcherBase extends TestCase {
$this->assertSame([], $this->fetcher->get());
}
- public function testGetMatchingETag() {
- $this->config->method('getSystemValue')
+ public function testGetMatchingETag(): void {
+ $this->config->method('getSystemValueString')
->willReturnCallback(function ($key, $default) {
- if ($key === 'appstoreenabled') {
- return true;
- } elseif ($key === 'version') {
+ if ($key === 'version') {
return '11.0.0.2';
} else {
return $default;
}
});
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -487,18 +456,26 @@ abstract class FetcherBase extends TestCase {
->with($this->fileName)
->willReturn($file);
$origData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+
+ $newData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
$file
- ->expects($this->at(0))
+ ->expects($this->once())
+ ->method('putContent')
+ ->with($newData);
+ $file
+ ->expects($this->exactly(2))
->method('getContent')
- ->willReturn($origData);
- $this->timeFactory
- ->expects($this->at(0))
- ->method('getTime')
- ->willReturn(4801);
+ ->willReturnOnConsecutiveCalls(
+ $origData,
+ $newData,
+ );
$this->timeFactory
- ->expects($this->at(1))
+ ->expects($this->exactly(2))
->method('getTime')
- ->willReturn(4802);
+ ->willReturnOnConsecutiveCalls(
+ 4801,
+ 4802
+ );
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
@@ -520,16 +497,6 @@ abstract class FetcherBase extends TestCase {
$response->method('getStatusCode')
->willReturn(304);
- $newData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
- $file
- ->expects($this->at(1))
- ->method('putContent')
- ->with($newData);
- $file
- ->expects($this->at(2))
- ->method('getContent')
- ->willReturn($newData);
-
$expected = [
[
'id' => 'MyNewApp',
@@ -543,17 +510,17 @@ abstract class FetcherBase extends TestCase {
$this->assertSame($expected, $this->fetcher->get());
}
- public function testGetNoMatchingETag() {
- $this->config->method('getSystemValue')
+ public function testGetNoMatchingETag(): void {
+ $this->config->method('getSystemValueString')
->willReturnCallback(function ($key, $default) {
- if ($key === 'appstoreenabled') {
- return true;
- } elseif ($key === 'version') {
+ if ($key === 'version') {
return '11.0.0.2';
} else {
return $default;
}
});
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -563,14 +530,29 @@ abstract class FetcherBase extends TestCase {
->with('/')
->willReturn($folder);
$folder
- ->expects($this->at(0))
+ ->expects($this->once())
->method('getFile')
->with($this->fileName)
->willReturn($file);
+ $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"newETag\""}';
+ $file
+ ->expects($this->once())
+ ->method('putContent')
+ ->with($fileData);
$file
- ->expects($this->at(0))
+ ->expects($this->exactly(2))
->method('getContent')
- ->willReturn('{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}');
+ ->willReturnOnConsecutiveCalls(
+ '{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}',
+ $fileData,
+ );
+ $this->timeFactory
+ ->expects($this->exactly(2))
+ ->method('getTime')
+ ->willReturnOnConsecutiveCalls(
+ 4801,
+ 4802,
+ );
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
@@ -599,23 +581,6 @@ abstract class FetcherBase extends TestCase {
$response->method('getHeader')
->with($this->equalTo('ETag'))
->willReturn('"newETag"');
- $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"newETag\""}';
- $file
- ->expects($this->at(1))
- ->method('putContent')
- ->with($fileData);
- $file
- ->expects($this->at(2))
- ->method('getContent')
- ->willReturn($fileData);
- $this->timeFactory
- ->expects($this->at(0))
- ->method('getTime')
- ->willReturn(4801);
- $this->timeFactory
- ->expects($this->at(1))
- ->method('getTime')
- ->willReturn(4802);
$expected = [
[
@@ -630,17 +595,17 @@ abstract class FetcherBase extends TestCase {
}
- public function testFetchAfterUpgradeNoETag() {
- $this->config->method('getSystemValue')
+ public function testFetchAfterUpgradeNoETag(): void {
+ $this->config->method('getSystemValueString')
->willReturnCallback(function ($key, $default) {
- if ($key === 'appstoreenabled') {
- return true;
- } elseif ($key === 'version') {
+ if ($key === 'version') {
return '11.0.0.3';
} else {
return $default;
}
});
+ $this->config->method('getSystemValueBool')
+ ->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@@ -650,14 +615,22 @@ abstract class FetcherBase extends TestCase {
->with('/')
->willReturn($folder);
$folder
- ->expects($this->at(0))
+ ->expects($this->once())
->method('getFile')
->with($this->fileName)
->willReturn($file);
+ $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1501,"ncversion":"11.0.0.3","ETag":"\"newETag\""}';
$file
- ->expects($this->at(0))
+ ->expects($this->once())
+ ->method('putContent')
+ ->with($fileData);
+ $file
+ ->expects($this->exactly(2))
->method('getContent')
- ->willReturn('{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}');
+ ->willReturnOnConsecutiveCalls(
+ '{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}',
+ $fileData
+ );
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
@@ -683,15 +656,6 @@ abstract class FetcherBase extends TestCase {
$response->method('getHeader')
->with($this->equalTo('ETag'))
->willReturn('"newETag"');
- $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1501,"ncversion":"11.0.0.3","ETag":"\"newETag\""}';
- $file
- ->expects($this->at(1))
- ->method('putContent')
- ->with($fileData);
- $file
- ->expects($this->at(2))
- ->method('getContent')
- ->willReturn($fileData);
$this->timeFactory
->expects($this->once())
->method('getTime')
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 19:28:14 +0000