diff options
Diffstat (limited to 'plugins/Monolog/tests')
-rw-r--r-- | plugins/Monolog/tests/Integration/LogTest.php | 4 | ||||
-rw-r--r-- | plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/plugins/Monolog/tests/Integration/LogTest.php b/plugins/Monolog/tests/Integration/LogTest.php index 9e24f4af13..e0e2c6e53b 100644 --- a/plugins/Monolog/tests/Integration/LogTest.php +++ b/plugins/Monolog/tests/Integration/LogTest.php @@ -31,7 +31,7 @@ class LogTest extends IntegrationTestCase public static $expectedExceptionOutput = '[Monolog] [%s] LogTest.php(112): dummy error message dummy backtrace'; - public static $expectedErrorOutput = '[Monolog] [%s] dummyerrorfile.php(145): Unknown error (102) - dummy error string + public static $expectedErrorOutput = '[Monolog] [%s] dummyerrorfile.php(145): dummy error message dummy backtrace'; public function setUp(): void @@ -41,7 +41,7 @@ class LogTest extends IntegrationTestCase Log::unsetInstance(); @unlink(self::getLogFileLocation()); - Log::$debugBacktraceForTests = "dummy backtrace"; + Log::$debugBacktraceForTests = "dummy error message\ndummy backtrace"; } public function tearDown(): void diff --git a/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php b/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php index 20412dc85f..b815046c52 100644 --- a/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php +++ b/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php @@ -60,7 +60,7 @@ class ExceptionToTextProcessorTest extends \PHPUnit\Framework\TestCase public function it_should_replace_message_with_formatted_exception() { $processor = new ExceptionToTextProcessor(); - Log::$debugBacktraceForTests = '[stack trace]'; + Log::$debugBacktraceForTests = '[message and stack trace]'; $exception = new \Exception('Hello world'); $record = array( @@ -72,7 +72,7 @@ class ExceptionToTextProcessorTest extends \PHPUnit\Framework\TestCase $result = $processor($record); $expected = array( - 'message' => __FILE__ . "(65): Hello world\n[stack trace]", + 'message' => __FILE__ . "(65): [message and stack trace]", 'context' => array( 'exception' => $exception, ), @@ -87,7 +87,7 @@ class ExceptionToTextProcessorTest extends \PHPUnit\Framework\TestCase public function it_should_add_severity_for_errors() { $processor = new ExceptionToTextProcessor(); - Log::$debugBacktraceForTests = '[stack trace]'; + Log::$debugBacktraceForTests = '[message and stack trace]'; $exception = new \ErrorException('Hello world', 0, 1, 'file.php', 123); $record = array( @@ -99,7 +99,7 @@ class ExceptionToTextProcessorTest extends \PHPUnit\Framework\TestCase $result = $processor($record); $expected = array( - 'message' => "file.php(123): Error - Hello world\n[stack trace]", + 'message' => "file.php(123): [message and stack trace]", 'context' => array( 'exception' => $exception, ), @@ -240,6 +240,7 @@ EOI; $wholeTrace = ExceptionToTextProcessor::getMessageAndWholeBacktrace($exArray); $expected = <<<EOI +themessage thestacktrace EOI; @@ -255,7 +256,7 @@ EOI; $wholeTrace = ExceptionToTextProcessor::getMessageAndWholeBacktrace($exArray); - $expected = ''; + $expected = 'themessage'; $this->assertEquals($expected, $wholeTrace); } |