malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish testing the testable in CLI

Browse Source
This commit is contained in:
Master Yoda 2018-05-04 11:41:59 -07:00
parent c5acd0e073
commit 42bc648bdc
No known key found for this signature in database
GPG Key ID: CED549230775AD5B
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
system/CLI/CLI.php
View File

@ -51,6 +51,13 @@ use CodeIgniter\CLI\Exceptions\CLIException;
* possible to test using travis-ci. It has been phpunit-annotated
* to prevent messing up code coverage.
*
* Some of the methods require keyboard input, and are not unit-testable
* as a result: input() and prompt().
* validate() is internal, and not testable if prompt() isn't.
* The wait() method is mostly testable, as long as you don't give it
* an argument of "0".
* These have been flagged to ignore for code coverage purposes.
*
* @package CodeIgniter\HTTP
*/
class CLI
@ -158,7 +165,8 @@ class CLI
*
* @param string $prefix
* @return string
*
* @codeCoverageIgnore
*/
public static function input(string $prefix = null): string
{
@ -196,7 +204,7 @@ class CLI
* @param string $validation Validation rules
*
* @return string The user input
* @codeCoverageIgnore
*/
public static function prompt($field, $options = null, $validation = null): string
{
@ -256,6 +264,7 @@ class CLI
* @param string $rules Validation rules
*
* @return boolean
* @codeCoverageIgnore
*/
protected static function validate($field, $value, $rules)
{
@ -354,8 +363,11 @@ class CLI
}
else
{
// this chunk cannot be tested because of keyboard input
// @codeCoverageIgnoreStart
static::write(static::$wait_msg);
static::input();
// @codeCoverageIgnoreEnd
}
}
}
@ -382,7 +394,7 @@ class CLI
public static function newLine(int $num = 1)
{
// Do it once or more, write with empty string gives us a new line
for ($i = 0; $i < $num; $i ++ )
for ($i = 0; $i < $num; $i ++)
{
static::write('');
}
@ -621,7 +633,7 @@ class CLI
$optionsFound = false;
// start picking segments off from #1, ignoring the invoking program
for ($i = 1; $i < $_SERVER['argc']; $i ++ )
for ($i = 1; $i < $_SERVER['argc']; $i ++)
{
// If there's no '-' at the beginning of the argument
// then add it to our segments.
@ -811,7 +823,7 @@ class CLI
$max_cols_lengths = [];
// Read row by row and define the longest columns
for ($row = 0; $row < $total_rows; $row ++)
for ($row = 0; $row < $total_rows; $row ++ )
{
$column = 0; // Current column index
foreach ($table_rows[$row] as $col)
@ -834,7 +846,7 @@ class CLI
// Read row by row and add spaces at the end of the columns
// to match the exact column length
for ($row = 0; $row < $total_rows; $row ++)
for ($row = 0; $row < $total_rows; $row ++ )
{
$column = 0;
foreach ($table_rows[$row] as $col)
@ -851,7 +863,7 @@ class CLI
$table = '';
// Joins columns and append the well formatted rows to the table
for ($row = 0; $row < $total_rows; $row ++)
for ($row = 0; $row < $total_rows; $row ++ )
{
// Set the table border-top
if ($row === 0)
@ -880,5 +892,7 @@ class CLI
//--------------------------------------------------------------------
}
// Ensure the class is initialized.
// Ensure the class is initialized. Done outside of code coverage
// @codeCoverageIgnoreStart
CLI::init();
// @codeCoverageIgnoreEnd

12
tests/system/CLI/CLITest.php
View File

@ -51,13 +51,13 @@ class CLITest extends \CIUnitTestCase
// go catatonic when it is executed, presumably because of
// the CLI::input() waiting for a key press
// // test the press any key to continue...
// CLITestKeyboardFilter::$spoofed = ' \n';
// stream_filter_register('CLITestKeyboardFilter', 'CodeIgniter\CLI\CLITestKeyboardFilter');
// $spoofed = stream_filter_prepend(STDIN, 'CLITestKeyboardFilter');
// $spoofer = stream_filter_append(STDIN, 'CLITestKeyboardFilter');
// $time = time();
// CLITestKeyboardFilter::$spoofed = ' ';
// CLI::wait(0);
// stream_filter_remove($spoofed);
// $this->assertEquals(10, time() - $time);
// stream_filter_remove($spoofer);
// $this->assertEquals(0, time() - $time);
}
public function testIsWindows()
@ -336,7 +336,6 @@ class CLITestStreamFilter extends \php_user_filter
class CLITestKeyboardFilter extends \php_user_filter
{
public static $buffer = '';
public static $spoofed = '';
public function filter($in, $out, &$consumed, $closing)
@ -344,7 +343,8 @@ class CLITestKeyboardFilter extends \php_user_filter
while ($bucket = stream_bucket_make_writeable($in))
{
$consumed += $bucket->datalen;
$bucket = $spoofed;
$bucket->data = static::$spoofed . '\n';
$bucket->datalen = strlen(static::$spoofed);
stream_bucket_append($out, $bucket);
}
return PSFS_PASS_ON;