Unit tests for Keyword, and removing unneccasary Movie/Keyword ( upda…

…ted MovieFactory to reflect this ).

lib/Tmdb/Factory/KeywordFactory.php

@@ -28,16 +28,6 @@ public function create(array $data = array())
         return $this->hydrate(new Keyword(), $data);
     }
 
-    /**
-     * @param array $data
-     *
-     * @return Movie
-     */
-    public function createMovie(array $data = array())
-    {
-        return $this->hydrate(new Movie(), $data);
-    }
-
     /**
      * {@inheritdoc}
      */

lib/Tmdb/Factory/MovieFactory.php

@@ -58,6 +58,11 @@ class MovieFactory extends AbstractFactory {
      */
     private $listItemFactory;
 
+    /**
+     * @var KeywordFactory
+     */
+    private $keywordFactory;
+
     /**
      * Constructor
      */
@@ -70,6 +75,7 @@ public function __construct()
         $this->changeFactory   = new ChangeFactory();
         $this->reviewFactory   = new ReviewFactory();
         $this->listItemFactory = new ListItemFactory();
+        $this->keywordFactory  = new KeywordFactory();
     }
 
     /**
@@ -120,7 +126,7 @@ public function create(array $data = array())
 
         /** Keywords */
         if (array_key_exists('keywords', $data)) {
-            $movie->setKeywords($this->createGenericCollection($data['keywords']['keywords'], new Movie\Keyword()));
+            $movie->setKeywords($this->getKeywordFactory()->createCollection($data['keywords']));
         }
 
         if (array_key_exists('releases', $data)) {
@@ -300,4 +306,22 @@ public function getListItemFactory()
     {
         return $this->listItemFactory;
     }
+
+    /**
+     * @param \Tmdb\Factory\KeywordFactory $keywordFactory
+     * @return $this
+     */
+    public function setKeywordFactory($keywordFactory)
+    {
+        $this->keywordFactory = $keywordFactory;
+        return $this;
+    }
+
+    /**
+     * @return \Tmdb\Factory\KeywordFactory
+     */
+    public function getKeywordFactory()
+    {
+        return $this->keywordFactory;
+    }
 }

lib/Tmdb/Model/Collection/Keywords.php

@@ -13,7 +13,7 @@
 namespace Tmdb\Model\Collection;
 
 use Tmdb\Model\Common\GenericCollection;
-use Tmdb\Model\Movie\Keyword;
+use Tmdb\Model\Keyword;
 
 class Keywords extends GenericCollection {
 

test/Tmdb/Tests/Factory/KeywordFactoryTest.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * This file is part of the Tmdb PHP API created by Michael Roterman.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package Tmdb
+ * @author Michael Roterman <[email protected]>
+ * @copyright (c) 2013, Michael Roterman
+ * @version 0.0.1
+ */
+namespace Tmdb\Tests\Factory;
+
+use Tmdb\Factory\KeywordFactory;
+
+class KeywordFactoryTest extends TestCase
+{
+    private $data;
+
+    public function setUp()
+    {
+        $this->data = $this->loadByFile('keywords/get.json');
+    }
+
+    /**
+     * @test
+     */
+    public function shouldConstructKeyword()
+    {
+        /**
+         * @var KeywordFactory $factory
+         */
+        $factory = $this->getFactory();
+        $keyword = $factory->create($this->data);
+
+        $this->assertInstanceOf('Tmdb\Model\Keyword', $keyword);
+        $this->assertEquals(1721, $keyword->getId());
+        $this->assertEquals('fight', $keyword->getName());
+    }
+
+    protected function getFactoryClass()
+    {
+        return 'Tmdb\Factory\KeywordFactory';
+    }
+}

test/Tmdb/Tests/Model/Collection/KeywordsTest.php

@@ -13,7 +13,7 @@
 namespace Tmdb\Tests\Model\Common;
 
 use Tmdb\Model\Collection\Keywords;
-use Tmdb\Model\Movie\Keyword;
+use Tmdb\Model\Keyword;
 use Tmdb\Tests\Model\TestCase;
 
 class KeywordsTest extends TestCase

test/Tmdb/Tests/Resources/keywords/get.json

@@ -0,0 +1,4 @@
+{
+    "id": 1721,
+    "name": "fight"
+}