Просмотр исходного кода

Split expectException calls with two parameters into the proper two calls

Chris Forrence 8 лет назад
Родитель
Сommit
763c3afb32

+ 4 - 2
tests/Monolog/Formatter/NormalizerFormatterTest.php

@@ -115,7 +115,8 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
     public function testFormatToStringExceptionHandle()
     {
         $formatter = new NormalizerFormatter('Y-m-d');
-        $this->expectException('RuntimeException', 'Could not convert to string');
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Could not convert to string');
         $formatter->format([
             'myObject' => new TestToStringError(),
         ]);
@@ -313,7 +314,8 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
         $reflMethod = new \ReflectionMethod($formatter, 'handleJsonError');
         $reflMethod->setAccessible(true);
 
-        $this->expectException('RuntimeException', $msg);
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage($msg);
         $reflMethod->invoke($formatter, $code, 'faked');
     }
 

+ 2 - 1
tests/Monolog/Handler/ElasticSearchHandlerTest.php

@@ -134,7 +134,8 @@ class ElasticSearchHandlerTest extends TestCase
         $handler = new ElasticSearchHandler($client, $handlerOpts);
 
         if ($expectedError) {
-            $this->expectException($expectedError[0], $expectedError[1]);
+            $this->expectException($expectedError[0]);
+            $this->expectExceptionMessage($expectedError[1]);
             $handler->handle($this->getRecord());
         } else {
             $this->assertFalse($handler->handle($this->getRecord()));