Improving code coverage and exception throwing for lazy beans

Author: moufmouf

src/DbRow.php

@@ -217,7 +217,7 @@ public function _dbLoadIfNotLoaded(): void
                 $dataLoader = $this->partialQuery->getStorageNode()->getManyToOneDataLoader($this->partialQuery->getKey());
 
                 if (count($this->primaryKeys) !== 1) {
-                    throw new \RuntimeException('Dataloader patterns only supports primary keys on one columns. Table "'.$this->dbTableName.'" has a PK on '.count($this->primaryKeys). ' columns');
+                    throw new \RuntimeException('Data-loader patterns only supports primary keys on one column. Table "'.$this->dbTableName.'" has a PK on '.count($this->primaryKeys). ' columns'); // @codeCoverageIgnore
                 }
                 $pks = $this->primaryKeys;
                 $pkId = array_pop($pks);
@@ -234,7 +234,7 @@ public function _dbLoadIfNotLoaded(): void
                 $result->closeCursor();
 
                 if ($row === false) {
-                    throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \".$sql_where.\" with data \"".var_export($parameters, true)."\".");
+                    throw new NoBeanFoundException("Could not retrieve object from table \"$this->dbTableName\" using filter \"$sql_where\" with data \"".var_export($parameters, true). '".');
                 }
             }
 

src/QueryFactory/FindObjectsQueryFactory.php

@@ -43,7 +43,8 @@ protected function compute(): void
             [
                 $this->magicSql,
                 $this->magicSqlCount,
-                $this->columnDescList
+                $this->columnDescList,
+                $this->magicSqlSubQuery
             ] = $this->cache->fetch($key);
             return;
         }
@@ -85,6 +86,7 @@ protected function compute(): void
             $this->magicSql,
             $this->magicSqlCount,
             $this->columnDescList,
+            $this->magicSqlSubQuery,
         ]);
     }
 

src/QueryFactory/SmartEagerLoad/Query/StaticPartialQuery.php

@@ -73,7 +73,7 @@ public function getQueryFrom(): string
             $this->magicQuery->setOutputDialect(null);
             $fromIndex = strpos($sql, 'FROM');
             if ($fromIndex === false) {
-                throw new TDBMException('Expected smart eager loader query to contain a "FROM"');
+                throw new TDBMException('Expected smart eager loader query to contain a "FROM"'); // @codeCoverageIgnore
             }
             $this->magicFrom = substr($sql, $fromIndex);
         }

tests/QueryFactory/SmartEagerLoad/ManyToOneDataLoaderTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace TheCodingMachine\TDBM\QueryFactory\SmartEagerLoad;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use TheCodingMachine\TDBM\TDBMException;
+
+class ManyToOneDataLoaderTest extends TestCase
+{
+
+    public function testGet()
+    {
+        $connection = $this->createMock(Connection::class);
+        $connection->method('fetchAll')->willReturn([]);
+        $dataLoader = new ManyToOneDataLoader($connection, 'SELECT * FROM users', 'id');
+
+        $this->expectException(TDBMException::class);
+        $dataLoader->get('42');
+    }
+}

tests/QueryFactory/SmartEagerLoad/Query/StaticPartialQueryTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace TheCodingMachine\TDBM\QueryFactory\SmartEagerLoad\Query;
+
+use Doctrine\DBAL\Connection;
+use Mouf\Database\MagicQuery;
+use PHPUnit\Framework\TestCase;
+use TheCodingMachine\TDBM\QueryFactory\SmartEagerLoad\StorageNode;
+use TheCodingMachine\TDBM\TDBMException;
+
+class StaticPartialQueryTest extends TestCase
+{
+
+    public function testRegisterDataLoader()
+    {
+        $query = new StaticPartialQuery('FROM users', ['foo'=>42], ['users'], $this->createMock(StorageNode::class), new MagicQuery());
+        $this->expectException(TDBMException::class);
+        $query->registerDataLoader($this->createMock(Connection::class));
+    }
+
+    public function testGetMagicQuery()
+    {
+        $magicQuery = new MagicQuery();
+        $query = new StaticPartialQuery('FROM users', ['foo'=>42], ['users'], $this->createMock(StorageNode::class), $magicQuery);
+        $this->assertSame($magicQuery, $query->getMagicQuery());
+    }
+
+    public function testGetParameters()
+    {
+        $magicQuery = new MagicQuery();
+        $query = new StaticPartialQuery('FROM users', ['foo'=>42], ['users'], $this->createMock(StorageNode::class), $magicQuery);
+        $this->assertSame(['foo'=>42], $query->getParameters());
+    }
+}

tests/TDBMAbstractServiceTest.php

@@ -69,7 +69,7 @@ abstract class TDBMAbstractServiceTest extends TestCase
     /**
      * @var ArrayCache
      */
-    private $cache;
+    private static $cache;
 
     public static function setUpBeforeClass(): void
     {
@@ -133,10 +133,10 @@ protected function getDummyGeneratorListener() : DummyGeneratorListener
 
     protected function getCache(): ArrayCache
     {
-        if ($this->cache === null) {
-            $this->cache = new ArrayCache();
+        if (self::$cache === null) {
+            self::$cache = new ArrayCache();
         }
-        return $this->cache;
+        return self::$cache;
     }
 
     protected function getConfiguration() : ConfigurationInterface

tests/TDBMDaoGeneratorTest.php

@@ -2217,6 +2217,9 @@ public function testSubQueryExceptionOnPrimaryKeysWithMultipleColumns(): void
         $states->_getSubQuery();
     }
 
+    /**
+     * @depends testDaoGeneration
+     */
     public function testManyToOneEagerLoading(): void
     {
         $userDao = new UserDao($this->tdbmService);
@@ -2237,4 +2240,19 @@ public function testManyToOneEagerLoading(): void
         $this->assertTrue($users->getIterator()->hasManyToOneDataLoader('__country_id'));
         $this->assertSame(['UK', 'France', 'Jamaica', 'UK', 'UK', 'Mexico'], $countryNames);
     }
+
+    /**
+     * @depends testDaoGeneration
+     */
+    public function testLazyLoadBadIdException(): void
+    {
+        $countryDao = new CountryDao($this->tdbmService);
+        $lazyBean = $countryDao->getById(-1, true);
+
+        $this->expectException(NoBeanFoundException::class);
+        $this->expectExceptionMessage("Could not retrieve object from table \"country\" using filter \"(`id` = :tdbmparam1)\" with data \"array (
+  'tdbmparam1' => -1,
+)\".");
+        $lazyBean->getLabel();
+    }
 }