adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing a few failing test cases and attempting to work around php segmentation fault when running the complete test suite

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-09-28 22:57:50 -04:30
parent 6b7c752478
commit 7b3ceb5a29
2 changed files with 15 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
View file

@ -39,6 +39,13 @@ class FixtureTaskTest extends CakeTestCase {
*/
public $fixtures = array('core.article', 'core.comment', 'core.datatype', 'core.binary_test', 'core.user');
/**
* Whether backup global state for each test method or not
*
* @var bool false
*/
public $backupGlobals = false;
/**
* setUp method
*
@ -53,8 +60,8 @@ class FixtureTaskTest extends CakeTestCase {
array('in', 'err', 'createFile', '_stop', 'clear'),
array($out, $out, $in)
);
$this->Task->Model = $this->getMock('Shell',
array('in', 'out', 'error', 'createFile', 'getName', 'getTable', 'listAll'),
$this->Task->Model = $this->getMock('ModelTask',
array('in', 'out', 'err', 'createFile', 'getName', 'getTable', 'listAll'),
array($out, $out, $in)
);
$this->Task->Template = new TemplateTask($out, $out, $in);
@ -191,6 +198,7 @@ class FixtureTaskTest extends CakeTestCase {
/**
* test that execute passes runs bake depending with named model.
*
*
* @return void
*/
public function testExecuteWithNamedModel() {
@ -201,36 +209,7 @@ class FixtureTaskTest extends CakeTestCase {
$this->Task->expects($this->at(0))->method('createFile')
->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
$this->Task->execute();
}
/**
* data provider for model name variations.
*
* @return array
*/
public static function modelNameProvider() {
return array(
array('article'), array('articles'), array('Articles'), array('Article')
);
}
/**
* test that execute passes runs bake depending with named model.
*
* @dataProvider modelNameProvider
* @return void
*/
public function testExecuteWithNamedModelVariations($modelName) {
$this->Task->connection = 'test';
$this->Task->path = '/my/path/';
$this->Task->args = array($modelName);
$filename = '/my/path/ArticleFixture.php';
$this->Task->expects($this->once())->method('createFile')
->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
$this->Task->execute();
}
@ -245,7 +224,7 @@ class FixtureTaskTest extends CakeTestCase {
$this->Task->args = array('all');
$this->Task->Model->expects($this->any())
->method('listAll')
->will($this->returnValue(array('articles', 'comments')));
->will($this->returnValue(array('Article', 'comments')));
$filename = '/my/path/ArticleFixture.php';
$this->Task->expects($this->at(0))

16
lib/Cake/Test/Case/Model/CakeSchemaTest.php
View file

@ -575,10 +575,7 @@ class CakeSchemaTest extends CakeTestCase {
*/
public function testSchemaReadWithAppModel() {
$connections = ConnectionManager::enumConnectionObjects();
if (!empty($connections['default'])) {
$backup = $connections['default'];
ConnectionManager::drop('default');
}
ConnectionManager::drop('default');
ConnectionManager::create('default', $connections['test']);
try {
$read = $this->Schema->read(array(
@ -586,18 +583,11 @@ class CakeSchemaTest extends CakeTestCase {
'name' => 'TestApp',
'models' => array('AppModel')
));
if (!empty($backup)) {
ConnectionManager::drop('default');
ConnectionManager::create('default', $backup);
}
} catch(MissingTableException $mte) {
if (!empty($backup)) {
ConnectionManager::drop('default');
ConnectionManager::create('default', $backup);
}
ConnectionManager::drop('default');
$this->fail($mte->getMessage());
}
ConnectionManager::drop('default');
}
/**