Skip to content

Update tests hints #593

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

Merged
abnegate merged 3 commits into from
May 26, 2025
Merged

Update tests hints #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17ee2a7
Update hint
fogelito May 26, 2025
4e8ba6d
formatting
fogelito May 26, 2025
20b2af2
more hints
fogelito May 26, 2025
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
3 changes: 2 additions & 1 deletion phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
stopOnFailure="false"
>
<testsuites>
<testsuite name="unit">
<directory>./tests/unit</directory>
Expand Down
546 changes: 325 additions & 221 deletions tests/e2e/Adapter/Scopes/AttributeTests.php
View file
Open in desktop

Large diffs are not rendered by default.

294 changes: 177 additions & 117 deletions tests/e2e/Adapter/Scopes/CollectionTests.php
View file
Open in desktop

Large diffs are not rendered by default.

975 changes: 609 additions & 366 deletions tests/e2e/Adapter/Scopes/DocumentTests.php
View file
Open in desktop

Large diffs are not rendered by default.

85 changes: 52 additions & 33 deletions tests/e2e/Adapter/Scopes/GeneralTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ trait GeneralTests
{
public function testPing(): void
{
$this->assertEquals(true, static::getDatabase()->ping());
/** @var Database $database */
$database = static::getDatabase();

$this->assertEquals(true, $database->ping());
}

/**
Expand All @@ -43,11 +46,14 @@ public function testQueryTimeout(): void
return;
}

static::getDatabase()->createCollection('global-timeouts');
/** @var Database $database */
$database = static::getDatabase();

$database->createCollection('global-timeouts');

$this->assertEquals(
true,
static::getDatabase()->createAttribute(
$database->createAttribute(
collection: 'global-timeouts',
id: 'longtext',
type: Database::VAR_STRING,
Expand All @@ -57,7 +63,7 @@ public function testQueryTimeout(): void
);

for ($i = 0; $i < 20; $i++) {
static::getDatabase()->createDocument('global-timeouts', new Document([
$database->createDocument('global-timeouts', new Document([
'longtext' => file_get_contents(__DIR__ . '/../../../resources/longtext.txt'),
'$permissions' => [
Permission::read(Role::any()),
Expand All @@ -67,16 +73,16 @@ public function testQueryTimeout(): void
]));
}

static::getDatabase()->setTimeout(1);
$database->setTimeout(1);

try {
static::getDatabase()->find('global-timeouts', [
$database->find('global-timeouts', [
Query::notEqual('longtext', 'appwrite'),
]);
$this->fail('Failed to throw exception');
} catch (\Exception $e) {
static::getDatabase()->clearTimeout();
static::getDatabase()->deleteCollection('global-timeouts');
$database->clearTimeout();
$database->deleteCollection('global-timeouts');
$this->assertInstanceOf(TimeoutException::class, $e);
}
}
Expand All @@ -87,25 +93,28 @@ public function testPreserveDatesUpdate(): void
{
Authorization::disable();

static::getDatabase()->setPreserveDates(true);
/** @var Database $database */
$database = static::getDatabase();

$database->setPreserveDates(true);

static::getDatabase()->createCollection('preserve_update_dates');
$database->createCollection('preserve_update_dates');

static::getDatabase()->createAttribute('preserve_update_dates', 'attr1', Database::VAR_STRING, 10, false);
$database->createAttribute('preserve_update_dates', 'attr1', Database::VAR_STRING, 10, false);

$doc1 = static::getDatabase()->createDocument('preserve_update_dates', new Document([
$doc1 = $database->createDocument('preserve_update_dates', new Document([
'$id' => 'doc1',
'$permissions' => [],
'attr1' => 'value1',
]));

$doc2 = static::getDatabase()->createDocument('preserve_update_dates', new Document([
$doc2 = $database->createDocument('preserve_update_dates', new Document([
'$id' => 'doc2',
'$permissions' => [],
'attr1' => 'value2',
]));

$doc3 = static::getDatabase()->createDocument('preserve_update_dates', new Document([
$doc3 = $database->createDocument('preserve_update_dates', new Document([
'$id' => 'doc3',
'$permissions' => [],
'attr1' => 'value3',
Expand All @@ -114,9 +123,9 @@ public function testPreserveDatesUpdate(): void
$newDate = '2000-01-01T10:00:00.000+00:00';

$doc1->setAttribute('$updatedAt', $newDate);
$doc1 = static::getDatabase()->updateDocument('preserve_update_dates', 'doc1', $doc1);
$doc1 = $database->updateDocument('preserve_update_dates', 'doc1', $doc1);
$this->assertEquals($newDate, $doc1->getAttribute('$updatedAt'));
$doc1 = static::getDatabase()->getDocument('preserve_update_dates', 'doc1');
$doc1 = $database->getDocument('preserve_update_dates', 'doc1');
$this->assertEquals($newDate, $doc1->getAttribute('$updatedAt'));

$this->getDatabase()->updateDocuments(
Expand All @@ -132,14 +141,14 @@ public function testPreserveDatesUpdate(): void
]
);

$doc2 = static::getDatabase()->getDocument('preserve_update_dates', 'doc2');
$doc3 = static::getDatabase()->getDocument('preserve_update_dates', 'doc3');
$doc2 = $database->getDocument('preserve_update_dates', 'doc2');
$doc3 = $database->getDocument('preserve_update_dates', 'doc3');
$this->assertEquals($newDate, $doc2->getAttribute('$updatedAt'));
$this->assertEquals($newDate, $doc3->getAttribute('$updatedAt'));

static::getDatabase()->deleteCollection('preserve_update_dates');
$database->deleteCollection('preserve_update_dates');

static::getDatabase()->setPreserveDates(false);
$database->setPreserveDates(false);

Authorization::reset();
}
Expand All @@ -148,22 +157,25 @@ public function testPreserveDatesCreate(): void
{
Authorization::disable();

static::getDatabase()->setPreserveDates(true);
/** @var Database $database */
$database = static::getDatabase();

static::getDatabase()->createCollection('preserve_create_dates');
$database->setPreserveDates(true);

static::getDatabase()->createAttribute('preserve_create_dates', 'attr1', Database::VAR_STRING, 10, false);
$database->createCollection('preserve_create_dates');

$database->createAttribute('preserve_create_dates', 'attr1', Database::VAR_STRING, 10, false);

$date = '2000-01-01T10:00:00.000+00:00';

static::getDatabase()->createDocument('preserve_create_dates', new Document([
$database->createDocument('preserve_create_dates', new Document([
'$id' => 'doc1',
'$permissions' => [],
'attr1' => 'value1',
'$createdAt' => $date
]));

static::getDatabase()->createDocuments('preserve_create_dates', [
$database->createDocuments('preserve_create_dates', [
new Document([
'$id' => 'doc2',
'$permissions' => [],
Expand All @@ -178,16 +190,16 @@ public function testPreserveDatesCreate(): void
]),
], batchSize: 2);

$doc1 = static::getDatabase()->getDocument('preserve_create_dates', 'doc1');
$doc2 = static::getDatabase()->getDocument('preserve_create_dates', 'doc2');
$doc3 = static::getDatabase()->getDocument('preserve_create_dates', 'doc3');
$doc1 = $database->getDocument('preserve_create_dates', 'doc1');
$doc2 = $database->getDocument('preserve_create_dates', 'doc2');
$doc3 = $database->getDocument('preserve_create_dates', 'doc3');
$this->assertEquals($date, $doc1->getAttribute('$createdAt'));
$this->assertEquals($date, $doc2->getAttribute('$createdAt'));
$this->assertEquals($date, $doc3->getAttribute('$createdAt'));

static::getDatabase()->deleteCollection('preserve_create_dates');
$database->deleteCollection('preserve_create_dates');

static::getDatabase()->setPreserveDates(false);
$database->setPreserveDates(false);

Authorization::reset();
}
Expand Down Expand Up @@ -271,7 +283,11 @@ public function testFindOrderByAfterException(): void
]);

$this->expectException(Exception::class);
static::getDatabase()->find('movies', [

/** @var Database $database */
$database = static::getDatabase();

$database->find('movies', [
Query::limit(2),
Query::offset(0),
Query::cursorAfter($document)
Expand Down Expand Up @@ -405,7 +421,7 @@ public function testSharedTablesTenantPerDocument(): void
$this->assertEquals(1, \count($docs));
$this->assertEquals($doc1Id, $docs[0]->getId());

if (static::getDatabase()->getAdapter()->getSupportForUpserts()) {
if ($database->getAdapter()->getSupportForUpserts()) {
// Test upsert with tenant per doc
$doc3Id = ID::unique();
$database
Expand Down Expand Up @@ -521,7 +537,10 @@ public function testSharedTablesTenantPerDocument(): void

public function testCacheFallback(): void
{
if (!static::getDatabase()->getAdapter()->getSupportForCacheSkipOnFailure()) {
/** @var Database $database */
$database = static::getDatabase();

if (!$database->getAdapter()->getSupportForCacheSkipOnFailure()) {
$this->expectNotToPerformAssertions();
return;
}
Expand Down
Loading