Extend tests

src/Constraint/DataSetIsEqual.php

@@ -23,7 +23,7 @@ class DataSetIsEqual extends Constraint
     /**
      * @var IDataSet
      */
-    protected $value;
+    protected IDataSet $value;
 
     /**
      * @param IDataSet $value
@@ -41,8 +41,8 @@ public function __construct(IDataSet $value)
     public function toString(): string
     {
         return sprintf(
-            'is equal to expected %s',
-            implode(',', $this->value->getTableNames())
+            'is equal to expected dataset %s',
+            $this->value
         );
     }
 

src/Constraint/TableIsEqual.php

@@ -23,7 +23,7 @@ class TableIsEqual extends Constraint
     /**
      * @var ITable
      */
-    protected $value;
+    protected ITable $value;
 
     /**
      * @param ITable $value
@@ -42,7 +42,7 @@ public function toString(): string
     {
         return sprintf(
             'is equal to expected %s',
-            $this->value->getTableMetaData()->getTableName()
+            $this->value
         );
     }
 

src/DataSet/AbstractDataSet.php

@@ -20,15 +20,15 @@ abstract class AbstractDataSet implements IDataSet
 {
     public function __toString()
     {
+        /** @var ITable[] $iterator */
         $iterator = $this->getIterator();
 
-        $dataSetString = '';
-
+        $tables = [];
         foreach ($iterator as $table) {
-            $dataSetString .= $table;
+            $tables[] = $table->getTableMetadata()->getTableName();
         }
 
-        return $dataSetString;
+        return '[' . implode(',', $tables) . ']';
     }
 
     /**

src/DataSet/DefaultDataSet.php

@@ -19,9 +19,9 @@ class DefaultDataSet extends AbstractDataSet
     /**
      * An array of ITable objects.
      *
-     * @var array
+     * @var ITable[]
      */
-    protected $tables;
+    protected array $tables;
 
     /**
      * @param array $tables

src/DataSet/IDataSet.php

@@ -14,7 +14,7 @@
 /**
  * Provides a basic interface for creating and reading data from data sets.
  */
-interface IDataSet extends \IteratorAggregate
+interface IDataSet extends \IteratorAggregate, \Stringable
 {
     /**
      * Returns an array of table names contained in the dataset.

src/DataSet/ITable.php

@@ -14,7 +14,7 @@
 /**
  * Provides a basic interface for creating and reading data from data sets.
  */
-interface ITable
+interface ITable extends \Stringable
 {
     /**
      * Returns the table's meta data.

src/Database/Metadata/Firebird.php

@@ -16,6 +16,10 @@
  */
 class Firebird extends AbstractMetadata
 {
+    protected array $columns = [];
+
+    protected array $keys = [];
+
     /**
      * The command used to perform a TRUNCATE operation.
      *
@@ -30,17 +34,7 @@ class Firebird extends AbstractMetadata
      */
     public function getTableNames()
     {
-        $query = "
-            SELECT DISTINCT
-                TABLE_NAME
-            FROM INFORMATION_SCHEMA.TABLES
-            WHERE
-                TABLE_TYPE='BASE TABLE' AND
-                TABLE_SCHEMA = ?
-            ORDER BY TABLE_NAME
-        ";
-
-        $query = "
+        $query = '
             select
               RDB$RELATION_NAME as TABLE_NAME
             from RDB$RELATIONS
@@ -49,7 +43,7 @@ public function getTableNames()
                (RDB$RELATION_TYPE is null)) and
               (RDB$SYSTEM_FLAG = 0)
             order by (RDB$RELATION_NAME)
-        ";
+        ';
 
         $statement = $this->pdo->prepare($query);
         $statement->execute([$this->getSchema()]);

src/Database/Metadata/PgSQL.php

@@ -16,9 +16,9 @@
  */
 class PgSQL extends AbstractMetadata
 {
-    private array $columns = [];
+    protected array $columns = [];
 
-    private array $keys = [];
+    protected array $keys = [];
 
     /**
      * Returns an array containing the names of all the tables in the database.

tests/Constraint/DataSetIsEqualTest.php

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of DbUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PHPUnit\DbUnit\Tests\Constraint;
+
+use PHPUnit\DbUnit\Constraint\DataSetIsEqual;
+use PHPUnit\DbUnit\DataSet\DefaultDataSet;
+use PHPUnit\DbUnit\DataSet\DefaultTable;
+use PHPUnit\DbUnit\DataSet\DefaultTableMetadata;
+use PHPUnit\DbUnit\Exception\InvalidArgumentException;
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
+
+class DataSetIsEqualTest extends TestCase
+{
+    public function testMatch(): void
+    {
+        $constraint = $this->createConstraint();
+
+        $dataSet = new DefaultDataSet([
+            new DefaultTable(
+                new DefaultTableMetadata('table1', ['id', 'col1'], ['id']),
+            ),
+            new DefaultTable(
+                new DefaultTableMetadata('table2', ['id', 'col2'], ['id']),
+            ),
+        ]);
+
+        self::assertTrue($constraint->evaluate($dataSet, '', true));
+        self::assertFalse($constraint->evaluate(new DefaultDataSet(), '', true));
+        self::assertSame('is equal to expected dataset [table1,table2]', $constraint->toString());
+    }
+
+    public function testMatchInvalidType(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Only dataset instance can be matched');
+
+        $constraint = $this->createConstraint();
+        $constraint->evaluate(null);
+    }
+
+    public function testExpectationFailed(): void
+    {
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that [] is equal to expected dataset [table1,table2].');
+
+        self::assertThat(new DefaultDataSet(), $this->createConstraint());
+    }
+
+    private function createConstraint(): DataSetIsEqual
+    {
+        $dataSet = new DefaultDataSet([
+            new DefaultTable(
+                new DefaultTableMetadata('table1', ['id', 'col1'], ['id']),
+            ),
+            new DefaultTable(
+                new DefaultTableMetadata('table2', ['id', 'col2'], ['id']),
+            ),
+        ]);
+
+        return new DataSetIsEqual($dataSet);
+    }
+}

tests/Constraint/TableIsEqualTest.php

@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of DbUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PHPUnit\DbUnit\Tests\Constraint;
+
+use PHPUnit\DbUnit\Constraint\TableIsEqual;
+use PHPUnit\DbUnit\DataSet\DefaultTable;
+use PHPUnit\DbUnit\DataSet\DefaultTableMetadata;
+use PHPUnit\DbUnit\Exception\InvalidArgumentException;
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
+
+class TableIsEqualTest extends TestCase
+{
+    public function testMatch(): void
+    {
+        $constraint = $this->createConstraint();
+
+        $table1 = new DefaultTable(
+            new DefaultTableMetadata('table1', ['id', 'col1'], ['id']),
+        );
+        $table2 = new DefaultTable(
+            new DefaultTableMetadata('table2', ['id', 'col2'], ['id']),
+        );
+
+        self::assertTrue($constraint->evaluate($table1, '', true));
+        self::assertFalse($constraint->evaluate($table2, '', true));
+        self::assertSame(
+            sprintf('is equal to expected %s', $table1),
+            $constraint->toString()
+        );
+    }
+
+    public function testMatchInvalidType(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Only table instance can be matched');
+
+        $constraint = $this->createConstraint();
+        $constraint->evaluate(null);
+    }
+
+    public function testExpectationFailed(): void
+    {
+        $table1 = new DefaultTable(
+            new DefaultTableMetadata('table1', ['id', 'col1'], ['id']),
+        );
+        $table2 = new DefaultTable(
+            new DefaultTableMetadata('table2', ['id', 'col2'], ['id']),
+        );
+
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage(
+            sprintf(
+                'Failed asserting that %s is equal to expected %s.',
+                $table2,
+                $table1
+            )
+        );
+
+        self::assertThat($table2, $this->createConstraint());
+    }
+
+    private function createConstraint(): TableIsEqual
+    {
+        $table = new DefaultTable(
+            new DefaultTableMetadata('table1', ['id', 'col1'], ['id']),
+        );
+
+        return new TableIsEqual($table);
+    }
+}

tests/Constraint/TableRowCountTest.php

@@ -21,14 +21,14 @@ public function testConstraint(): void
     {
         $constraint = new TableRowCount('name', 42);
 
-        $this->assertTrue($constraint->evaluate(42, '', true));
-        $this->assertFalse($constraint->evaluate(24, '', true));
-        $this->assertSame('is equal to expected row count 42', $constraint->toString());
+        self::assertTrue($constraint->evaluate(42, '', true));
+        self::assertFalse($constraint->evaluate(24, '', true));
+        self::assertSame('is equal to expected row count 42', $constraint->toString());
 
         try {
-            $this->assertThat(24, $constraint);
+            self::assertThat(24, $constraint);
         } catch (ExpectationFailedException $e) {
-            $this->assertSame(
+            self::assertSame(
                 'Failed asserting that 24 is equal to expected row count 42.',
                 $e->getMessage()
             );