Composite Pk - getById: Add Tests

Author: homersimpsons

tests/TDBMDaoGeneratorTest.php

@@ -50,6 +50,7 @@
 use TheCodingMachine\TDBM\Test\Dao\Bean\BoatBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CatBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CategoryBean;
+use TheCodingMachine\TDBM\Test\Dao\Bean\CompositePkBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CountryBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\DateArrayBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\DogBean;
@@ -69,6 +70,7 @@
 use TheCodingMachine\TDBM\Test\Dao\BoatDao;
 use TheCodingMachine\TDBM\Test\Dao\CatDao;
 use TheCodingMachine\TDBM\Test\Dao\CategoryDao;
+use TheCodingMachine\TDBM\Test\Dao\CompositePkDao;
 use TheCodingMachine\TDBM\Test\Dao\ContactDao;
 use TheCodingMachine\TDBM\Test\Dao\CountryDao;
 use TheCodingMachine\TDBM\Test\Dao\DogDao;
@@ -1799,15 +1801,6 @@ public function testDecimalIsMappedToString(): void
         $this->assertSame('string', (string) $reflectionClass->getMethod('getLength')->getReturnType());
     }
 
-    /**
-     * @depends testDaoGeneration
-     */
-    public function testNoGetByIdOnMultiPrimaryKeys(): void
-    {
-        $reflectionClass = new \ReflectionClass(StateDao::class);
-        $this->assertFalse($reflectionClass->hasMethod('getById'));
-    }
-
     /**
      * @depends testDaoGeneration
      */
@@ -1836,6 +1829,18 @@ public function testDeleteMultiPrimaryKeysBean(): void
         $this->assertCount(0, $stateDao->findAll());
     }
 
+    /**
+     * @depends testDaoGeneration
+     */
+    public function testCompositePrimaryKeyGetter(): void
+    {
+        $stateDao = new StateDao($this->tdbmService);
+        $country = new CountryBean('USA');
+        $stateBean = new StateBean($country, 'CA', 'California');
+        $stateDao->save($stateBean);
+        $this->assertSame($stateBean, $stateDao->getById($country->getId(), 'CA'));
+    }
+
     /**
      * @depends testDaoGeneration
      */
@@ -2091,7 +2096,7 @@ public function testOneToOneInverseRelationGetter(): void
         $this->assertNull($objectBase->getObjectInherited());
         $objectInherited = new ObjectInheritedBean($objectBase);
         $objectInheritedDao->save($objectInherited);
-        $this->assertInstanceOf(ObjectInheritedBean::class, $objectBase->getObjectInherited());
+        $this->assertSame($objectInherited, $objectBase->getObjectInherited());
         $this->assertEquals(1, $objectBase->jsonSerialize()['objectInherited']['id']);
     }
 }

tests/Utils/BeanDescriptorTest.php

@@ -24,6 +24,7 @@
 use Doctrine\Common\Cache\VoidCache;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Types\Type;
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
 use TheCodingMachine\TDBM\TDBMAbstractServiceTest;
 use TheCodingMachine\TDBM\TDBMException;
@@ -98,6 +99,23 @@ public function testTableWithNoPrimaryKey(): void
         new BeanDescriptor($table, 'Foo\\Bar', 'Foo\\Generated\\Bar', 'Tdbm\\Test\\Daos', 'Tdbm\\Test\\Daos\\Generated', $this->schemaAnalyzer, $this->schema, $this->tdbmSchemaAnalyzer, $this->getNamingStrategy(), AnnotationParser::buildWithDefaultAnnotations([]), new BaseCodeGeneratorListener(), $this->getConfiguration());
     }
 
+    public function testTableWithLazyLoadingColumn(): void
+    {
+        $table = $this->schema->createTable('lazy_loading');
+        $table->addColumn('lazyLoading', Type::BOOLEAN);
+        $table->setPrimaryKey(['lazyLoading']);
+        $sqlStmts = $this->schema->getMigrateFromSql($this->getConnection()->getSchemaManager()->createSchema(), $this->getConnection()->getDatabasePlatform());
+
+        foreach ($sqlStmts as $sqlStmt) {
+            $this->getConnection()->exec($sqlStmt);
+        }
+
+        $this->expectException(TDBMException::class);
+        $this->expectExceptionMessage('Primary Column name `lazyLoading` is not allowed.');
+        $beanDescriptor = new BeanDescriptor($table, 'Foo\\Bar', 'Foo\\Generated\\Bar', 'Tdbm\\Test\\Daos', 'Tdbm\\Test\\Daos\\Generated', $this->schemaAnalyzer, $this->schema, $this->tdbmSchemaAnalyzer, $this->getNamingStrategy(), AnnotationParser::buildWithDefaultAnnotations([]), new BaseCodeGeneratorListener(), $this->getConfiguration());
+        $beanDescriptor->generateDaoPhpCode();
+    }
+
     /*public function testGeneratePhpCode() {
         $usersTable = $this->schema->getTable("users");
         $beanDescriptor = new BeanDescriptor($usersTable, $this->schemaAnalyzer, $this->schema);