[Tests] Refactored unit tests to rely on Doctrine QueryBuilder

ezsystems · Mar 27, 2020 · a385b16 · a385b16
1 parent 2c15b86
commit a385b16
Show file tree

Hide file tree

Showing 7 changed files with 336 additions and 248 deletions.
diff --git a/eZ/Publish/Core/FieldType/Tests/Url/Gateway/DoctrineStorageTest.php b/eZ/Publish/Core/FieldType/Tests/Url/Gateway/DoctrineStorageTest.php
@@ -8,6 +8,7 @@
  */
 namespace eZ\Publish\Core\FieldType\Tests\Url\Gateway;
 
+use eZ\Publish\Core\FieldType\Url\UrlStorage\Gateway;
 use eZ\Publish\Core\FieldType\Url\UrlStorage\Gateway\DoctrineStorage;
 use eZ\Publish\Core\Persistence\Legacy\Tests\TestCase;
 
@@ -180,12 +181,13 @@ public function testUnlinkUrl()
         $this->assertEquals($expected, $result);
     }
 
-    protected function getStorageGateway()
+    /**
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    protected function getStorageGateway(): Gateway
     {
         if (!isset($this->storageGateway)) {
-            $this->storageGateway = new DoctrineStorage(
-                $this->getDatabaseHandler()->getConnection()
-            );
+            $this->storageGateway = new DoctrineStorage($this->getDatabaseConnection());
         }
 
         return $this->storageGateway;

diff --git a/eZ/Publish/Core/Persistence/Legacy/Tests/Bookmark/Gateway/DoctrineDatabaseTest.php b/eZ/Publish/Core/Persistence/Legacy/Tests/Bookmark/Gateway/DoctrineDatabaseTest.php
@@ -8,6 +8,7 @@
 
 namespace eZ\Publish\Core\Persistence\Legacy\Tests\Bookmark\Gateway;
 
+use eZ\Publish\Core\Persistence\Legacy\Bookmark\Gateway;
 use eZ\Publish\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase;
 use eZ\Publish\Core\Persistence\Legacy\Tests\TestCase;
 use eZ\Publish\SPI\Persistence\Bookmark\Bookmark;
@@ -154,13 +155,11 @@ public function testLocationSwapped()
     /**
      * Return a ready to test DoctrineStorage gateway.
      *
-     * @return \eZ\Publish\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase
+     * @throws \Doctrine\DBAL\DBALException
      */
-    protected function getGateway(): DoctrineDatabase
+    protected function getGateway(): Gateway
     {
-        return new DoctrineDatabase(
-            $this->getDatabaseHandler()->getConnection()
-        );
+        return new DoctrineDatabase($this->getDatabaseConnection());
     }
 
     private function loadBookmark(int $id): array