test: enable files_external for tests

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

.github/workflows/phpunit-mariadb.yml

@@ -29,6 +29,14 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Checkout viewer
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          path: apps/viewer
+          ref: ${{ matrix.server-versions }}
+          repository: nextcloud/viewer
+
       - name: Get version matrix
         id: versions
         uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1

.github/workflows/phpunit-sqlite.yml

@@ -94,6 +94,14 @@ jobs:
           persist-credentials: false
           path: apps/${{ env.APP_NAME }}
 
+      - name: Checkout viewer
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          path: apps/viewer
+          ref: ${{ matrix.server-versions }}
+          repository: nextcloud/viewer
+
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
         with:

appinfo/info.xml

@@ -35,9 +35,9 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot2.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot3.png</screenshot>
     <dependencies>
-        <php min-version="8.1" max-version="8.4"/>
+        <php min-version="8.1" max-version="8.5"/>
         <lib>exif</lib>
-        <nextcloud min-version="31" max-version="32"/>
+        <nextcloud min-version="32" max-version="33"/>
     </dependencies>
     <repair-steps>
 		<post-migration>

tests/Unit/Controller/PhotosControllerTest.php

@@ -18,6 +18,7 @@
 use OCA\Maps\Service\PhotofilesService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IServerContainer;
+use OCP\Server;
 
 class PhotosControllerTest extends \PHPUnit\Framework\TestCase {
 	private $appName;
@@ -134,12 +135,12 @@ protected function setUp(): void {
 			$file->delete();
 		}
 		// delete db
-		$qb = $c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)->getQueryBuilder();
+		$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
 		$qb->delete('maps_photos')
 			->where(
 				$qb->expr()->eq('user_id', $qb->createNamedParameter('test', IQueryBuilder::PARAM_STR))
 			);
-		$req = $qb->execute();
+		$req = $qb->executeStatement();
 	}
 
 	public static function tearDownAfterClass(): void {
@@ -351,13 +352,6 @@ public function testAddGetPhotos() {
 		$data = $resp->getData();
 		$this->assertCount(1, $data);
 
-		//We do not clear the cache so we expect to still 1 photo
-		$resp = $this->photosController->getPhotos();
-		$status = $resp->getStatus();
-		$this->assertEquals(200, $status);
-		$data = $resp->getData();
-		$this->assertCount(1, $data);
-
 		//And we expect that there is still zero non Localized Photo
 		$resp = $this->photosController->getNonLocalizedPhotos();
 		$status = $resp->getStatus();

tests/Unit/Controller/TracksControllerTest.php

@@ -16,6 +16,7 @@
 use OCA\Maps\Service\TracksService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IServerContainer;
+use OCP\Server;
 
 class TracksControllerTest extends \PHPUnit\Framework\TestCase {
 	private $appName;
@@ -135,12 +136,12 @@ protected function setUp(): void {
 			$file->delete();
 		}
 		// delete db
-		$qb = $c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)->getQueryBuilder();
+		$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
 		$qb->delete('maps_tracks')
 			->where(
 				$qb->expr()->eq('user_id', $qb->createNamedParameter('test', IQueryBuilder::PARAM_STR))
 			);
-		$req = $qb->execute();
+		$req = $qb->executeStatement();
 	}
 
 	public static function tearDownAfterClass(): void {
@@ -167,12 +168,12 @@ protected function tearDown(): void {
 			$file->delete();
 		}
 		// delete db
-		$qb = $c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)->getQueryBuilder();
+		$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
 		$qb->delete('maps_tracks')
 			->where(
 				$qb->expr()->eq('user_id', $qb->createNamedParameter('test', IQueryBuilder::PARAM_STR))
 			);
-		$req = $qb->execute();
+		$req = $qb->executeStatement();
 	}
 
 	public function testAddGetTracks() {

tests/bootstrap.php

@@ -15,8 +15,7 @@
 use OCP\App\IAppManager;
 use OCP\Server;
 
-require_once __DIR__ . '/../../../tests/bootstrap.php';
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../../../tests/autoload.php';
 
-Server::get(IAppManager::class)->loadApp('maps');
+$appManager = Server::get(IAppManager::class);
+$appManager->loadApp('maps');