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

replacement @expectedException to setExpectedException

Browse Source
This commit is contained in:
Vyacheslav Agafonov
2011-12-01 12:25:27 +04:00
parent 9943b6afcf
commit 71ffa06eaa
4 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/exception/Error404ExceptionTest.php
View File

@ -15,22 +15,15 @@ require_once dirname(__FILE__) . '/../../exception/Error404Exception.php';
class Error404ExceptionTest extends PHPUnit_Framework_TestCase class Error404ExceptionTest extends PHPUnit_Framework_TestCase
{ {
/**
* @expectedException Error404Exception
*/
public function testError404Exception() public function testError404Exception()
{ {
$this->setExpectedException('Error404Exception');
throw new Error404Exception(); throw new Error404Exception();
} }
/**
* @expectedException Error404Exception
* @expectedExceptionMessage Error404Exception message
* @excpectedExceptionCode 1
*/
public function testError404ExceptionMessage() public function testError404ExceptionMessage()
{ {
$this->setExpectedException('Error404Exception', 'Error404Exception message', 10);
throw new Error404Exception('Error404Exception message', 10); throw new Error404Exception('Error404Exception message', 10);
} }

5
tests/exception/ErrorHandlerTest.php
View File

@ -33,12 +33,9 @@ class ErrorHandlerTest extends PHPUnit_Framework_TestCase
$this->assertEquals($eh, $my_eh); $this->assertEquals($eh, $my_eh);
} }
/**
* @expectedException ErrorException
* @expectedExceptionMessage test error
*/
public function testHandleError() public function testHandleError()
{ {
$this->setExpectedException('ErrorException', 'test error');
trigger_error("test error", E_USER_ERROR); trigger_error("test error", E_USER_ERROR);
} }

11
tests/exception/GeneralExceptionTest.php
View File

@ -14,22 +14,15 @@ require_once dirname(__FILE__) . '/../../exception/GeneralException.php';
class GeneralExceptionTest extends PHPUnit_Framework_TestCase class GeneralExceptionTest extends PHPUnit_Framework_TestCase
{ {
/**
* @expectedException GeneralException
*/
public function testGeneralException() public function testGeneralException()
{ {
$this->setExpectedException('GeneralException');
throw new GeneralException(); throw new GeneralException();
} }
/**
* @expectedException GeneralException
* @expectedExceptionMessage GeneralException message
* @excpectedExceptionCode 1
*/
public function testGeneralExceptionMessage() public function testGeneralExceptionMessage()
{ {
$this->setExpectedException('GeneralException', 'GeneralException message', 1);
throw new GeneralException('GeneralException message', 1); throw new GeneralException('GeneralException message', 1);
} }

11
tests/exception/InitializationExceptionTest.php
View File

@ -14,22 +14,15 @@ require_once dirname(__FILE__) . '/../../exception/InitializationException.php';
class InitializationExceptionTest extends PHPUnit_Framework_TestCase class InitializationExceptionTest extends PHPUnit_Framework_TestCase
{ {
/**
* @expectedException InitializationException
*/
public function testInitializationException() public function testInitializationException()
{ {
$this->setExpectedException('InitializationException');
throw new InitializationException(); throw new InitializationException();
} }
/**
* @expectedException InitializationException
* @expectedExceptionMessage InitializationException message
* @excpectedExceptionCode 1
*/
public function testInitializationExceptionMessage() public function testInitializationExceptionMessage()
{ {
$this->setExpectedException('InitializationException', 'InitializationException message', 1);
throw new InitializationException('InitializationException message', 1); throw new InitializationException('InitializationException message', 1);
} }
} }