Added extra tests for theme resolver

Author: raulfraile

src/Ladybug/Theme/ThemeResolver.php

@@ -86,14 +86,12 @@ public function getTheme($key, $format)
             }
 
             $parent = $theme->getParent();
-            if (is_null($parent)) {
-                return false;
-            }
 
-            $theme = $this->themes['theme_'.strtolower($parent)];
+            $theme = is_null($parent) ? null : $this->themes['theme_'.strtolower($parent)];
 
         }
 
+        return false;
     }
 
     protected function supportsFormat(ThemeInterface $theme, $format)
@@ -112,7 +110,7 @@ protected function getDefaultTheme()
             return $this->themes[$this->default];
         }
 
-        return null;
+        return false;
     }
 
     /**

tests/Ladybug/Tests/Theme/ThemeResolverTest.php

@@ -5,6 +5,8 @@
 use Ladybug\Theme\ThemeResolver;
 use Ladybug\Theme\ThemeInterface;
 use Ladybug\Format\HtmlFormat;
+use Ladybug\Format\ConsoleFormat;
+use Ladybug\Format\XmlFormat;
 use \Mockery as m;
 
 class ThemeResolverTest extends \PHPUnit_Framework_TestCase
@@ -13,14 +15,22 @@ class ThemeResolverTest extends \PHPUnit_Framework_TestCase
     /** @var ThemeResolver */
     protected $resolver;
 
-    protected $theme;
+    protected $baseTheme;
+    protected $htmlTheme;
 
     public function setUp()
     {
         $this->resolver = new ThemeResolver();
 
-        $this->theme = m::mock('Ladybug\Theme\ThemeInterface');
-        $this->theme->shouldReceive('getFormats')->andReturn(array(HtmlFormat::FORMAT_NAME));
+        $this->baseTheme = m::mock('Ladybug\Theme\ThemeInterface');
+        $this->baseTheme->shouldReceive('getFormats')->andReturn(array(
+            HtmlFormat::FORMAT_NAME,
+            ConsoleFormat::FORMAT_NAME
+        ));
+        $this->baseTheme->shouldReceive('getParent')->andReturn(null);
+
+        $this->htmlTheme = m::mock('Ladybug\Theme\HtmlThemeInterface');
+        $this->htmlTheme->shouldReceive('getFormats')->andReturn(array(HtmlFormat::FORMAT_NAME));
     }
 
     public function tearDown()
@@ -30,26 +40,53 @@ public function tearDown()
 
     public function testAddTheme()
     {
-        $result = $this->resolver->addTheme($this->theme, 'theme_test');
+        $result = $this->resolver->addTheme($this->htmlTheme, 'theme_test');
 
         $this->assertTrue($result);
         $this->assertCount(1, $this->resolver);
     }
 
     public function testGetRegisteredTheme()
     {
-        $this->resolver->addTheme($this->theme, 'theme_test');
+        $this->resolver->addTheme($this->htmlTheme, 'theme_test');
 
         $this->assertInstanceOf('Ladybug\Theme\ThemeInterface', $this->resolver->getTheme('test', 'html'));
     }
 
     public function testGetDefaultThemeWhenDoesNotExist()
     {
-        $this->resolver->addTheme($this->theme, 'theme_test');
-        $this->resolver->addTheme($this->theme, 'theme_test_default', true);
+        $this->resolver->addTheme($this->htmlTheme, 'theme_test');
+        $this->resolver->addTheme($this->htmlTheme, 'theme_test_default', true);
 
         $this->assertInstanceOf('Ladybug\Theme\ThemeInterface', $this->resolver->getTheme('notfound', HtmlFormat::FORMAT_NAME));
     }
 
+    public function testGetFalseWhenDoesNotExistAndNoDefaultTheme()
+    {
+        $this->resolver->addTheme($this->htmlTheme, 'theme_test');
+
+        $this->assertFalse($this->resolver->getTheme('notfound', HtmlFormat::FORMAT_NAME));
+    }
+
+    public function testGetParentThemeWhenSelectedNotAcceptFormat()
+    {
+        $this->htmlTheme->shouldReceive('getParent')->andReturn('base');
+
+        $this->resolver->addTheme($this->baseTheme, 'theme_base');
+        $this->resolver->addTheme($this->htmlTheme, 'theme_test');
+
+        $this->assertInstanceOf('Ladybug\Theme\ThemeInterface', $this->resolver->getTheme('test', ConsoleFormat::FORMAT_NAME));
+    }
+
+    public function testGetFalseWhenSelectedNotAcceptFormat()
+    {
+        $this->htmlTheme->shouldReceive('getParent')->andReturn('base');
+
+        $this->resolver->addTheme($this->baseTheme, 'theme_base');
+        $this->resolver->addTheme($this->htmlTheme, 'theme_test');
+
+        $this->assertFalse($this->resolver->getTheme('test', XmlFormat::FORMAT_NAME));
+    }
+
 
 }