Skip to content

test: Fix DB test grouping #61215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
provokateurin wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

test: Fix DB test grouping #61215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b885e8
test: Add all missing parent::setUp() and parent::tearDown() calls
provokateurin Jun 11, 2026
841a594
test: Allow Group annotation and attribute on method
provokateurin Jun 11, 2026
0828bcf
test: Stop using the internal real database
provokateurin Jun 11, 2026
32bdac0
test: Fix DB test grouping
provokateurin Jun 11, 2026
7740f8b
test: Correctly check if database was used in a test
provokateurin Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/appstore/tests/Controller/ApiControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
use Psr\Log\LoggerInterface;
use Test\TestCase;

#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
final class ApiControllerTest extends TestCase {
private IRequest&MockObject $request;

Expand Down
1 change: 0 additions & 1 deletion apps/appstore/tests/Controller/PageControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;

#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
final class PageControllerTest extends TestCase {
private IRequest&MockObject $request;

Expand Down
2 changes: 2 additions & 0 deletions apps/dav/tests/integration/DAV/Sharing/CalDavSharingBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ protected function setUp(): void {

protected function tearDown(): void {
$this->removeFixtures();

parent::tearDown();
}

protected function removeFixtures(): void {
Expand Down
2 changes: 2 additions & 0 deletions apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class ContactsMigratorTest extends TestCase {
private const ASSETS_DIR = __DIR__ . '/assets/address_books/';

protected function setUp(): void {
parent::setUp();

$app = new App(Application::APP_ID);
$container = $app->getContainer();

Expand Down
1 change: 0 additions & 1 deletion apps/dav/tests/unit/AppInfo/ApplicationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
*
* @package OCA\DAV\Tests\Unit\AppInfo
*/
#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
class ApplicationTest extends TestCase {
public function test(): void {
$app = new Application();
Expand Down
4 changes: 3 additions & 1 deletion apps/dav/tests/unit/BackgroundJob/UserStatusAutomationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
use OCP\User\IAvailabilityCoordinator;
use OCP\UserStatus\IManager;
use OCP\UserStatus\IUserStatus;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\TestCase;

#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
class UserStatusAutomationTest extends TestCase {
protected ITimeFactory&MockObject $time;
protected IJobList&MockObject $jobList;
Expand Down Expand Up @@ -86,6 +86,7 @@ public static function dataRun(): array {
];
}

#[Group('DB')]
#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'dataRun')]
public function testRunNoOOO(string $ruleDay, string $currentTime, bool $isAvailable): void {
$user = $this->createConfiguredMock(IUser::class, [
Expand Down Expand Up @@ -182,6 +183,7 @@ public function testRunNoAvailabilityNoOOO(): void {
self::invokePrivate($automation, 'run', [['userId' => 'user']]);
}

#[Group('DB')]
public function testRunNoAvailabilityWithOOO(): void {
$user = $this->createConfiguredMock(IUser::class, [
'getUID' => 'user'
Expand Down
1 change: 0 additions & 1 deletion apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use OCP\Server;
use Test\TestCase;

#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
class GenericTest extends TestCase {
public static function dataFilters(): array {
return [
Expand Down
2 changes: 2 additions & 0 deletions apps/dav/tests/unit/CalDAV/EventComparisonServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class EventComparisonServiceTest extends TestCase {
private EventComparisonService $eventComparisonService;

protected function setUp(): void {
parent::setUp();

$this->eventComparisonService = new EventComparisonService();
}

Expand Down
4 changes: 3 additions & 1 deletion apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
use OCP\IUserManager;
use OCP\Security\ISecureRandom;
use OCP\Server;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\TestCase;
Expand All @@ -33,7 +34,6 @@
*
* @package OCA\DAV\Tests\unit\CalDAV
*/
#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
class PublicCalendarRootTest extends TestCase {
public const UNIT_TEST_USER = '';
private CalDavBackend $backend;
Expand Down Expand Up @@ -117,6 +117,7 @@ public function testGetName(): void {
$this->assertEquals('public-calendars', $name);
}

#[Group('DB')]
public function testGetChild(): void {
$calendar = $this->createPublicCalendar();

Expand All @@ -130,6 +131,7 @@ public function testGetChild(): void {
$this->assertEquals($calendar, $calendarResult);
}

#[Group('DB')]
public function testGetChildren(): void {
$this->createPublicCalendar();
$calendarResults = $this->publicCalendarRoot->getChildren();
Expand Down
48 changes: 26 additions & 22 deletions apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,33 @@

use OCA\DAV\CalDAV\Reminder\Backend as ReminderBackend;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IDBConnection;
use OCP\Server;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;

#[Group('DB')]
class BackendTest extends TestCase {
private ReminderBackend $reminderBackend;
private ITimeFactory&MockObject $timeFactory;

protected function setUp(): void {
parent::setUp();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->delete('calendar_reminders')->executeStatement();
$query->delete('calendarobjects')->executeStatement();
$query->delete('calendars')->executeStatement();

$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->reminderBackend = new ReminderBackend(self::$realDatabase, $this->timeFactory);
$this->reminderBackend = new ReminderBackend(Server::get(IDBConnection::class), $this->timeFactory);

$this->createRemindersTestSet();
}

protected function tearDown(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->delete('calendar_reminders')->executeStatement();
$query->delete('calendarobjects')->executeStatement();
$query->delete('calendars')->executeStatement();
Expand All @@ -42,7 +46,7 @@ protected function tearDown(): void {
}

public function testCleanRemindersForEvent(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -52,7 +56,7 @@ public function testCleanRemindersForEvent(): void {

$this->reminderBackend->cleanRemindersForEvent(1);

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -62,7 +66,7 @@ public function testCleanRemindersForEvent(): void {
}

public function testCleanRemindersForCalendar(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -72,7 +76,7 @@ public function testCleanRemindersForCalendar(): void {

$this->reminderBackend->cleanRemindersForCalendar(1);

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -82,7 +86,7 @@ public function testCleanRemindersForCalendar(): void {
}

public function testRemoveReminder(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -92,7 +96,7 @@ public function testRemoveReminder(): void {

$this->reminderBackend->removeReminder((int)$rows[3]['id']);

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand Down Expand Up @@ -189,7 +193,7 @@ public function testGetAllScheduledRemindersForEvent(): void {
}

public function testInsertReminder(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -200,7 +204,7 @@ public function testInsertReminder(): void {
$this->reminderBackend->insertReminder(42, 1337, 'uid99', true, 12345678,
true, 'hash99', 'hash42', 'AUDIO', false, 12345670, false);

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -227,7 +231,7 @@ public function testInsertReminder(): void {
}

public function testUpdateReminder(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$rows = $query->select('*')
->from('calendar_reminders')
->executeQuery()
Expand All @@ -242,7 +246,7 @@ public function testUpdateReminder(): void {

$this->reminderBackend->updateReminder($reminderId, $newNotificationDate);

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$row = $query->select('notification_date')
->from('calendar_reminders')
->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
Expand All @@ -253,7 +257,7 @@ public function testUpdateReminder(): void {
}

private function createRemindersTestSet(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendars')
->values([
'id' => $query->createNamedParameter(1),
Expand All @@ -262,7 +266,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendars')
->values([
'id' => $query->createNamedParameter(99),
Expand All @@ -271,7 +275,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendarobjects')
->values([
'id' => $query->createNamedParameter(1),
Expand All @@ -281,7 +285,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendarobjects')
->values([
'id' => $query->createNamedParameter(2),
Expand All @@ -291,7 +295,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendarobjects')
->values([
'id' => $query->createNamedParameter(10),
Expand All @@ -301,7 +305,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendar_reminders')
->values([
'calendar_id' => $query->createNamedParameter(1),
Expand All @@ -319,7 +323,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendar_reminders')
->values([
'calendar_id' => $query->createNamedParameter(1),
Expand All @@ -337,7 +341,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendar_reminders')
->values([
'calendar_id' => $query->createNamedParameter(1),
Expand All @@ -355,7 +359,7 @@ private function createRemindersTestSet(): void {
])
->executeStatement();

$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert('calendar_reminders')
->values([
'calendar_id' => $query->createNamedParameter(99),
Expand Down
1 change: 0 additions & 1 deletion apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
use Psr\Container\ContainerExceptionInterface;
use Test\TestCase;

#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
class NotificationProviderManagerTest extends TestCase {
private NotificationProviderManager $providerManager;

Expand Down
8 changes: 6 additions & 2 deletions apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
use OCA\DAV\CalDAV\Proxy\ProxyMapper;
use OCA\DAV\CalDAV\ResourceBooking\ResourcePrincipalBackend;
use OCA\DAV\CalDAV\ResourceBooking\RoomPrincipalBackend;
use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Server;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Sabre\DAV\PropPatch;
Expand Down Expand Up @@ -42,12 +44,14 @@ protected function setUp(): void {
}

protected function tearDown(): void {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();

$query->delete('calendar_resources')->executeStatement();
$query->delete('calendar_resources_md')->executeStatement();
$query->delete('calendar_rooms')->executeStatement();
$query->delete('calendar_rooms_md')->executeStatement();

parent::tearDown();
}

public function testGetPrincipalsByPrefix(): void {
Expand Down Expand Up @@ -454,7 +458,7 @@ public function testFindByUriByUnknownUri(): void {
}

protected function createTestDatasetInDb() {
$query = self::$realDatabase->getQueryBuilder();
$query = Server::get(IDBConnection::class)->getQueryBuilder();
$query->insert($this->mainDbTable)
->values([
'backend_id' => $query->createNamedParameter('backend1'),
Expand Down
6 changes: 5 additions & 1 deletion apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@
namespace OCA\DAV\Tests\unit\CalDAV\ResourceBooking;

use OCA\DAV\CalDAV\ResourceBooking\ResourcePrincipalBackend;
use OCP\IDBConnection;
use OCP\Server;
use PHPUnit\Framework\Attributes\Group;

#[Group('DB')]
class ResourcePrincipalBackendTest extends AbstractPrincipalBackendTestCase {
protected function setUp(): void {
parent::setUp();

$this->principalBackend = new ResourcePrincipalBackend(self::$realDatabase,
$this->principalBackend = new ResourcePrincipalBackend(Server::get(IDBConnection::class),
$this->userSession, $this->groupManager, $this->logger, $this->proxyMapper);

$this->mainDbTable = 'calendar_resources';
Expand Down
Loading
Loading