adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more coding standards fixes, minor rectaoring of testcase

Browse source
This commit is contained in:
Ceeram 2013-03-18 11:38:50 +01:00
parent 89100f9476
commit 99fba8c601
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/Cake/Test/Case/TestSuite/CakeTestSuiteDispatcherTest.php
View file

@ -22,37 +22,50 @@
class CakeTestSuiteDispatcherTest extends CakeTestCase {
/**
* setUp method
*
* @return void
*/
public function setUp() {
$this->vendors = App::path('vendors');
$this->includePath = ini_get('include_path');
}
/**
* tearDown method
*
* @return void
*/
public function tearDown() {
App::build(array('Vendor' => $this->vendors), App::RESET);
ini_set('include_path', $this->includePath);
}
protected function clearPaths() {
/**
* Helper method to set vendor path
*
* @return void
*/
protected function _clearPaths() {
App::build(array('Vendor' => array('junk')), App::RESET);
ini_set('include_path', 'junk');
}
/**
* testLoadTestFramework method
*
* @return void
*/
public function testLoadTestFramework() {
$dispatcher = new CakeTestSuiteDispatcher();
$this->assertTrue($dispatcher->loadTestFramework());
$this->clearPaths();
$this->_clearPaths();
$exception = null;
try {
$dispatcher->loadTestFramework();
} catch (Exception $ex) {
$exception = $ex;
}
$this->assertEquals(get_class($exception), "PHPUnit_Framework_Error_Warning");
$this->setExpectedException('PHPUnit_Framework_Error_Warning');
$dispatcher->loadTestFramework();
}
}

2
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
View file

@ -138,7 +138,7 @@ class CakeTestSuiteDispatcher {
*/
public function loadTestFramework() {
foreach (App::path('vendors') as $vendor) {
$vendor = rtrim($vendor, DS);
$vendor = rtrim($vendor, DS);
if (is_dir($vendor . DS . 'PHPUnit')) {
ini_set('include_path', $vendor . PATH_SEPARATOR . ini_get('include_path'));
break;