Skip to content

Flattened promises in tests.#30

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

Open
bartvanhoutte wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Flattened promises in tests. #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
172 changes: 84 additions & 88 deletions tests/ConnectionTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,25 +162,25 @@ public function testQuery()
'id' => '1',
'field1' => 'val1',
'field2' => 'val2',
])
->then(function () use ($connection) {
return $connection
->query($connection
->createQueryBuilder()
->select('*')
->from('test', 't')
->where('t.id = ?')
->setParameters(['1'])
->setMaxResults(1)
);
})
->then(function (Result $result) {
$this->assertEquals($result->fetchFirstRow(), [
'id' => '1',
'field1' => 'val1',
'field2' => 'val2',
]);
});
]);
})
->then(function () use ($connection) {
return $connection
->query($connection
->createQueryBuilder()
->select('*')
->from('test', 't')
->where('t.id = ?')
->setParameters(['1'])
->setMaxResults(1)
);
})
->then(function (Result $result) {
$this->assertEquals($result->fetchFirstRow(), [
'id' => '1',
'field1' => 'val1',
'field2' => 'val2',
]);
});

await($promise, $loop, self::MAX_TIMEOUT);
Expand All@@ -196,26 +196,24 @@ public function testMultipleRows()
$promise = $this
->resetInfrastructure($connection)
->then(function (Connection $connection) {
return $connection
->insert('test', [
'id' => '1',
'field1' => 'val11',
'field2' => 'val12',
])
->then(function () use ($connection) {
return $connection->insert('test', [
'id' => '2',
'field1' => 'val21',
'field2' => 'val22',
]);
})
->then(function () use ($connection) {
return $connection->insert('test', [
'id' => '3',
'field1' => 'val31',
'field2' => 'val32',
]);
});
return $connection->insert('test', [
'id' => '1',
'field1' => 'val11',
'field2' => 'val12',
]);
})->then(function () use ($connection) {
return $connection->insert('test', [
'id' => '2',
'field1' => 'val21',
'field2' => 'val22',
]);
})
->then(function () use ($connection) {
return $connection->insert('test', [
'id' => '3',
'field1' => 'val31',
'field2' => 'val32',
]);
})
->then(function () use ($connection) {
$queryBuilder = $connection->createQueryBuilder();
Expand DownExpand Up@@ -287,46 +285,46 @@ public function testFindShortcut()
'field1' => 'valX',
'field2' => 'val2',
]),
])
->then(function () use ($connection) {
return all([
$connection->findOneBy('test', [
'id' => '1',
]),
$connection->findOneBy('test', [
'id' => '999',
]),
$connection->findBy('test', [
'field1' => 'val1',
]),
]);
})
->then(function (array $results) {
$this->assertEquals($results[0], [
]);
})
->then(function () use ($connection) {
return all([
$connection->findOneBy('test', [
'id' => '1',
]),
$connection->findOneBy('test', [
'id' => '999',
]),
$connection->findBy('test', [
'field1' => 'val1',
'field2' => 'val1',
]);

$this->assertNull($results[1]);
$listResults = $results[2];
usort($listResults, function ($a1, $a2) {
return $a1['id'] > $a2['id'];
});
]),
]);
})
->then(function (array $results) {
$this->assertEquals($results[0], [
'id' => '1',
'field1' => 'val1',
'field2' => 'val1',
]);

$this->assertSame($listResults, [
[
'id' => '1',
'field1' => 'val1',
'field2' => 'val1',
],
[
'id' => '2',
'field1' => 'val1',
'field2' => 'val2',
],
]);
$this->assertNull($results[1]);
$listResults = $results[2];
usort($listResults, function ($a1, $a2) {
return $a1['id'] > $a2['id'];
});

$this->assertSame($listResults, [
[
'id' => '1',
'field1' => 'val1',
'field2' => 'val1',
],
[
'id' => '2',
'field1' => 'val1',
'field2' => 'val2',
],
]);
});

await($promise, $loop, self::MAX_TIMEOUT);
Expand DownExpand Up@@ -376,19 +374,17 @@ public function testInsertTwice()
$promise = $this
->resetInfrastructure($connection)
->then(function (Connection $connection) {
return $connection
->insert('test', [
'id' => '1',
'field1' => 'val1',
'field2' => 'val1',
])
->then(function () use ($connection) {
return $connection->insert('test', [
'id' => '1',
'field1' => 'val1',
'field2' => 'val1',
]);
});
return $connection->insert('test', [
'id' => '1',
'field1' => 'val1',
'field2' => 'val1',
]);
})->then(function () use ($connection) {
return $connection->insert('test', [
'id' => '1',
'field1' => 'val1',
'field2' => 'val1',
]);
});

$this->expectException(UniqueConstraintViolationException::class);
Expand Down