From d4705b1c898501b52c96383f88c69053588a9e52 Mon Sep 17 00:00:00 2001 From: Vyacheslav Agafonov Date: Fri, 25 Nov 2011 14:59:39 +0400 Subject: [PATCH] replace Exception on GeneralException --- tests/redis/RedisDebugTest.php | 3 ++- tests/redis/RedisManagerTest.php | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/redis/RedisDebugTest.php b/tests/redis/RedisDebugTest.php index 6e82799..8b1fc5f 100644 --- a/tests/redis/RedisDebugTest.php +++ b/tests/redis/RedisDebugTest.php @@ -14,6 +14,7 @@ require_once dirname(__FILE__) . '/../../exception/GeneralException.php'; require_once dirname(__FILE__) . '/../../util/profiler/CommandProfiler.php'; require_once dirname(__FILE__) . '/../../util/profiler/Profiler.php'; require_once dirname(__FILE__) . '/../../redis/RedisDebug.php'; +require_once dirname(__FILE__) . '/../../exception/GeneralException.php'; class RedisDebugTest extends PHPUnit_Framework_TestCase { @@ -84,7 +85,7 @@ class RedisDebugTest extends PHPUnit_Framework_TestCase } /** - * @expectedException Exception + * @expectedException GeneralException * @expectedExceptionMessage call_user_func_array() expects parameter 1 to be a valid callback * @runInSeparateProcess */ diff --git a/tests/redis/RedisManagerTest.php b/tests/redis/RedisManagerTest.php index f6e56b7..9f56dbf 100644 --- a/tests/redis/RedisManagerTest.php +++ b/tests/redis/RedisManagerTest.php @@ -13,6 +13,8 @@ require_once dirname(__FILE__) . '/../../Registry.php'; require_once dirname(__FILE__) . '/../../Config.php'; require_once dirname(__FILE__) . '/../../redis/RedisManager.php'; +require_once dirname(__FILE__) . '/../../exception/GeneralException.php'; + class RedisManagerTest extends PHPUnit_Framework_TestCase { @@ -44,7 +46,7 @@ class RedisManagerTest extends PHPUnit_Framework_TestCase } /** - * @expectedException Exception + * @expectedException GeneralException * @expectedExceptionMessage Trying to get property of non-object * @TODO: line 34: $config = Config::get('Redis')->$name; - check for Redis config existence */ @@ -54,7 +56,7 @@ class RedisManagerTest extends PHPUnit_Framework_TestCase } /** - * @expectedException Exception + * @expectedException GeneralException * @expectedExceptionMessage Connection parameters must be an array */ public function testConnectWrongPersistantConfig() @@ -64,7 +66,7 @@ class RedisManagerTest extends PHPUnit_Framework_TestCase } /** - * @expectedException Exception + * @expectedException GeneralException * @expectedExceptionMessage Connection parameters must be an array */ public function testConnectDefaultConfig() @@ -74,7 +76,7 @@ class RedisManagerTest extends PHPUnit_Framework_TestCase } /** - * @expectedException Exception + * @expectedException GeneralException * @expectedExceptionMessage Failed to connect to Redis server at */ public function testConnectFailedConnection() @@ -84,7 +86,7 @@ class RedisManagerTest extends PHPUnit_Framework_TestCase } /** - * @expectedException Exception + * @expectedException GeneralException * @expectedExceptionMessage Failed to select Redis database with index */ public function testConnectEstablishedConnectionNoDb()