Fix incorrect error handler being active in tests.

cakephp · Aug 21, 2013 · ecb9c71 · ecb9c71
1 parent 660e0fc
commit ecb9c71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/lib/Cake/Test/TestCase/Console/ConsoleErrorHandlerTest.php b/lib/Cake/Test/TestCase/Console/ConsoleErrorHandlerTest.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * ConsoleErrorHandler Test case
- *
  * PHP 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@@ -24,8 +22,6 @@
 
 /**
  * ConsoleErrorHandler Test case.
- *
- * @package       Cake.Test.Case.Console
  */
 class ConsoleErrorHandlerTest extends TestCase {
 

diff --git a/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php b/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php
@@ -43,6 +43,7 @@ class ErrorHandlerTest extends TestCase {
  */
 	public function setUp() {
 		parent::setUp();
+
 		App::build(array(
 			'View' => array(
 				CAKE . 'Test/TestApp/View/'
@@ -154,7 +155,7 @@ public function testHandleErrorDebugOff() {
 
 		$this->_logger->expects($this->once())
 			->method('write')
-			->with('notice', 'Notice (8): Undefined variable: out in [' . __FILE__ . ', line 159]');
+			->with('notice', 'Notice (8): Undefined variable: out in [' . __FILE__ . ', line ' . (__LINE__ + 2) . ']');
 
 		$out .= '';
 	}
@@ -168,6 +169,7 @@ public function testHandleErrorLoggingTrace() {
 		Configure::write('debug', 0);
 		$errorHandler = new ErrorHandler(['trace' => true]);
 		$errorHandler->register();
+		$this->_restoreError = true;
 
 		$this->_logger->expects($this->once())
 			->method('write')
@@ -176,7 +178,6 @@ public function testHandleErrorLoggingTrace() {
 				$this->stringContains('Trace:'),
 				$this->stringContains(__NAMESPACE__ . '\ErrorHandlerTest::testHandleErrorLoggingTrace()')
 			));
-		$this->_restoreError = true;
 
 		$out .= '';
 	}
@@ -203,7 +204,6 @@ public function testHandleException() {
  */
 	public function testHandleExceptionLog() {
 		$errorHandler = new ErrorHandler(['log' => true]);
-		$errorHandler->register();
 
 		$error = new Error\NotFoundException('Kaboom!');
 
@@ -240,7 +240,6 @@ public function testHandleExceptionLogSkipping() {
 			'log' => true,
 			'skipLog' => ['Cake\Error\NotFoundException']
 		]);
-		$errorHandler->register();
 
 		ob_start();
 		$errorHandler->handleException($notFound);
@@ -315,7 +314,7 @@ public function testHandleFatalErrorLog() {
 		$this->_logger->expects($this->at(0))
 			->method('write')
 			->with('error', $this->logicalAnd(
-				$this->stringContains(__FILE__ . ', line 328'),
+				$this->stringContains(__FILE__ . ', line 327'),
 				$this->stringContains('Fatal Error (1)'),
 				$this->stringContains('Something wrong')
 			));