Working on more unit tests and fixing irregularities.

johannesx75 · Feb 3, 2014 · 98afbf6 · 98afbf6
1 parent c9c8e64
commit 98afbf6
Show file tree

Hide file tree

Showing 25 changed files with 580 additions and 68 deletions.
diff --git a/lib/Tmdb/Factory/CompanyFactory.php b/lib/Tmdb/Factory/CompanyFactory.php
@@ -16,11 +16,30 @@
 
 class CompanyFactory extends AbstractFactory
 {
+    /**
+     * @var ImageFactory
+     */
+    private $imageFactory;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->imageFactory = new ImageFactory();
+    }
+
     /**
      * {@inheritdoc}
      */
     public function create(array $data = array())
     {
+        $company = new Company();
+
+        if (array_key_exists('logo_path', $data)) {
+            $company->setLogo($this->getImageFactory()->createFromPath($data['logo_path'], 'logo_path'));
+        }
+
         return $this->hydrate(new Company(), $data);
     }
 
@@ -31,4 +50,22 @@ public function createCollection(array $data = array())
     {
         return array();
     }
+
+    /**
+     * @param \Tmdb\Factory\ImageFactory $imageFactory
+     * @return $this
+     */
+    public function setImageFactory($imageFactory)
+    {
+        $this->imageFactory = $imageFactory;
+        return $this;
+    }
+
+    /**
+     * @return \Tmdb\Factory\ImageFactory
+     */
+    public function getImageFactory()
+    {
+        return $this->imageFactory;
+    }
 }
diff --git a/lib/Tmdb/Factory/FindFactory.php b/lib/Tmdb/Factory/FindFactory.php
@@ -12,6 +12,7 @@
  */
 namespace Tmdb\Factory;
 
+use Tmdb\Exception\NotImplementedException;
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Find;
 
@@ -69,7 +70,7 @@ public function create(array $data = array())
      */
     public function createCollection(array $data = array())
     {
-        return array();
+        throw new NotImplementedException(sprintf('Method "%s" is not implemented.', __METHOD__));
     }
 
     /**

diff --git a/lib/Tmdb/Factory/GenreFactory.php b/lib/Tmdb/Factory/GenreFactory.php
@@ -32,8 +32,12 @@ public function createCollection(array $data = array())
     {
         $collection = new Genres();
 
+        if (array_key_exists('genres', $data)) {
+            $data = $data['genres'];
+        }
+
         foreach($data as $item) {
-            $collection->addGenre($this->create((array) $item));
+            $collection->addGenre($this->create($item));
         }
 
         return $collection;

diff --git a/lib/Tmdb/Factory/ImageFactory.php b/lib/Tmdb/Factory/ImageFactory.php
@@ -28,12 +28,6 @@ public function create(array $data = array(), $key = null)
     {
         $type = self::resolveImageType($key);
 
-        if (is_string($data)) {
-            $data = array(
-                'file_path' => $data
-            );
-        }
-
         return $this->hydrate($type, $data);
     }
 
@@ -55,10 +49,12 @@ public function createFromPath($path, $key)
     }
 
     /**
+     * Helper function to obtain a new object for an image type
+     *
      * @param string|null $key
      * @return Image|Image\BackdropImage|Image\LogoImage|Image\PosterImage|Image\ProfileImage|Image\StillImage
      */
-    private function resolveImageType($key = null)
+    public function resolveImageType($key = null)
     {
         switch($key) {
             case 'poster':

diff --git a/lib/Tmdb/Factory/People/CastFactory.php b/lib/Tmdb/Factory/People/CastFactory.php
@@ -34,7 +34,7 @@ public function createCollection(array $data = array(), $person = null)
         $collection = new Cast();
 
         foreach($data as $item) {
-            $collection->add(null, parent::create($item, $person));
+            $collection->add(null, $this->create($item, $person));
         }
 
         return $collection;

diff --git a/lib/Tmdb/Factory/People/CrewFactory.php b/lib/Tmdb/Factory/People/CrewFactory.php
@@ -34,7 +34,7 @@ public function createCollection(array $data = array(), $person = null)
         $collection = new Crew();
 
         foreach($data as $item) {
-            $collection->add(null, parent::create($item, $person));
+            $collection->add(null, $this->create($item, $person));
         }
 
         return $collection;

diff --git a/lib/Tmdb/Repository/GenreRepository.php b/lib/Tmdb/Repository/GenreRepository.php
@@ -49,17 +49,7 @@ public function loadCollection(array $parameters = array(), array $headers = arr
      * @return GenericCollection|Genre[]
      */
     private function createCollection($data){
-        $collection = new GenericCollection();
-
-        if (array_key_exists('genres', $data)) {
-            $data = $data['genres'];
-        }
-
-        foreach($data as $item) {
-            $collection->add(null, $this->getFactory()->create($item));
-        }
-
-        return $collection;
+        return $this->getFactory()->createCollection($data);
     }
 
     /**

diff --git a/lib/Tmdb/Repository/MovieRepository.php b/lib/Tmdb/Repository/MovieRepository.php
@@ -148,16 +148,6 @@ public function getTopRated(array $options = array())
      * @return Movie[]
      */
     private function createCollection($data){
-        $collection = new GenericCollection();
-
-        if (array_key_exists('results', $data)) {
-            $data = $data['results'];
-        }
-
-        foreach($data as $item) {
-            $collection->add(null, $this->getFactory()->create($item));
-        }
-
-        return $collection;
+        return $this->getFactory()->createCollection($data);
     }
 }
diff --git a/lib/Tmdb/Repository/TvRepository.php b/lib/Tmdb/Repository/TvRepository.php
@@ -101,16 +101,6 @@ public function getTopRated(array $options = array())
      * @return Tv[]
      */
     private function createCollection($data){
-        $collection = new GenericCollection();
-
-        if (array_key_exists('results', $data)) {
-            $data = $data['results'];
-        }
-
-        foreach($data as $item) {
-            $collection->add(null, $this->getFactory()->create($item));
-        }
-
-        return $collection;
+        return $this->getFactory()->createCollection($data);
     }
 }
diff --git a/test/Tmdb/Tests/Api/TestCase.php b/test/Tmdb/Tests/Api/TestCase.php
@@ -40,9 +40,4 @@ protected function getApiMock(array $methods = array())
             ->setConstructorArgs(array($client))
             ->getMock();
     }
-
-    protected function getMockedHttpClient()
-    {
-        return $this->getMock('Guzzle\Http\Client', array('send'));
-    }
-}
+}
diff --git a/test/Tmdb/Tests/Factory/CollectionFactoryTest.php b/test/Tmdb/Tests/Factory/CollectionFactoryTest.php
@@ -55,6 +55,24 @@ public function shouldBeAbleToSetFactories()
         $this->assertInstanceOf('stdClass', $factory->getImageFactory());
     }
 
+
+    /**
+     * @test
+     */
+    public function shouldBeAbleToCreateCollection()
+    {
+        $factory = $this->getFactory();
+
+        $data = array(
+            array('id' => 1),
+            array('id' => 2),
+        );
+
+        $collection = $factory->createCollection($data);
+
+        $this->assertEquals(2, count($collection));
+    }
+
     protected function getFactoryClass()
     {
         return 'Tmdb\Factory\CollectionFactory';

diff --git a/test/Tmdb/Tests/Factory/CompanyFactoryTest.php b/test/Tmdb/Tests/Factory/CompanyFactoryTest.php
@@ -88,6 +88,19 @@ public function callingCollectionReturnsEmptyArray()
         $this->assertEquals(array(), $collection);
     }
 
+    /**
+     * @test
+     */
+    public function shouldBeAbleToSetFactories()
+    {
+        $factory = $this->getFactory();
+
+        $class = new \stdClass();
+        $factory->setImageFactory($class);
+
+        $this->assertInstanceOf('stdClass', $factory->getImageFactory());
+    }
+
     protected function getFactoryClass()
     {
         return 'Tmdb\Factory\CompanyFactory';

diff --git a/test/Tmdb/Tests/Factory/FindFactoryTest.php b/test/Tmdb/Tests/Factory/FindFactoryTest.php
@@ -47,6 +47,34 @@ public function shouldConstructFind()
         }
     }
 
+    /**
+     * @test
+     */
+    public function shouldBeAbleToSetFactories()
+    {
+        $factory = $this->getFactory();
+
+        $class = new \stdClass();
+
+        $factory->setMovieFactory($class);
+        $factory->setPeopleFactory($class);
+        $factory->setTvFactory($class);
+
+        $this->assertInstanceOf('stdClass', $factory->getMovieFactory());
+        $this->assertInstanceOf('stdClass', $factory->getPeopleFactory());
+        $this->assertInstanceOf('stdClass', $factory->getTvFactory());
+    }
+
+    /**
+     * @test
+     * @expectedException Tmdb\Exception\NotImplementedException
+     */
+    public function shouldThrowExceptionForCreateCollection()
+    {
+        $factory = $this->getFactory();
+        $factory->createCollection(array());
+    }
+
     protected function getFactoryClass()
     {
         return 'Tmdb\Factory\FindFactory';

diff --git a/test/Tmdb/Tests/Factory/GenreFactoryTest.php b/test/Tmdb/Tests/Factory/GenreFactoryTest.php
@@ -83,6 +83,23 @@ public function shouldCollaborateWithCollection()
         $this->assertEquals(null, $genre);
     }
 
+    /**
+     * @test
+     */
+    public function shouldBeAbleToDissectResults()
+    {
+        $factory = $this->getFactory();
+
+        $data = array('genres' => array(
+            array('id' => 1),
+            array('id' => 2),
+        ));
+
+        $collection = $factory->createCollection($data);
+
+        $this->assertEquals(2, count($collection));
+    }
+
     protected function getFactoryClass()
     {
         return 'Tmdb\Factory\GenreFactory';

diff --git a/test/Tmdb/Tests/Factory/ImageFactoryTest.php b/test/Tmdb/Tests/Factory/ImageFactoryTest.php
@@ -17,9 +17,18 @@ class ImageFactoryTest extends TestCase
     /**
      * @test
      */
-    public function shouldConstructGenres()
+    public function shouldBeAbleToCreateCollection()
     {
-        $this->assertEquals(true,true);
+        $factory = $this->getFactory();
+
+        $data = array(
+            array('id' => 1),
+            array('id' => 2),
+        );
+
+        $collection = $factory->createCollection($data);
+
+        $this->assertEquals(2, count($collection));
     }
 
     protected function getFactoryClass()

diff --git a/test/Tmdb/Tests/Factory/Movie/AlternativeTitleFactoryTest.php b/test/Tmdb/Tests/Factory/Movie/AlternativeTitleFactoryTest.php
@@ -43,6 +43,24 @@ public function shouldConstructAlternativeTitle()
         $this->assertEquals('Kaas', $title->getTitle());
     }
 
+
+    /**
+     * @test
+     */
+    public function shouldBeAbleToCreateCollection()
+    {
+        $factory = $this->getFactory();
+
+        $data = array(
+            array('id' => 1),
+            array('id' => 2),
+        );
+
+        $collection = $factory->createCollection($data);
+
+        $this->assertEquals(2, count($collection));
+    }
+
     protected function getFactoryClass()
     {
         return 'Tmdb\Factory\Movie\AlternativeTitleFactory';