wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace Exception GeneralException

Browse Source
This commit is contained in:
Vyacheslav Agafonov
2011-11-25 14:12:38 +04:00
parent b8a02ebeaa
commit acc0c96487
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/validator/EqualValidatorTest.php
View File

@ -13,6 +13,7 @@
require_once dirname(__FILE__) . '/../../validator/iValidator.php'; require_once dirname(__FILE__) . '/../../validator/iValidator.php';
require_once dirname(__FILE__) . '/../../validator/Validator.php'; require_once dirname(__FILE__) . '/../../validator/Validator.php';
require_once dirname(__FILE__) . '/../../validator/EqualValidator.php'; require_once dirname(__FILE__) . '/../../validator/EqualValidator.php';
require_once dirname(__FILE__) . '/../../exception/InitializationException.php';
class EqualValidatorTest extends PHPUnit_Framework_TestCase class EqualValidatorTest extends PHPUnit_Framework_TestCase
{ {
@ -24,7 +25,7 @@ class EqualValidatorTest extends PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException Exception * @expectedException InitializationException
* @expectedExceptionMessage Token not defined * @expectedExceptionMessage Token not defined
*/ */
public function testNullToken() public function testNullToken()

5
tests/validator/RegexValidatorTest.php
View File

@ -13,6 +13,7 @@
require_once dirname(__FILE__) . '/../../validator/iValidator.php'; require_once dirname(__FILE__) . '/../../validator/iValidator.php';
require_once dirname(__FILE__) . '/../../validator/Validator.php'; require_once dirname(__FILE__) . '/../../validator/Validator.php';
require_once dirname(__FILE__) . '/../../validator/RegexValidator.php'; require_once dirname(__FILE__) . '/../../validator/RegexValidator.php';
require_once dirname(__FILE__) . '/../../exception/GeneralException.php';
class RegexValidatorTest extends PHPUnit_Framework_TestCase class RegexValidatorTest extends PHPUnit_Framework_TestCase
{ {
@ -45,7 +46,7 @@ class RegexValidatorTest extends PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException Exception * @expectedException GeneralException
* @expectedExceptionMessage Message template "regex_not_match" unknown. * @expectedExceptionMessage Message template "regex_not_match" unknown.
*/ */
public function testNullMessage() public function testNullMessage()
@ -66,7 +67,7 @@ class RegexValidatorTest extends PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException Exception * @expectedException GeneralException
* @expectedExceptionMessage regex * @expectedExceptionMessage regex
*/ */
public function testRegexReturnsFalse() public function testRegexReturnsFalse()