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 17:40:31 +04:00
parent c6b48f084d
commit bafe38ccf0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/util/AutoloadBuilderTestVFS.php
View File

@ -27,11 +27,11 @@ class AutoloadBuilderTestVFS extends PHPUnit_Framework_TestCase
/** /**
* @TODO: Load->buildAutoload() - uses two paths - PATH . '/' . APP . '/src' and PATH . '/lib' those are not checked. Can couse error. * @TODO: Load->buildAutoload() - uses two paths - PATH . '/' . APP . '/src' and PATH . '/lib' those are not checked. Can couse error.
* @expectedException UnexpectedValueException
* @expectedException PHPUnit_Framework_Error
*/ */
public function setUp() public function setUp()
{ {
$this->setExpectedException('UnexpectedValueException');
$this->setExpectedException('PHPUnit_Framework_Error');
if (!defined('PATH')) { if (!defined('PATH')) {
define('PATH', realpath(dirname(__FILE__) . '/../../../..')); define('PATH', realpath(dirname(__FILE__) . '/../../../..'));
} }

3
tests/util/profiler/ProfilerTest.php
View File

@ -32,8 +32,6 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException GeneralException
* @expectedExceptionMessage Need to turn on DEBUG before use.
* @runInSeparateProcess * @runInSeparateProcess
*/ */
public function testGetInstaceNoDebug() public function testGetInstaceNoDebug()
@ -41,6 +39,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
if (!defined('DEBUG')) { if (!defined('DEBUG')) {
define('DEBUG', false); define('DEBUG', false);
} }
$this->setExpectedException('GeneralException', 'Need to turn on DEBUG before use.');
Profiler::getInstance(); Profiler::getInstance();
} }