nextcloud / server

tests/lib/Collaboration/Resources/ManagerTest.php

Indentation +25 added lines, -25 removed lines

@@ -18,29 +18,29 @@
 
 class ManagerTest extends TestCase {
 
-	protected LoggerInterface&MockObject $logger;
-	protected IProviderManager&MockObject $providerManager;
-	protected IManager $manager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->providerManager = $this->createMock(IProviderManager::class);
-
-		/** @var IDBConnection $connection */
-		$connection = $this->createMock(IDBConnection::class);
-		$this->manager = new Manager($connection, $this->providerManager, $this->logger);
-	}
-
-	public function testRegisterResourceProvider(): void {
-		$this->logger->expects($this->once())
-			->method('debug')
-			->with($this->equalTo('\OC\Collaboration\Resources\Manager::registerResourceProvider is deprecated'), $this->equalTo(['provider' => 'AwesomeResourceProvider']));
-		$this->providerManager->expects($this->once())
-			->method('registerResourceProvider')
-			->with($this->equalTo('AwesomeResourceProvider'));
-
-		$this->manager->registerResourceProvider('AwesomeResourceProvider');
-	}
+    protected LoggerInterface&MockObject $logger;
+    protected IProviderManager&MockObject $providerManager;
+    protected IManager $manager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->providerManager = $this->createMock(IProviderManager::class);
+
+        /** @var IDBConnection $connection */
+        $connection = $this->createMock(IDBConnection::class);
+        $this->manager = new Manager($connection, $this->providerManager, $this->logger);
+    }
+
+    public function testRegisterResourceProvider(): void {
+        $this->logger->expects($this->once())
+            ->method('debug')
+            ->with($this->equalTo('\OC\Collaboration\Resources\Manager::registerResourceProvider is deprecated'), $this->equalTo(['provider' => 'AwesomeResourceProvider']));
+        $this->providerManager->expects($this->once())
+            ->method('registerResourceProvider')
+            ->with($this->equalTo('AwesomeResourceProvider'));
+
+        $this->manager->registerResourceProvider('AwesomeResourceProvider');
+    }
 }

tests/lib/Session/Session.php

Indentation +45 added lines, -45 removed lines

@@ -9,58 +9,58 @@
 namespace Test\Session;
 
 abstract class Session extends \Test\TestCase {
-	/**
-	 * @var \OC\Session\Session
-	 */
-	protected $instance;
+    /**
+     * @var \OC\Session\Session
+     */
+    protected $instance;
 
-	protected function tearDown(): void {
-		$this->instance->clear();
-		parent::tearDown();
-	}
+    protected function tearDown(): void {
+        $this->instance->clear();
+        parent::tearDown();
+    }
 
-	public function testNotExistsEmpty(): void {
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testNotExistsEmpty(): void {
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testExistsAfterSet(): void {
-		$this->instance->set('foo', 1);
-		$this->assertTrue($this->instance->exists('foo'));
-	}
+    public function testExistsAfterSet(): void {
+        $this->instance->set('foo', 1);
+        $this->assertTrue($this->instance->exists('foo'));
+    }
 
-	public function testNotExistsAfterRemove(): void {
-		$this->instance->set('foo', 1);
-		$this->instance->remove('foo');
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testNotExistsAfterRemove(): void {
+        $this->instance->set('foo', 1);
+        $this->instance->remove('foo');
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testGetNonExisting(): void {
-		$this->assertNull($this->instance->get('foo'));
-	}
+    public function testGetNonExisting(): void {
+        $this->assertNull($this->instance->get('foo'));
+    }
 
-	public function testGetAfterSet(): void {
-		$this->instance->set('foo', 'bar');
-		$this->assertEquals('bar', $this->instance->get(('foo')));
-	}
+    public function testGetAfterSet(): void {
+        $this->instance->set('foo', 'bar');
+        $this->assertEquals('bar', $this->instance->get(('foo')));
+    }
 
-	public function testRemoveNonExisting(): void {
-		$this->assertFalse($this->instance->exists('foo'));
-		$this->instance->remove('foo');
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testRemoveNonExisting(): void {
+        $this->assertFalse($this->instance->exists('foo'));
+        $this->instance->remove('foo');
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testNotExistsAfterClear(): void {
-		$this->instance->set('foo', 1);
-		$this->instance->clear();
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testNotExistsAfterClear(): void {
+        $this->instance->set('foo', 1);
+        $this->instance->clear();
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testArrayInterface(): void {
-		$this->assertFalse(isset($this->instance['foo']));
-		$this->instance['foo'] = 'bar';
-		$this->assertTrue(isset($this->instance['foo']));
-		$this->assertEquals('bar', $this->instance['foo']);
-		unset($this->instance['foo']);
-		$this->assertFalse(isset($this->instance['foo']));
-	}
+    public function testArrayInterface(): void {
+        $this->assertFalse(isset($this->instance['foo']));
+        $this->instance['foo'] = 'bar';
+        $this->assertTrue(isset($this->instance['foo']));
+        $this->assertEquals('bar', $this->instance['foo']);
+        unset($this->instance['foo']);
+        $this->assertFalse(isset($this->instance['foo']));
+    }
 }

tests/lib/BackgroundJob/TestTimedJobNew.php

Indentation +8 added lines, -8 removed lines

@@ -13,14 +13,14 @@
 use OCP\BackgroundJob\TimedJob;
 
 class TestTimedJobNew extends TimedJob {
-	public bool $ran = false;
+    public bool $ran = false;
 
-	public function __construct(ITimeFactory $timeFactory) {
-		parent::__construct($timeFactory);
-		$this->setInterval(10);
-	}
+    public function __construct(ITimeFactory $timeFactory) {
+        parent::__construct($timeFactory);
+        $this->setInterval(10);
+    }
 
-	public function run($argument) {
-		$this->ran = true;
-	}
+    public function run($argument) {
+        $this->ran = true;
+    }
 }

tests/lib/App/AppStore/Bundles/EducationBundleTest.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 use OC\App\AppStore\Bundles\EducationBundle;
 
 class EducationBundleTest extends BundleBase {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->bundle = new EducationBundle($this->l10n);
-		$this->bundleIdentifier = 'EducationBundle';
-		$this->bundleName = 'Education bundle';
-		$this->bundleAppIds = [
-			'dashboard',
-			'circles',
-			'groupfolders',
-			'announcementcenter',
-			'quota_warning',
-			'user_saml',
-			'whiteboard',
-		];
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->bundle = new EducationBundle($this->l10n);
+        $this->bundleIdentifier = 'EducationBundle';
+        $this->bundleName = 'Education bundle';
+        $this->bundleAppIds = [
+            'dashboard',
+            'circles',
+            'groupfolders',
+            'announcementcenter',
+            'quota_warning',
+            'user_saml',
+            'whiteboard',
+        ];
+    }
 }

tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php

Indentation +12 added lines, -12 removed lines

@@ -9,16 +9,16 @@
 use OC\App\AppStore\Bundles\GroupwareBundle;
 
 class GroupwareBundleTest extends BundleBase {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->bundle = new GroupwareBundle($this->l10n);
-		$this->bundleIdentifier = 'GroupwareBundle';
-		$this->bundleName = 'Groupware bundle';
-		$this->bundleAppIds = [
-			'calendar',
-			'contacts',
-			'deck',
-			'mail'
-		];
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->bundle = new GroupwareBundle($this->l10n);
+        $this->bundleIdentifier = 'GroupwareBundle';
+        $this->bundleName = 'Groupware bundle';
+        $this->bundleAppIds = [
+            'calendar',
+            'contacts',
+            'deck',
+            'mail'
+        ];
+    }
 }

tests/lib/App/AppStore/Bundles/BundleFetcherTest.php

Indentation +39 added lines, -39 removed lines

@@ -17,43 +17,43 @@
 use Test\TestCase;
 
 class BundleFetcherTest extends TestCase {
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l10n;
-	/** @var BundleFetcher */
-	private $bundleFetcher;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10n = $this->createMock(IL10N::class);
-
-		$this->bundleFetcher = new BundleFetcher(
-			$this->l10n
-		);
-	}
-
-	public function testGetBundles(): void {
-		$expected = [
-			new EnterpriseBundle($this->l10n),
-			new HubBundle($this->l10n),
-			new GroupwareBundle($this->l10n),
-			new SocialSharingBundle($this->l10n),
-			new EducationBundle($this->l10n),
-			new PublicSectorBundle($this->l10n),
-		];
-		$this->assertEquals($expected, $this->bundleFetcher->getBundles());
-	}
-
-	public function testGetBundleByIdentifier(): void {
-		$this->assertEquals(new EnterpriseBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('EnterpriseBundle'));
-		$this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle'));
-	}
-
-
-	public function testGetBundleByIdentifierWithException(): void {
-		$this->expectException(\BadMethodCallException::class);
-		$this->expectExceptionMessage('Bundle with specified identifier does not exist');
-
-		$this->bundleFetcher->getBundleByIdentifier('NotExistingBundle');
-	}
+    /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
+    private $l10n;
+    /** @var BundleFetcher */
+    private $bundleFetcher;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->l10n = $this->createMock(IL10N::class);
+
+        $this->bundleFetcher = new BundleFetcher(
+            $this->l10n
+        );
+    }
+
+    public function testGetBundles(): void {
+        $expected = [
+            new EnterpriseBundle($this->l10n),
+            new HubBundle($this->l10n),
+            new GroupwareBundle($this->l10n),
+            new SocialSharingBundle($this->l10n),
+            new EducationBundle($this->l10n),
+            new PublicSectorBundle($this->l10n),
+        ];
+        $this->assertEquals($expected, $this->bundleFetcher->getBundles());
+    }
+
+    public function testGetBundleByIdentifier(): void {
+        $this->assertEquals(new EnterpriseBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('EnterpriseBundle'));
+        $this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle'));
+    }
+
+
+    public function testGetBundleByIdentifierWithException(): void {
+        $this->expectException(\BadMethodCallException::class);
+        $this->expectExceptionMessage('Bundle with specified identifier does not exist');
+
+        $this->bundleFetcher->getBundleByIdentifier('NotExistingBundle');
+    }
 }

tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php

Indentation +12 added lines, -12 removed lines

@@ -9,16 +9,16 @@
 use OC\App\AppStore\Bundles\SocialSharingBundle;
 
 class SocialSharingBundleTest extends BundleBase {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->bundle = new SocialSharingBundle($this->l10n);
-		$this->bundleIdentifier = 'SocialSharingBundle';
-		$this->bundleName = 'Social sharing bundle';
-		$this->bundleAppIds = [
-			'socialsharing_twitter',
-			'socialsharing_facebook',
-			'socialsharing_email',
-			'socialsharing_diaspora',
-		];
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->bundle = new SocialSharingBundle($this->l10n);
+        $this->bundleIdentifier = 'SocialSharingBundle';
+        $this->bundleName = 'Social sharing bundle';
+        $this->bundleAppIds = [
+            'socialsharing_twitter',
+            'socialsharing_facebook',
+            'socialsharing_email',
+            'socialsharing_diaspora',
+        ];
+    }
 }

tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 use OC\App\AppStore\Bundles\EnterpriseBundle;
 
 class EnterpriseBundleTest extends BundleBase {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->bundle = new EnterpriseBundle($this->l10n);
-		$this->bundleIdentifier = 'EnterpriseBundle';
-		$this->bundleName = 'Enterprise bundle';
-		$this->bundleAppIds = [
-			'admin_audit',
-			'user_ldap',
-			'files_retention',
-			'files_automatedtagging',
-			'user_saml',
-			'files_accesscontrol',
-			'terms_of_service',
-		];
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->bundle = new EnterpriseBundle($this->l10n);
+        $this->bundleIdentifier = 'EnterpriseBundle';
+        $this->bundleName = 'Enterprise bundle';
+        $this->bundleAppIds = [
+            'admin_audit',
+            'user_ldap',
+            'files_retention',
+            'files_automatedtagging',
+            'user_saml',
+            'files_accesscontrol',
+            'terms_of_service',
+        ];
+    }
 }

tests/lib/App/AppStore/Fetcher/FetcherBase.php

Indentation +648 added lines, -648 removed lines

@@ -23,652 +23,652 @@
 use Test\TestCase;
 
 abstract class FetcherBase extends TestCase {
-	/** @var Factory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $appDataFactory;
-	/** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
-	protected $appData;
-	/** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
-	protected $clientService;
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $timeFactory;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	protected $config;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	protected $logger;
-	/** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
-	protected $registry;
-	/** @var Fetcher */
-	protected $fetcher;
-	/** @var string */
-	protected $fileName;
-	/** @var string */
-	protected $endpoint;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->appDataFactory = $this->createMock(Factory::class);
-		$this->appData = $this->createMock(AppData::class);
-		$this->appDataFactory->expects($this->once())
-			->method('get')
-			->with('appstore')
-			->willReturn($this->appData);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->registry = $this->createMock(IRegistry::class);
-	}
-
-	public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion(): void {
-		$this->config
-			->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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$file
-			->expects($this->once())
-			->method('getContent')
-			->willReturn('{"timestamp":1200,"data":[{"id":"MyApp"}],"ncversion":"11.0.0.2"}');
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1499);
-
-		$expected = [
-			[
-				'id' => 'MyApp',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion(): void {
-		$this->config
-			->method('getSystemValueString')
-			->willReturnCallback(function ($var, $default) {
-				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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willThrowException(new NotFoundException());
-		$folder
-			->expects($this->once())
-			->method('newFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$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->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->once())
-			->method('getContent')
-			->willReturn($fileData);
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1502);
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithAlreadyExistingFileAndOutdatedTimestamp(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->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->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.2"}',
-				$fileData
-			);
-		$this->timeFactory
-			->expects($this->exactly(2))
-			->method('getTime')
-			->willReturnOnConsecutiveCalls(
-				4801,
-				1502
-			);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"myETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithAlreadyExistingFileAndNoVersion(): void {
-		$this->config
-			->method('getSystemValueString')
-			->willReturnCallback(function ($var, $default) {
-				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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->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->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}',
-				$fileData
-			);
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1201);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"myETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithAlreadyExistingFileAndOutdatedVersion(): void {
-		$this->config
-			->method('getSystemValueString')
-			->willReturnCallback(function ($var, $default) {
-				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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->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->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.1"',
-				$fileData
-			);
-		$this->timeFactory
-			->method('getTime')
-			->willReturn(1201);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"myETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$file
-			->expects($this->once())
-			->method('getContent')
-			->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willThrowException(new \Exception());
-
-		$this->assertSame([], $this->fetcher->get());
-	}
-
-	public function testGetMatchingETag(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->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->once())
-			->method('putContent')
-			->with($newData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				$origData,
-				$newData,
-			);
-		$this->timeFactory
-			->expects($this->exactly(2))
-			->method('getTime')
-			->willReturnOnConsecutiveCalls(
-				4801,
-				4802
-			);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with(
-				$this->equalTo($this->endpoint),
-				$this->equalTo([
-					'timeout' => 60,
-					'headers' => [
-						'If-None-Match' => '"myETag"'
-					]
-				])
-			)->willReturn($response);
-		$response->method('getStatusCode')
-			->willReturn(304);
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetNoMatchingETag(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->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->exactly(2))
-			->method('getContent')
-			->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())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with(
-				$this->equalTo($this->endpoint),
-				$this->equalTo([
-					'timeout' => 60,
-					'headers' => [
-						'If-None-Match' => '"myETag"',
-					]
-				])
-			)
-			->willReturn($response);
-		$response->method('getStatusCode')
-			->willReturn(200);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"newETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-
-	public function testFetchAfterUpgradeNoETag(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				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);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->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->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->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())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with(
-				$this->equalTo($this->endpoint),
-				$this->equalTo([
-					'timeout' => 60,
-				])
-			)
-			->willReturn($response);
-		$response->method('getStatusCode')
-			->willReturn(200);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"newETag"');
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1501);
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
+    /** @var Factory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $appDataFactory;
+    /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
+    protected $appData;
+    /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
+    protected $clientService;
+    /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $timeFactory;
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    protected $config;
+    /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+    protected $logger;
+    /** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
+    protected $registry;
+    /** @var Fetcher */
+    protected $fetcher;
+    /** @var string */
+    protected $fileName;
+    /** @var string */
+    protected $endpoint;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->appDataFactory = $this->createMock(Factory::class);
+        $this->appData = $this->createMock(AppData::class);
+        $this->appDataFactory->expects($this->once())
+            ->method('get')
+            ->with('appstore')
+            ->willReturn($this->appData);
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->registry = $this->createMock(IRegistry::class);
+    }
+
+    public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion(): void {
+        $this->config
+            ->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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $file
+            ->expects($this->once())
+            ->method('getContent')
+            ->willReturn('{"timestamp":1200,"data":[{"id":"MyApp"}],"ncversion":"11.0.0.2"}');
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1499);
+
+        $expected = [
+            [
+                'id' => 'MyApp',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion(): void {
+        $this->config
+            ->method('getSystemValueString')
+            ->willReturnCallback(function ($var, $default) {
+                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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willThrowException(new NotFoundException());
+        $folder
+            ->expects($this->once())
+            ->method('newFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $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->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->once())
+            ->method('getContent')
+            ->willReturn($fileData);
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1502);
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithAlreadyExistingFileAndOutdatedTimestamp(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->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->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.2"}',
+                $fileData
+            );
+        $this->timeFactory
+            ->expects($this->exactly(2))
+            ->method('getTime')
+            ->willReturnOnConsecutiveCalls(
+                4801,
+                1502
+            );
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"myETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithAlreadyExistingFileAndNoVersion(): void {
+        $this->config
+            ->method('getSystemValueString')
+            ->willReturnCallback(function ($var, $default) {
+                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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->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->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}',
+                $fileData
+            );
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1201);
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"myETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithAlreadyExistingFileAndOutdatedVersion(): void {
+        $this->config
+            ->method('getSystemValueString')
+            ->willReturnCallback(function ($var, $default) {
+                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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->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->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.1"',
+                $fileData
+            );
+        $this->timeFactory
+            ->method('getTime')
+            ->willReturn(1201);
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"myETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $file
+            ->expects($this->once())
+            ->method('getContent')
+            ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willThrowException(new \Exception());
+
+        $this->assertSame([], $this->fetcher->get());
+    }
+
+    public function testGetMatchingETag(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->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->once())
+            ->method('putContent')
+            ->with($newData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                $origData,
+                $newData,
+            );
+        $this->timeFactory
+            ->expects($this->exactly(2))
+            ->method('getTime')
+            ->willReturnOnConsecutiveCalls(
+                4801,
+                4802
+            );
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with(
+                $this->equalTo($this->endpoint),
+                $this->equalTo([
+                    'timeout' => 60,
+                    'headers' => [
+                        'If-None-Match' => '"myETag"'
+                    ]
+                ])
+            )->willReturn($response);
+        $response->method('getStatusCode')
+            ->willReturn(304);
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetNoMatchingETag(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->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->exactly(2))
+            ->method('getContent')
+            ->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())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with(
+                $this->equalTo($this->endpoint),
+                $this->equalTo([
+                    'timeout' => 60,
+                    'headers' => [
+                        'If-None-Match' => '"myETag"',
+                    ]
+                ])
+            )
+            ->willReturn($response);
+        $response->method('getStatusCode')
+            ->willReturn(200);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"newETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+
+    public function testFetchAfterUpgradeNoETag(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                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);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->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->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->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())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with(
+                $this->equalTo($this->endpoint),
+                $this->equalTo([
+                    'timeout' => 60,
+                ])
+            )
+            ->willReturn($response);
+        $response->method('getStatusCode')
+            ->willReturn(200);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"newETag"');
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1501);
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
 }