simplified tests

diff --git a/test/Twig/Tests/FileCachingTest.php b/test/Twig/Tests/FileCachingTest.php
index dab8557..2c77c06 100644 (file)
--- a/test/Twig/Tests/FileCachingTest.php
+++ b/test/Twig/Tests/FileCachingTest.php
@@ -1,15 +1,21 @@
 <?php
 
-require_once dirname(__FILE__).'/TestCase.php';
-
-class Twig_Tests_FileCachingTest extends Twig_Tests_TestCase
+class Twig_Tests_FileCachingTest extends PHPUnit_Framework_TestCase
 {
     protected $fileName;
     protected $env;
+    protected $tmpDir;
 
     public function setUp()
     {
-        parent::setUp();
+        $this->tmpDir = sys_get_temp_dir().'/TwigTests';
+        if (!file_exists($this->tmpDir)) {
+            @mkdir($this->tmpDir, 0777, true);;
+        }
+
+        if (!is_writable($this->tmpDir)) {
+            $this->markTestSkipped(sprintf('Unable to run the tests as "%s" is not writable.', $this->tmpDir));
+        }
 
         $this->env = new Twig_Environment(new Twig_Loader_String(), array('cache' => $this->tmpDir));
     }
@@ -20,7 +26,7 @@ class Twig_Tests_FileCachingTest extends Twig_Tests_TestCase
             unlink($this->fileName);
         }
 
-        parent::tearDown();
+        $this->removeDir($this->tmpDir);
     }
 
     public function testWritingCacheFiles()
@@ -43,4 +49,22 @@ class Twig_Tests_FileCachingTest extends Twig_Tests_TestCase
         $this->env->clearCacheFiles();
         $this->assertFalse(file_exists($cacheFileName), 'Cache file was not cleared.');
     }
+
+    private function removeDir($target)
+    {
+        $fp = opendir($target);
+        while (false !== $file = readdir($fp)) {
+            if (in_array($file, array('.', '..'))) {
+                continue;
+            }
+
+            if (is_dir($target.'/'.$file)) {
+                self::removeDir($target.'/'.$file);
+            } else {
+                unlink($target.'/'.$file);
+            }
+        }
+        closedir($fp);
+        rmdir($target);
+    }
 }

diff --git a/test/Twig/Tests/TestCase.php b/test/Twig/Tests/TestCase.php
deleted file mode 100644 (file)
index 9dd6d21..0000000
--- a/test/Twig/Tests/TestCase.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-class Twig_Tests_TestCase extends PHPUnit_Framework_TestCase
-{
-    protected $tmpDir;
-
-    public function getTempDir()
-    {
-        return $this->tmpDir;
-    }
-
-    function setUp()
-    {
-        $this->tmpDir = sys_get_temp_dir().'/TwigTests';
-        if (!file_exists($this->tmpDir)) {
-            @mkdir($this->tmpDir, 0777, true);;
-        }
-
-        if (!is_writable($this->tmpDir)) {
-            $this->markTestSkipped(sprintf('Unable to run the tests as "%s" is not writable.', $this->tmpDir));
-        }
-
-        parent::setUp();
-    }
-
-    function tearDown()
-    {
-        $this->removeDir($this->tmpDir);
-
-        parent::tearDown();
-    }
-
-    private function removeDir($target)
-    {
-        $fp = opendir($target);
-        while (false !== $file = readdir($fp)) {
-            if (in_array($file, array('.', '..'))) {
-                continue;
-            }
-
-            if (is_dir($target.'/'.$file)) {
-                self::removeDir($target.'/'.$file);
-            } else {
-                unlink($target.'/'.$file);
-            }
-        }
-        closedir($fp);
-        rmdir($target);
-    }
-}