Merge pull request #179 from symfony-cmf/test-document

use our own document and not a deprecated one from testing component

Author: lsmith77

Tests/Functional/Doctrine/Phpcr/MenuNodeTest.php

@@ -12,22 +12,33 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Functional\Doctrine\Phpcr;
 
+use Doctrine\ODM\PHPCR\DocumentManager;
+use Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document\Content;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode;
-use Symfony\Cmf\Component\Testing\Document\Content;
 
 class MenuNodeTest extends BaseTestCase
 {
+    private $content;
+    /**
+     * @var DocumentManager
+     */
+    private $dm;
+    private $rootDocument;
+    /**
+     * @var MenuNode
+     */
+    private $child1;
+
     public function setUp()
     {
         $this->db('PHPCR')->createTestNode();
         $this->dm = $this->db('PHPCR')->getOm();
-        $this->baseNode = $this->dm->find(null, '/test');
+        $this->rootDocument = $this->dm->find(null, '/test');
 
-        $this->content = new Content;
-        $this->content->setParentDocument($this->baseNode);
+        $this->content = new Content();
+        $this->content->setId('/test/fake_weak_content');
         $this->content->setTitle('fake_weak_content');
-        $this->content->setName('fake_weak_content');
         $this->dm->persist($this->content);
 
         $this->child1 = new MenuNode;
@@ -81,7 +92,7 @@ public function testMenuNode()
         $menuNode = new MenuNode;
         $refl = new \ReflectionClass($menuNode);
 
-        $menuNode->setParentDocument($this->baseNode);
+        $menuNode->setParentDocument($this->rootDocument);
 
         foreach ($data as $key => $value) {
             $refl = new \ReflectionClass($menuNode);

Tests/Resources/Document/Content.php

@@ -13,7 +13,7 @@
 namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCR;
 
 use Knp\Menu\NodeInterface;
 
@@ -23,27 +23,32 @@
 use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNodeReferrersInterface;
 
 /**
- * @PHPCRODM\Document(referenceable=true)
+ * @PHPCR\Document(referenceable=true)
  */
 class Content implements MenuNodeReferrersInterface, RouteReferrersReadInterface, ChildInterface
 {
     /**
-     * @PHPCRODM\Id(strategy="assigned")
+     * @PHPCR\Id(strategy="assigned")
      */
     protected $id;
 
     /**
-     * @PHPCRODM\String()
+     * @PHPCR\String()
      */
     protected $title;
 
     /**
-     * @PHPCRODM\ParentDocument()
+     * @PHPCR\ParentDocument()
      */
     protected $parent;
 
     /**
-     * @PHPCRODM\Referrers(
+     * @PHPCR\Nodename()
+     */
+    protected $name;
+
+    /**
+     * @PHPCR\Referrers(
      *     referringDocument="Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode",
      *     referencedBy="content",
      *     cascade="persist"
@@ -52,7 +57,7 @@ class Content implements MenuNodeReferrersInterface, RouteReferrersReadInterface
     protected $menuNodes;
 
     /**
-     * @PHPCRODM\Referrers(
+     * @PHPCR\Referrers(
      *     referringDocument="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route",
      *     referencedBy="content"
      * )
@@ -122,4 +127,14 @@ public function getParentDocument()
     {
         return $this->parent;
     }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
 }