doctrine#1169 DDC-3343 - aligning test suite logic to the 2.5 branch (failing tests)

Ocramius · Ocramius · commit fac410b213e9 · 2015-02-05T00:16:07.000Z
diff --git a/tests/Doctrine/Tests/Models/Tweet/Tweet.php b/tests/Doctrine/Tests/Models/Tweet/Tweet.php
@@ -18,17 +18,20 @@ class Tweet
     public $id;
 
     /**
-     * @Column(type="string")
+     * @Column(type="string", length=140)
      */
-    public $content;
+    public $content = '';
 
     /**
-     * @ManyToOne(targetEntity="User", inversedBy="tweets")
+     * @ManyToOne(targetEntity="User", inversedBy="tweets", cascade={"persist"}, fetch="EXTRA_LAZY")
      */
     public $author;
 
-    public function setAuthor(User $user)
+    /**
+     * @param User $author
+     */
+    public function setAuthor(User $author)
     {
-        $this->author = $user;
+        $this->user = $author;
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
@@ -28,6 +28,7 @@ public function setUp()
     {
         $this->useModelSet('tweet');
         $this->useModelSet('cms');
+        $this->useModelSet('tweet');
         parent::setUp();
 
         $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public function setUp()`
`28`	`28`	`{`
`29`	`29`	`$this->useModelSet('tweet');`
`30`	`30`	`$this->useModelSet('cms');`
	`31`	`+ $this->useModelSet('tweet');`
`31`	`32`	`parent::setUp();`
`32`	`33`
`33`	`34`	`$class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');`