- Clean up mock objects stored in attributes at tearDown().

- Make setUp() and tearDown() protected, as they should be. git-svn-id: http://svn.ez.no/svn/ezcomponents/trunk@11344 bc0e7bdc-f0fc-0310-8ff6-f601c06e1256
xmak · Jan 16, 2010 · debef58 · debef58
1 parent 799cef4
commit debef58
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/Document/tests/pdf/base.php b/Document/tests/pdf/base.php
@@ -29,14 +29,14 @@ abstract class ezcDocumentPdfTestCase extends ezcTestCase
      */
     protected $extension = 'pdf';
 
-    public function setUp()
+    protected function setUp()
     {
         static $i = 0;
         $this->tempDir = $this->createTempDir( __CLASS__ . sprintf( '_%03d_', ++$i ) ) . '/';
         $this->basePath = dirname( __FILE__ ) . '/../files/pdf/';
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ( !$this->hasFailed() )
         {

diff --git a/Document/tests/pdf/driver_transactions_tests.php b/Document/tests/pdf/driver_transactions_tests.php
@@ -28,7 +28,7 @@ public static function suite()
         return new PHPUnit_Framework_TestSuite( __CLASS__ );
     }
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 
@@ -47,6 +47,13 @@ public function setUp()
         );
     }
 
+    protected function tearDown()
+    {
+        parent::tearDown();
+        $this->mock = null;
+        $this->driver = null;
+    }
+
     public function testNoIssuedWriteCallsToBackend()
     {
         $this->mock->expects( $this->never() )->method( 'drawWord' );

diff --git a/Graph/tests/renderer_2d_legacy_test.php b/Graph/tests/renderer_2d_legacy_test.php
@@ -62,6 +62,9 @@ protected function setUp()
 
     protected function tearDown()
     {
+        $this->renderer = null;
+        $this->driver = null;
+
         if ( !$this->hasFailed() )
         {
             $this->removeTempDir();

diff --git a/Graph/tests/renderer_2d_test.php b/Graph/tests/renderer_2d_test.php
@@ -62,6 +62,9 @@ protected function setUp()
 
     protected function tearDown()
     {
+        $this->driver = null;
+        $this->renderer = null;
+
         if ( !$this->hasFailed() )
         {
             $this->removeTempDir();

diff --git a/Reflection/tests/abstract_type_test.php b/Reflection/tests/abstract_type_test.php
@@ -15,7 +15,7 @@ class ezcReflectionAbstractTypeTest extends ezcTestCase
      */
     protected $type;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->type = $this->getMock(
             'ezcReflectionAbstractType',
@@ -24,6 +24,11 @@ public function setUp()
         );
     }
 
+    protected function tearDown()
+    {
+        $this->type = null;
+    }
+
     public function testGetTypeName()
     {
         self::assertEquals( 'string', $this->type->getTypeName() );