ErrorHandlerTest class modified

13 years ago · 8e1390caad
1 changed files with 16 additions and 5 deletions
--- a/tests/exception/ErrorHandlerTest.php
+++ b/tests/exception/ErrorHandlerTest.php
@ -16,14 +16,21 @@ require_once dirname(__FILE__) . '/../../exception/ErrorHandler.php';

 class ErrorHandlerTest extends PHPUnit_Framework_TestCase
 {
-
+    public $old_eh = array('PHPUnit_Util_ErrorHandler', 'handleError');
+    
+    public function setUp()
+    {        
+        set_error_handler(array('ErrorHandler', 'error_handler'));
+        ob_start();
+    }
+    
    public function testErrorHandlerInit()
    {
        $my_eh = array('ErrorHandler', 'error_handler');
        ErrorHandler::init();
        $eh = set_error_handler($my_eh);
        $this->assertInternalType('array', $eh);
-        $this->assertEquals($eh, $my_eh);
+        $this->assertEquals($eh, $my_eh);        
    }

    /**
@ -37,8 +44,6 @@ class ErrorHandlerTest extends PHPUnit_Framework_TestCase

    public function testShowDebug()
    {
-        ob_start();
-        echo PHP_EOL . 'some string' . PHP_EOL . PHP_EOL;
        try {
            throw new ErrorException("test error", E_USER_ERROR);
        } catch (ErrorException $e) {
@ -46,7 +51,13 @@ class ErrorHandlerTest extends PHPUnit_Framework_TestCase
            $this->assertNotEmpty($result);
            $this->assertStringStartsWith('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">', $result);
            $this->assertStringEndsWith('</html>', $result);
-        }
+        }            
+        
+    }
+    
+    public function tearDown()
+    {
+        set_error_handler($this->old_eh);
    }

 }