Test for non-identifier generators

Author: Majkl578

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

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\ValueGenerators;
+
+use Doctrine\ORM\Annotation as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="vg_non_identifier_generators")
+ */
+class NonIdentifierGenerators
+{
+    /**
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue("AUTO")
+     * @var int|null
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue(strategy="CUSTOM")
+     * @ORM\CustomIdGenerator("Doctrine\Tests\Models\ValueGenerators\FooGenerator")
+     * @var string|null
+     */
+    private $foo;
+
+    /**
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue(strategy="CUSTOM")
+     * @ORM\CustomIdGenerator("Doctrine\Tests\Models\ValueGenerators\BarGenerator")
+     * @var string|null
+     */
+    private $bar;
+
+    public function getId() : ?int
+    {
+        return $this->id;
+    }
+
+    public function getFoo() : ?string
+    {
+        return $this->foo;
+    }
+
+    public function getBar() : ?string
+    {
+        return $this->bar;
+    }
+}

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

@@ -6,6 +6,7 @@
 use Doctrine\Tests\Models\ValueGenerators\BarGenerator;
 use Doctrine\Tests\Models\ValueGenerators\CompositeGeneratedIdentifier;
 use Doctrine\Tests\Models\ValueGenerators\FooGenerator;
+use Doctrine\Tests\Models\ValueGenerators\NonIdentifierGenerators;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 class ValueGeneratorsTest extends OrmFunctionalTestCase
@@ -34,4 +35,21 @@ public function testCompositeIdentifierWithMultipleGenerators() : void
         );
         self::assertNotNull($entity);
     }
+
+    public function testNonIdentifierGenerators() : void
+    {
+        $entity = new NonIdentifierGenerators();
+
+        $this->em->persist($entity);
+        $this->em->flush();
+
+        self::assertNotNull($entity->getId());
+        self::assertSame(FooGenerator::VALUE, $entity->getFoo());
+        self::assertSame(BarGenerator::VALUE, $entity->getBar());
+
+        $this->em->clear();
+
+        $entity = $this->getEntityManager()->find(NonIdentifierGenerators::class, $entity->getId());
+        self::assertNotNull($entity);
+    }
 }

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -317,6 +317,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
         ],
         'valueGenerators' => [
             Models\ValueGenerators\CompositeGeneratedIdentifier::class,
+            Models\ValueGenerators\NonIdentifierGenerators::class,
         ],
     ];
 
@@ -605,6 +606,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');
         }
 
         $this->em->clear();