Updating inheritance

johannesx75 · Jan 29, 2014 · 5f37923 · 5f37923
1 parent 7c57e63
commit 5f37923
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/test/Tmdb/Tests/Api/TestCase.php b/test/Tmdb/Tests/Api/TestCase.php
@@ -12,9 +12,11 @@
  */
 namespace Tmdb\Tests\Api;
 
+use Tmdb\Tests\TestCase as Base;
+
 use Tmdb\ApiToken;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+abstract class TestCase extends Base
 {
     private $_api = null;
 

diff --git a/test/Tmdb/Tests/Factory/TestCase.php b/test/Tmdb/Tests/Factory/TestCase.php
@@ -12,23 +12,12 @@
  */
 namespace Tmdb\Tests\Factory;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+use Tmdb\Tests\TestCase as Base;
+
+abstract class TestCase extends Base
 {
     protected $factory;
 
-    protected function loadByFile($file)
-    {
-        return json_decode(
-            file_get_contents(
-                sprintf(
-                    '%s/%s',
-                    'test/Tmdb/Tests/Resources/',
-                    $file
-                )
-            )
-        );
-    }
-
     protected function getFactory()
     {
         $class = $this->getFactoryClass();

diff --git a/test/Tmdb/Tests/Repository/TestCase.php b/test/Tmdb/Tests/Repository/TestCase.php
@@ -12,11 +12,13 @@
  */
 namespace Tmdb\Tests\Repository;
 
+use Tmdb\Tests\TestCase as Base;
+
 use Guzzle\Http\Message\Response;
 use Tmdb\ApiToken;
 use Tmdb\Client;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+abstract class TestCase extends Base
 {
     protected $repository;
 

diff --git a/test/Tmdb/Tests/TestCase.php b/test/Tmdb/Tests/TestCase.php
@@ -36,4 +36,23 @@ protected function assertInstancesOf($subject, array $instances = array())
             }
         }
     }
+
+    /**
+     * Load an json file from the Resources directory
+     *
+     * @param $file
+     * @return mixed
+     */
+    protected function loadByFile($file)
+    {
+        return json_decode(
+            file_get_contents(
+                sprintf(
+                    '%s/%s',
+                    'test/Tmdb/Tests/Resources/',
+                    $file
+                )
+            )
+        );
+    }
 }