mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
Making necessary changes to use the PHPUnit cli tool in testsuite shell
This commit is contained in:
parent
f8ed99798a
commit
1b97af2e34
1 changed files with 22 additions and 17 deletions
|
@ -59,9 +59,6 @@ class TestSuiteShell extends Shell {
|
||||||
'app' => false,
|
'app' => false,
|
||||||
'plugin' => null,
|
'plugin' => null,
|
||||||
'output' => 'text',
|
'output' => 'text',
|
||||||
'codeCoverage' => false,
|
|
||||||
'filter' => false,
|
|
||||||
'case' => null
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$category = $this->args[0];
|
$category = $this->args[0];
|
||||||
|
@ -73,20 +70,35 @@ class TestSuiteShell extends Shell {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($this->args[1])) {
|
if (isset($this->args[1])) {
|
||||||
$params['case'] = Inflector::underscore($this->args[1]) . '.test.php';
|
$params['case'] = Inflector::underscore($this->args[1]);
|
||||||
}
|
}
|
||||||
if (isset($this->args[2]) && $this->args[2] == 'cov') {
|
if (isset($this->args[2]) && $this->args[2] == 'cov') {
|
||||||
$params['codeCoverage'] = true;
|
$params['codeCoverage'] = true;
|
||||||
}
|
}
|
||||||
if (isset($this->params['filter'])) {
|
|
||||||
$params['filter'] = $this->params['filter'];
|
|
||||||
}
|
|
||||||
if (isset($this->params['coverage'])) {
|
if (isset($this->params['coverage'])) {
|
||||||
$params['codeCoverage'] = true;
|
$params['codeCoverage'] = true;
|
||||||
}
|
}
|
||||||
return $params;
|
return $params;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts the options passed to the shell as options for the PHPUnit cli runner
|
||||||
|
*
|
||||||
|
* @return array Array of params for CakeTestDispatcher
|
||||||
|
*/
|
||||||
|
protected function runnerOptions() {
|
||||||
|
$options = array();
|
||||||
|
foreach ($this->params as $param => $value) {
|
||||||
|
if ($param[0] === '-') {
|
||||||
|
$options[] = '-' . $param;
|
||||||
|
if (is_string($value)) {
|
||||||
|
$options[] = $value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $options;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main entry point to this shell
|
* Main entry point to this shell
|
||||||
*
|
*
|
||||||
|
@ -96,16 +108,9 @@ class TestSuiteShell extends Shell {
|
||||||
$this->out(__('CakePHP Test Shell'));
|
$this->out(__('CakePHP Test Shell'));
|
||||||
$this->hr();
|
$this->hr();
|
||||||
|
|
||||||
if (count($this->args) == 0) {
|
require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_runner.php';
|
||||||
$this->error(__('Sorry, you did not pass any arguments!'));
|
$testCli = new TestRunner($this->parseArgs());
|
||||||
}
|
$testCli->run($this->runnerOptions());
|
||||||
|
|
||||||
$result = $this->_dispatcher->dispatch();
|
|
||||||
$exit = 0;
|
|
||||||
if ($result instanceof PHPUnit_Framework_TestResult) {
|
|
||||||
$exit = ($result->errorCount() + $result->failureCount()) > 0;
|
|
||||||
}
|
|
||||||
$this->_stop($exit);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue