Add test for generators in inheritance

Author: Majkl578

tests/Doctrine/Tests/Models/ValueGenerators/InheritanceGeneratorsChildA.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\ValueGenerators;
+
+use Doctrine\ORM\Annotation as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class InheritanceGeneratorsChildA extends InheritanceGeneratorsRoot
+{
+    /**
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue("CUSTOM")
+     * @ORM\CustomIdGenerator("Doctrine\Tests\Models\ValueGenerators\FooGenerator")
+     * @var string|null
+     */
+    private $a;
+
+    public function getA() : ?string
+    {
+        return $this->a;
+    }
+}

tests/Doctrine/Tests/Models/ValueGenerators/InheritanceGeneratorsChildB.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\ValueGenerators;
+
+use Doctrine\ORM\Annotation as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class InheritanceGeneratorsChildB extends InheritanceGeneratorsChildA
+{
+    /**
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue("CUSTOM")
+     * @ORM\CustomIdGenerator("Doctrine\Tests\Models\ValueGenerators\BarGenerator")
+     * @var string|null
+     */
+    private $b;
+
+    public function getB() : ?string
+    {
+        return $this->b;
+    }
+}

tests/Doctrine/Tests/Models/ValueGenerators/InheritanceGeneratorsRoot.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\ValueGenerators;
+
+use Doctrine\ORM\Annotation as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("vg_inheritance_generators")
+ * @ORM\InheritanceType("SINGLE_TABLE")
+ * @ORM\DiscriminatorColumn(name="type", type="integer")
+ * @ORM\DiscriminatorMap({
+ *     1 = "Doctrine\Tests\Models\ValueGenerators\InheritanceGeneratorsRoot",
+ *     2 = "Doctrine\Tests\Models\ValueGenerators\InheritanceGeneratorsChildA",
+ *     3 = "Doctrine\Tests\Models\ValueGenerators\InheritanceGeneratorsChildB"
+ * })
+ */
+class InheritanceGeneratorsRoot
+{
+    /**
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue("AUTO")
+     * @var int|null
+     */
+    private $id;
+
+    public function getId() : ?int
+    {
+        return $this->id;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/ValueGeneratorsTest.php

@@ -6,6 +6,9 @@
 use Doctrine\Tests\Models\ValueGenerators\BarGenerator;
 use Doctrine\Tests\Models\ValueGenerators\CompositeGeneratedIdentifier;
 use Doctrine\Tests\Models\ValueGenerators\FooGenerator;
+use Doctrine\Tests\Models\ValueGenerators\InheritanceGeneratorsChildA;
+use Doctrine\Tests\Models\ValueGenerators\InheritanceGeneratorsChildB;
+use Doctrine\Tests\Models\ValueGenerators\InheritanceGeneratorsRoot;
 use Doctrine\Tests\Models\ValueGenerators\NonIdentifierGenerators;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
@@ -52,4 +55,31 @@ public function testNonIdentifierGenerators() : void
         $entity = $this->getEntityManager()->find(NonIdentifierGenerators::class, $entity->getId());
         self::assertNotNull($entity);
     }
+
+    public function testValueGeneratorsInInheritance() : void
+    {
+        $rootEntity = new InheritanceGeneratorsRoot();
+
+        $this->em->persist($rootEntity);
+        $this->em->flush();
+
+        $this->assertNotNull($rootEntity->getId());
+
+        $childAEntity = new InheritanceGeneratorsChildA();
+
+        $this->em->persist($childAEntity);
+        $this->em->flush();
+
+        $this->assertNotNull($childAEntity);
+        $this->assertSame(FooGenerator::VALUE, $childAEntity->getA());
+
+        $childBEntity = new InheritanceGeneratorsChildB();
+
+        $this->em->persist($childBEntity);
+        $this->em->flush();
+
+        $this->assertNotNull($childBEntity);
+        $this->assertSame(FooGenerator::VALUE, $childBEntity->getA());
+        $this->assertSame(BarGenerator::VALUE, $childBEntity->getB());
+    }
 }

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -318,6 +318,9 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
         'valueGenerators' => [
             Models\ValueGenerators\CompositeGeneratedIdentifier::class,
             Models\ValueGenerators\NonIdentifierGenerators::class,
+            Models\ValueGenerators\InheritanceGeneratorsRoot::class,
+            Models\ValueGenerators\InheritanceGeneratorsChildA::class,
+            Models\ValueGenerators\InheritanceGeneratorsChildB::class,
         ],
     ];
 
@@ -607,6 +610,7 @@ protected function tearDown()
         if (isset($this->usedModelSets['value_generators'])) {
             $conn->executeUpdate('DELETE FROM vg_composite_generated_identifier');
             $conn->executeUpdate('DELETE FROM vg_non_identifier_generators');
+            $conn->executeUpdate('DELETE FROM vg_inheritance_generators');
         }
 
         $this->em->clear();