From 981cebbf4c5f52939083bb5e858ca04e729265a3 Mon Sep 17 00:00:00 2001 From: Pavel Batanov Date: Thu, 22 Jan 2015 18:31:15 +0300 Subject: [PATCH] Update test according to @Ocramius notes --- tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php | 5 +---- tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php | 9 +-------- .../Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php | 8 ++------ 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php index 0f57011db..127209dcb 100644 --- a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php +++ b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php @@ -8,6 +8,7 @@ namespace Doctrine\Tests\Models\DDC3346; */ class DDC3346Article { + const CLASSNAME = 'Doctrine\Tests\Models\DDC3346\DDC3346Article'; /** * @Id * @Column(type="integer") @@ -19,10 +20,6 @@ class DDC3346Article * @JoinColumn(name="user_id", referencedColumnName="id") */ public $user; - /** - * @Column(type="text") - */ - public $text; public function setAuthor(DDC3346Author $author) { diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php index 8fa87ca5e..a24d9a601 100644 --- a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php +++ b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php @@ -8,23 +8,16 @@ namespace Doctrine\Tests\Models\DDC3346; */ class DDC3346Author { + const CLASSNAME = 'Doctrine\Tests\Models\DDC3346\DDC3346Author'; /** * @Id @Column(type="integer") * @GeneratedValue */ public $id; - /** - * @Column(type="string", length=50, nullable=true) - */ - public $status; /** * @Column(type="string", length=255, unique=true) */ public $username; - /** - * @Column(type="string", length=255) - */ - public $name; /** * @OneToMany(targetEntity="DDC3346Article", mappedBy="user", fetch="EAGER", cascade={"detach"}) */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php index b858eded7..e082c1b56 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php @@ -16,8 +16,8 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->setUpEntitySchema( array( - 'Doctrine\Tests\Models\DDC3346\DDC3346Article', - 'Doctrine\Tests\Models\DDC3346\DDC3346Author', + DDC3346Author::CLASSNAME, + DDC3346Article::CLASSNAME, ) ); } @@ -25,16 +25,12 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testFindOneByWithEagerFetch() { $user = new DDC3346Author(); - $user->name = "Buggy Woogy"; $user->username = "bwoogy"; - $user->status = "active"; $article1 = new DDC3346Article(); - $article1->text = "First content"; $article1->setAuthor($user); $article2 = new DDC3346Article(); - $article2->text = "Second content"; $article2->setAuthor($user); $this->_em->persist($user);