Skip to content

Commit

Permalink
Merge pull request #5535 from derrabus/improvement/assert-count
Browse files Browse the repository at this point in the history 
Use `assertCount()` when possible
  • Loading branch information
@morozov
morozov committed Jul 25, 2022
2 parents f31bf8a + 1100987 commit de42378
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
4 changes: 1 addition & 3 deletions tests/Functional/Platform/NewPrimaryKeyWithNewAutoIncrementColumnTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
use Doctrine\DBAL\Schema\Comparator;
use Doctrine\DBAL\Tests\FunctionalTestCase;

use function count;

final class NewPrimaryKeyWithNewAutoIncrementColumnTest extends FunctionalTestCase
{
protected function setUp(): void
Expand Down Expand Up @@ -63,7 +61,7 @@ public function testAlterPrimaryKeyToAutoIncrementColumn(callable $comparatorFac
self::assertTrue($validationTable->hasColumn('new_id'));
self::assertTrue($validationTable->getColumn('new_id')->getAutoincrement());
self::assertTrue($validationTable->hasPrimaryKey());
self::assertEquals(1, count($validationTable->getPrimaryKeyColumns()));
self::assertCount(1, $validationTable->getPrimaryKeyColumns());
self::assertArrayHasKey('new_id', $validationTable->getPrimaryKeyColumns());
}

Expand Down
26 changes: 13 additions & 13 deletions tests/Functional/Schema/SchemaManagerFunctionalTestCase.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ public function testListTableIndexes(): void

$tableIndexes = $this->schemaManager->listTableIndexes('list_table_indexes_test');

self::assertEquals(3, count($tableIndexes));
self::assertCount(3, $tableIndexes);

self::assertArrayHasKey('primary', $tableIndexes, 'listTableIndexes() has to return a "primary" array key.');
self::assertEquals(['id', 'other_id'], array_map('strtolower', $tableIndexes['primary']->getColumns()));
Expand Down Expand Up @@ -513,7 +513,7 @@ public function testCreateTableWithForeignKeys(): void

$fkTable = $this->schemaManager->listTableDetails('test_create_fk');
$fkConstraints = $fkTable->getForeignKeys();
self::assertEquals(1, count($fkConstraints), "Table 'test_create_fk1' has to have one foreign key.");
self::assertCount(1, $fkConstraints, "Table 'test_create_fk' has to have one foreign key.");

$fkConstraint = current($fkConstraints);
self::assertInstanceOf(ForeignKeyConstraint::class, $fkConstraint);
Expand Down Expand Up @@ -545,7 +545,7 @@ public function testListForeignKeys(): void

$fkeys = $this->schemaManager->listTableForeignKeys('test_create_fk1');

self::assertEquals(1, count($fkeys), "Table 'test_create_fk1' has to have one foreign key.");
self::assertCount(1, $fkeys, "Table 'test_create_fk1' has to have one foreign key.");

self::assertInstanceOf(ForeignKeyConstraint::class, $fkeys[0]);
self::assertEquals(['foreign_key_test'], array_map('strtolower', $fkeys[0]->getLocalColumns()));
Expand Down Expand Up @@ -613,8 +613,8 @@ public function testAlterTableScenario(): void
self::assertTrue($table->hasColumn('id'));
self::assertTrue($table->hasColumn('test'));
self::assertTrue($table->hasColumn('foreign_key_test'));
self::assertEquals(0, count($table->getForeignKeys()));
self::assertEquals(1, count($table->getIndexes()));
self::assertCount(0, $table->getForeignKeys());
self::assertCount(1, $table->getIndexes());

$tableDiff = new TableDiff('alter_table');
$tableDiff->fromTable = $alterTable;
Expand All @@ -634,7 +634,7 @@ public function testAlterTableScenario(): void
$this->schemaManager->alterTable($tableDiff);

$table = $this->schemaManager->listTableDetails('alter_table');
self::assertEquals(2, count($table->getIndexes()));
self::assertCount(2, $table->getIndexes());
self::assertTrue($table->hasIndex('foo_idx'));
self::assertEquals(['foo'], array_map('strtolower', $table->getIndex('foo_idx')->getColumns()));
self::assertFalse($table->getIndex('foo_idx')->isPrimary());
Expand All @@ -647,7 +647,7 @@ public function testAlterTableScenario(): void
$this->schemaManager->alterTable($tableDiff);

$table = $this->schemaManager->listTableDetails('alter_table');
self::assertEquals(2, count($table->getIndexes()));
self::assertCount(2, $table->getIndexes());
self::assertTrue($table->hasIndex('foo_idx'));
self::assertEquals(
['foo', 'foreign_key_test'],
Expand All @@ -661,7 +661,7 @@ public function testAlterTableScenario(): void
$this->schemaManager->alterTable($tableDiff);

$table = $this->schemaManager->listTableDetails('alter_table');
self::assertEquals(2, count($table->getIndexes()));
self::assertCount(2, $table->getIndexes());
self::assertTrue($table->hasIndex('bar_idx'));
self::assertFalse($table->hasIndex('foo_idx'));
self::assertEquals(
Expand Down Expand Up @@ -900,7 +900,7 @@ public function testGetColumnComment(): void
$this->schemaManager->createTable($table);

$columns = $this->schemaManager->listTableColumns('column_comment_test');
self::assertEquals(1, count($columns));
self::assertCount(1, $columns);
self::assertEquals('This is a comment', $columns['id']->getComment());

$tableDiff = new TableDiff('column_comment_test');
Expand All @@ -922,7 +922,7 @@ public function testGetColumnComment(): void
$this->schemaManager->alterTable($tableDiff);

$columns = $this->schemaManager->listTableColumns('column_comment_test');
self::assertEquals(1, count($columns));
self::assertCount(1, $columns);
self::assertEmpty($columns['id']->getComment());
}

Expand All @@ -947,7 +947,7 @@ public function testAutomaticallyAppendCommentOnMarkedColumns(): void
$this->schemaManager->createTable($table);

$columns = $this->schemaManager->listTableColumns('column_comment_test2');
self::assertEquals(3, count($columns));
self::assertCount(3, $columns);
self::assertEquals('This is a comment', $columns['id']->getComment());
self::assertEquals('This is a comment', $columns['obj']->getComment());
self::assertInstanceOf(ObjectType::class, $columns['obj']->getType());
Expand Down Expand Up @@ -975,7 +975,7 @@ public function testCommentHintOnDateIntervalTypeColumn(): void
$this->schemaManager->createTable($table);

$columns = $this->schemaManager->listTableColumns('column_dateinterval_comment');
self::assertEquals(2, count($columns));
self::assertCount(2, $columns);
self::assertEquals('This is a comment', $columns['id']->getComment());
self::assertEquals('This is a comment', $columns['date_interval']->getComment());
self::assertInstanceOf(DateIntervalType::class, $columns['date_interval']->getType());
Expand Down Expand Up @@ -1110,7 +1110,7 @@ public function testListForeignKeysComposite(): void

$fkeys = $this->schemaManager->listTableForeignKeys('test_create_fk3');

self::assertEquals(1, count($fkeys), "Table 'test_create_fk3' has to have one foreign key.");
self::assertCount(1, $fkeys, "Table 'test_create_fk3' has to have one foreign key.");

self::assertInstanceOf(ForeignKeyConstraint::class, $fkeys[0]);
self::assertEquals(['id', 'foreign_key_test'], array_map('strtolower', $fkeys[0]->getLocalColumns()));
Expand Down

0 comments on commit de42378

Please sign in to comment.