mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-04 20:27:31 +02:00
Code Issues Releases Wiki Activity

Fix tests for TestHandler reset support

Browse Source
This commit is contained in:
Jordi Boggiano
2018-11-30 08:43:17 +01:00
parent 9ba4f22832
commit a335f6f1a5
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Monolog/Handler/TestHandler.php
View File

@@ -67,6 +67,7 @@ class TestHandler extends AbstractProcessingHandler
{ {
protected $records = array(); protected $records = array();
protected $recordsByLevel = array(); protected $recordsByLevel = array();
private $skipReset = false;
public function getRecords() public function getRecords()
{ {
@@ -81,7 +82,14 @@ class TestHandler extends AbstractProcessingHandler
public function reset() public function reset()
{ {
$this->clear(); if (!$this->skipReset) {
$this->clear();
}
}
public function setSkipReset($skipReset)
{
$this->skipReset = $skipReset;
} }
public function hasRecords($level) public function hasRecords($level)

1
tests/Monolog/Handler/FingersCrossedHandlerTest.php
View File

@@ -61,6 +61,7 @@ class FingersCrossedHandlerTest extends TestCase
public function testHandleResetBufferingAfterReset() public function testHandleResetBufferingAfterReset()
{ {
$test = new TestHandler(); $test = new TestHandler();
$test->setSkipReset(true);
$handler = new FingersCrossedHandler($test); $handler = new FingersCrossedHandler($test);
$handler->handle($this->getRecord(Logger::WARNING)); $handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG)); $handler->handle($this->getRecord(Logger::DEBUG));

21
tests/Monolog/LoggerTest.php
View File

@@ -620,6 +620,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
$logger = new Logger('app'); $logger = new Logger('app');
$testHandler = new Handler\TestHandler(); $testHandler = new Handler\TestHandler();
$testHandler->setSkipReset(true);
$bufferHandler = new Handler\BufferHandler($testHandler); $bufferHandler = new Handler\BufferHandler($testHandler);
$groupHandler = new Handler\GroupHandler(array($bufferHandler)); $groupHandler = new Handler\GroupHandler(array($bufferHandler));
$fingersCrossedHandler = new Handler\FingersCrossedHandler($groupHandler); $fingersCrossedHandler = new Handler\FingersCrossedHandler($groupHandler);
@@ -649,7 +650,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
$that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer')); $that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer'));
}; };
$logger->debug('debug'); $logger->debug('debug1');
$logger->reset(); $logger->reset();
$assertBuffersEmpty(); $assertBuffersEmpty();
$this->assertFalse($testHandler->hasDebugRecords()); $this->assertFalse($testHandler->hasDebugRecords());
@@ -657,16 +658,16 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
$logger->debug('debug'); $logger->debug('debug2');
$logger->error('error'); $logger->error('error2');
$logger->reset(); $logger->reset();
$assertBuffersEmpty(); $assertBuffersEmpty();
$this->assertTrue($testHandler->hasDebugRecords()); $this->assertTrue($testHandler->hasRecordThatContains('debug2', Logger::DEBUG));
$this->assertTrue($testHandler->hasErrorRecords()); $this->assertTrue($testHandler->hasRecordThatContains('error2', Logger::ERROR));
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
$logger->info('info'); $logger->info('info3');
$this->assertNotEmpty($getProperty($fingersCrossedHandler, 'buffer')); $this->assertNotEmpty($getProperty($fingersCrossedHandler, 'buffer'));
$assertBufferOfBufferHandlerEmpty(); $assertBufferOfBufferHandlerEmpty();
$this->assertFalse($testHandler->hasInfoRecords()); $this->assertFalse($testHandler->hasInfoRecords());
@@ -677,13 +678,13 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
$logger->notice('notice'); $logger->notice('notice4');
$logger->emergency('emergency'); $logger->emergency('emergency4');
$logger->reset(); $logger->reset();
$assertBuffersEmpty(); $assertBuffersEmpty();
$this->assertFalse($testHandler->hasInfoRecords()); $this->assertFalse($testHandler->hasInfoRecords());
$this->assertTrue($testHandler->hasNoticeRecords()); $this->assertTrue($testHandler->hasRecordThatContains('notice4', Logger::NOTICE));
$this->assertTrue($testHandler->hasEmergencyRecords()); $this->assertTrue($testHandler->hasRecordThatContains('emergency4', Logger::EMERGENCY));
$this->assertNotSame($uid1, $processorUid1->getUid()); $this->assertNotSame($uid1, $processorUid1->getUid());
$this->assertNotSame($uid2, $processorUid2->getUid()); $this->assertNotSame($uid2, $processorUid2->getUid());
} }