More test coverage of handlers/formatters

tests/Monolog/Formatter/JsonFormatterTest.php

@@ -12,20 +12,24 @@
 namespace Monolog\Formatter;
 
 use Monolog\Logger;
+use Monolog\TestCase;
 
-class JsonFormatterTest extends \PHPUnit_Framework_TestCase
+class JsonFormatterTest extends TestCase
 {
     public function testFormat()
     {
         $formatter = new JsonFormatter();
-        $message = $formatter->format($msg = array(
-            'level_name' => 'WARNING',
-            'channel' => 'log',
-            'context' => array(),
-            'message' => array('foo'),
-            'datetime' => new \DateTime,
-            'extra' => array(),
-        ));
-        $this->assertEquals(json_encode($msg), $message);
+        $record = $this->getRecord();
+        $this->assertEquals(json_encode($record), $formatter->format($record));
+    }
+
+    public function testFormatBatch()
+    {
+        $formatter = new JsonFormatter();
+        $records = array(
+            $this->getRecord(Logger::WARNING),
+            $this->getRecord(Logger::DEBUG),
+        );
+        $this->assertEquals(json_encode($records), $formatter->formatBatch($records));
     }
 }

tests/Monolog/Handler/AbstractHandlerTest.php

@@ -16,28 +16,13 @@ use Monolog\Logger;
 
 class AbstractHandlerTest extends TestCase
 {
-    public function testHandleLowerLevelMessage()
-    {
-        $handler = new TestHandler(Logger::WARNING, true);
-        $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
-    }
-
-    public function testHandleBubbling()
-    {
-        $handler = new TestHandler(Logger::DEBUG, true);
-        $this->assertFalse($handler->handle($this->getRecord()));
-    }
-
-    public function testHandleNotBubbling()
-    {
-        $handler = new TestHandler(Logger::DEBUG, false);
-        $this->assertTrue($handler->handle($this->getRecord()));
-    }
-
+    /**
+     * @covers Monolog\Handler\AbstractHandler::isHandling
+     */
     public function testIsHandling()
     {
         $handler = new TestHandler(Logger::WARNING, false);
-        $this->assertTrue($handler->handle($this->getRecord()));
-        $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
+        $this->assertTrue($handler->isHandling($this->getRecord()));
+        $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
     }
 }

tests/Monolog/Handler/AbstractProcessingHandlerTest.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\TestCase;
+use Monolog\Logger;
+
+class AbstractProcessingHandlerTest extends TestCase
+{
+    /**
+     * @covers Monolog\Handler\AbstractProcessingHandler::handle
+     */
+    public function testHandleLowerLevelMessage()
+    {
+        $handler = new TestHandler(Logger::WARNING, true);
+        $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
+    }
+
+    /**
+     * @covers Monolog\Handler\AbstractProcessingHandler::handle
+     */
+    public function testHandleBubbling()
+    {
+        $handler = new TestHandler(Logger::DEBUG, true);
+        $this->assertFalse($handler->handle($this->getRecord()));
+    }
+
+    /**
+     * @covers Monolog\Handler\AbstractProcessingHandler::handle
+     */
+    public function testHandleNotBubbling()
+    {
+        $handler = new TestHandler(Logger::DEBUG, false);
+        $this->assertTrue($handler->handle($this->getRecord()));
+    }
+
+    /**
+     * @covers Monolog\Handler\AbstractProcessingHandler::handle
+     */
+    public function testHandleIsFalseWhenNotHandled()
+    {
+        $handler = new TestHandler(Logger::WARNING, false);
+        $this->assertTrue($handler->handle($this->getRecord()));
+        $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
+    }
+}