1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-01 10:50:21 +02:00

Remove SocketHandler's ConnecitonException and WriteToSocketException - replace them with \UnexpectedValueException and \RuntimeException respectively

This commit is contained in:
Pablo Belloc
2012-03-28 08:49:25 -03:00
parent 83e1e2d80a
commit bee3e1bca4
4 changed files with 15 additions and 53 deletions

View File

@@ -13,8 +13,6 @@ namespace Monolog\Handler;
use Monolog\TestCase;
use Monolog\Logger;
use Monolog\Handler\SocketHandler\Exception\ConnectionException;
use Monolog\Handler\SocketHandler\Exception\WriteToSocketException;
/**
* @author Pablo de Leon Belloc <pablolb@gmail.com>
@@ -33,7 +31,7 @@ class SocketHandlerTest extends TestCase
private $res;
/**
* @expectedException Monolog\Handler\SocketHandler\Exception\ConnectionException
* @expectedException UnexpectedValueException
*/
public function testInvalidHostname()
{
@@ -86,13 +84,13 @@ class SocketHandlerTest extends TestCase
$string = 'Hello world';
$this->writeRecord($string);
$this->fail("Shoul not connect - are you running a server on 127.0.0.1:7894 ?");
} catch (\Monolog\Handler\SocketHandler\Exception\ConnectionException $e) {
} catch (\UnexpectedValueException $e) {
}
}
/**
* @expectedException Monolog\Handler\SocketHandler\Exception\ConnectionException
* @expectedException UnexpectedValueException
*/
public function testExceptionIsThrownOnFsockopenError()
{
@@ -104,7 +102,7 @@ class SocketHandlerTest extends TestCase
}
/**
* @expectedException Monolog\Handler\SocketHandler\Exception\ConnectionException
* @expectedException UnexpectedValueException
*/
public function testExceptionIsThrownOnPfsockopenError()
{
@@ -117,7 +115,7 @@ class SocketHandlerTest extends TestCase
}
/**
* @expectedException Monolog\Handler\SocketHandler\Exception\ConnectionException
* @expectedException UnexpectedValueException
*/
public function testExceptionIsThrownIfCannotSetTimeout()
{
@@ -129,7 +127,7 @@ class SocketHandlerTest extends TestCase
}
/**
* @expectedException Monolog\Handler\SocketHandler\Exception\WriteToSocketException
* @expectedException RuntimeException
*/
public function testWriteFailsOnIfFwriteReturnsFalse()
{
@@ -148,7 +146,7 @@ class SocketHandlerTest extends TestCase
}
/**
* @expectedException Monolog\Handler\SocketHandler\Exception\WriteToSocketException
* @expectedException RuntimeException
*/
public function testWriteFailsIfStreamTimesOut()
{
@@ -171,7 +169,7 @@ class SocketHandlerTest extends TestCase
}
/**
* @expectedException Monolog\Handler\SocketHandler\Exception\WriteToSocketException
* @expectedException RuntimeException
*/
public function testWriteFailsOnIncompleteWrite()
{