From 44d2441782431721218b38d87bd874a2f81855a1 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Thu, 26 Apr 2012 15:03:43 -0700 Subject: [PATCH] Pull MockRavenClient (which depends on Raven_Client) out of tests/Monolog/Handler/RavenHandlerTest.php into a separate file so that the test can pass when raven-php is installed and can be skipped when raven-php is not installed. Addresses @Stof's comment in https://github.com/Seldaek/monolog/pull/76#r740465 --- tests/Monolog/Handler/MockRavenClient.php | 26 ++++++++++++++++++++++ tests/Monolog/Handler/RavenHandlerTest.php | 19 ++++------------ 2 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 tests/Monolog/Handler/MockRavenClient.php diff --git a/tests/Monolog/Handler/MockRavenClient.php b/tests/Monolog/Handler/MockRavenClient.php new file mode 100644 index 00000000..f1f54a8f --- /dev/null +++ b/tests/Monolog/Handler/MockRavenClient.php @@ -0,0 +1,26 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Raven_Client; + +class MockRavenClient extends Raven_Client +{ + public function capture($data, $stack) + { + $this->lastData = $data; + $this->lastStack = $stack; + } + + public $lastData; + public $lastStack; +} diff --git a/tests/Monolog/Handler/RavenHandlerTest.php b/tests/Monolog/Handler/RavenHandlerTest.php index c3a69026..e146a9ce 100644 --- a/tests/Monolog/Handler/RavenHandlerTest.php +++ b/tests/Monolog/Handler/RavenHandlerTest.php @@ -14,19 +14,6 @@ namespace Monolog\Handler; use Monolog\TestCase; use Monolog\Logger; use Monolog\Handler\RavenHandler; -use \Raven_Client; - -class MockRavenClient extends Raven_Client -{ - public function capture($data, $stack) - { - $this->lastData = $data; - $this->lastStack = $stack; - } - - public $lastData; - public $lastStack; -} class RavenHandlerTest extends TestCase { @@ -35,6 +22,8 @@ class RavenHandlerTest extends TestCase if (!class_exists("Raven_Client")) { $this->markTestSkipped("raven/raven not installed"); } + + require_once __DIR__ . '/MockRavenClient.php'; } /** @@ -66,7 +55,7 @@ class RavenHandlerTest extends TestCase $record = $this->getRecord(Logger::DEBUG, "A test debug message"); $handler->handle($record); - $this->assertEquals(Raven_Client::DEBUG, $ravenClient->lastData['level']); + $this->assertEquals($ravenClient::DEBUG, $ravenClient->lastData['level']); $this->assertContains($record['message'], $ravenClient->lastData['message']); } @@ -78,7 +67,7 @@ class RavenHandlerTest extends TestCase $record = $this->getRecord(Logger::WARNING, "A test warning message"); $handler->handle($record); - $this->assertEquals(Raven_Client::WARNING, $ravenClient->lastData['level']); + $this->assertEquals($ravenClient::WARNING, $ravenClient->lastData['level']); $this->assertContains($record['message'], $ravenClient->lastData['message']); }