Skip to content

Commit accaef6

Browse files
committed
test: enable files_external for tests
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent a19dd3b commit accaef6

4 files changed

Lines changed: 13 additions & 12 deletions

File tree

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot2.png</screenshot>
3636
<screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot3.png</screenshot>
3737
<dependencies>
38-
<php min-version="8.1" max-version="8.4"/>
38+
<php min-version="8.1" max-version="8.5"/>
3939
<lib>exif</lib>
40-
<nextcloud min-version="31" max-version="32"/>
40+
<nextcloud min-version="32" max-version="33"/>
4141
</dependencies>
4242
<repair-steps>
4343
<post-migration>

tests/Unit/Controller/PhotosControllerTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use OCA\Maps\Service\PhotofilesService;
1919
use OCP\DB\QueryBuilder\IQueryBuilder;
2020
use OCP\IServerContainer;
21+
use OCP\Server;
2122

2223
class PhotosControllerTest extends \PHPUnit\Framework\TestCase {
2324
private $appName;
@@ -134,12 +135,12 @@ protected function setUp(): void {
134135
$file->delete();
135136
}
136137
// delete db
137-
$qb = $c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)->getQueryBuilder();
138+
$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
138139
$qb->delete('maps_photos')
139140
->where(
140141
$qb->expr()->eq('user_id', $qb->createNamedParameter('test', IQueryBuilder::PARAM_STR))
141142
);
142-
$req = $qb->execute();
143+
$req = $qb->executeStatement();
143144
}
144145

145146
public static function tearDownAfterClass(): void {

tests/Unit/Controller/TracksControllerTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use OCA\Maps\Service\TracksService;
1717
use OCP\DB\QueryBuilder\IQueryBuilder;
1818
use OCP\IServerContainer;
19+
use OCP\Server;
1920

2021
class TracksControllerTest extends \PHPUnit\Framework\TestCase {
2122
private $appName;
@@ -135,12 +136,12 @@ protected function setUp(): void {
135136
$file->delete();
136137
}
137138
// delete db
138-
$qb = $c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)->getQueryBuilder();
139+
$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
139140
$qb->delete('maps_tracks')
140141
->where(
141142
$qb->expr()->eq('user_id', $qb->createNamedParameter('test', IQueryBuilder::PARAM_STR))
142143
);
143-
$req = $qb->execute();
144+
$req = $qb->executeStatement();
144145
}
145146

146147
public static function tearDownAfterClass(): void {
@@ -167,12 +168,12 @@ protected function tearDown(): void {
167168
$file->delete();
168169
}
169170
// delete db
170-
$qb = $c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)->getQueryBuilder();
171+
$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
171172
$qb->delete('maps_tracks')
172173
->where(
173174
$qb->expr()->eq('user_id', $qb->createNamedParameter('test', IQueryBuilder::PARAM_STR))
174175
);
175-
$req = $qb->execute();
176+
$req = $qb->executeStatement();
176177
}
177178

178179
public function testAddGetTracks() {

tests/bootstrap.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
use OCP\App\IAppManager;
1616
use OCP\Server;
1717

18-
require_once __DIR__ . '/../../../tests/bootstrap.php';
19-
require_once __DIR__ . '/../../../lib/base.php';
20-
require_once __DIR__ . '/../vendor/autoload.php';
18+
require_once __DIR__ . '/../../../tests/autoload.php';
2119

22-
Server::get(IAppManager::class)->loadApp('maps');
20+
$appManager = Server::get(IAppManager::class);
21+
$appManager->loadApp('maps');

0 commit comments

Comments
 (0)