Remove deprecated method use.

Stop calling deprecated features of Log.
cakephp · Aug 13, 2013 · edce895 · edce895
1 parent a8a6513
commit edce895
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/lib/Cake/Test/TestCase/Core/ObjectTest.php b/lib/Cake/Test/TestCase/Core/ObjectTest.php
@@ -198,8 +198,8 @@ public function setUp() {
 		$this->object = new TestObject();
 		Configure::write('App.namespace', 'TestApp');
 		Configure::write('Security.salt', 'not-the-default');
-		Log::disable('stdout');
-		Log::disable('stderr');
+		Log::drop('stdout');
+		Log::drop('stderr');
 	}
 
 /**
@@ -210,6 +210,7 @@ public function setUp() {
 	public function tearDown() {
 		parent::tearDown();
 		Plugin::unload();
+		Log::reset();
 		unset($this->object);
 	}
 

diff --git a/lib/Cake/Test/TestCase/Database/Log/QueryLoggerTest.php b/lib/Cake/Test/TestCase/Database/Log/QueryLoggerTest.php
@@ -23,29 +23,17 @@
 /**
  * Tests QueryLogger class
  *
- **/
-class QueryLoggerTest extends \Cake\TestSuite\TestCase {
-
-/**
- * Contains a list of disabled logging engines that will be re-enabled
- * on tearDown
- *
- * @var array
  */
-	protected $_disabledEngines = [];
+class QueryLoggerTest extends \Cake\TestSuite\TestCase {
 
 /**
  * Set up
  *
  * @return void
  */
 	public function setUp() {
-		foreach (Log::configured() as $e) {
-			if (Log::enabled($e)) {
-				Log::disable($e);
-				$this->_disabledEngines[] = $e;
-			}
-		}
+		parent::setUp();
+		Log::reset();
 	}
 
 /**
@@ -54,11 +42,8 @@ public function setUp() {
  * @return void
  */
 	public function tearDown() {
-		Log::drop('queryLoggerTest');
-		Log::drop('queryLoggerTest2');
-		foreach ($this->_disabledEngines as $e) {
-			Log::enable($e);
-		}
+		parent::tearDown();
+		Log::reset();
 	}
 
 /**