1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12602] Fix language key removal.
  [ticket/12602] Rectify language keys.
  [ticket/12602] Fix test mistake.
  [ticket/12602] Fix language var mistakes.
  [ticket/12602] Add types, change description of cron:list.
  [ticket/12602] Fix internationalisation of cron_list.php
  [ticket/12602] Fix spaces issues.
  [ticket/12602] Coding style correction.
  [ticket/12602] Fix coding style mistakes.
  [ticket/12602] Headers updated.
  [ticket/12602] Changes to respect coding style and to factorize code.
  [ticket/12602] Cleanup tests
  [ticket/12602] Add function get_tasks.
  [ticket/12602] Correction of the output message for the cron list
  [ticket/12602] Add files to print the cron list and test files.
This commit is contained in:
Andreas Fischer
2014-06-06 19:43:09 +02:00
7 changed files with 236 additions and 0 deletions

View File

@@ -0,0 +1,103 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require_once dirname(__FILE__) . '/tasks/simple_ready.php';
require_once dirname(__FILE__) . '/tasks/simple_not_ready.php';
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\cron\cron_list;
class phpbb_console_command_cron_list_test extends phpbb_test_case
{
/** @var \phpbb\cron\manager */
protected $cron_manager;
/** @var \phpbb\user */
protected $user;
protected $command_name;
protected $command_tester;
protected function setUp()
{
$this->user = $this->getMock('\phpbb\user');
$this->user->method('lang')->will($this->returnArgument(0));
}
public function test_no_task()
{
$this->initiate_test(0, 0);
$this->assertContains('CRON_NO_TASKS', $this->command_tester->getDisplay());
}
public function test_only_ready()
{
$this->initiate_test(2, 0);
$this->assertContains('TASKS_READY command1 command2', preg_replace('/\s+/', ' ', trim($this->command_tester->getDisplay())));
}
public function test_only_not_ready()
{
$this->initiate_test(0, 2);
$this->assertContains('TASKS_NOT_READY command1 command2', preg_replace('/\s+/', ' ', trim($this->command_tester->getDisplay())));
}
public function test_both_ready()
{
$this->initiate_test(2, 2);
$this->assertSame('TASKS_READY command1 command2 TASKS_NOT_READY command3 command4', preg_replace('/\s+/', ' ', trim($this->command_tester->getDisplay())));
}
public function get_cron_manager(array $tasks)
{
global $pathEx, $phpbb_root_path;
$i = 1;
foreach ($tasks as $task)
{
$task->set_name('command' . $i);
$i++;
}
$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $pathEx);
}
public function get_command_tester()
{
$application = new Application();
$application->add(new cron_list($this->cron_manager, $this->user));
$command = $application->find('cron:list');
$this->command_name = $command->getName();
return new CommandTester($command);
}
public function initiate_test($number_ready, $number_not_ready)
{
$tasks = array();
for ($i = 0; $i < $number_ready; $i++)
{
$tasks[] = new phpbb_cron_task_simple_ready();
}
for ($i = 0; $i < $number_not_ready; $i++)
{
$tasks[] = new phpbb_cron_task_simple_not_ready();
}
$this->get_cron_manager($tasks);
$this->command_tester = $this->get_command_tester();
$this->command_tester->execute(array('command' => $this->command_name, '--no-ansi' => true));
}
}

View File

@@ -0,0 +1,13 @@
<?php
class phpbb_cron_task_simple_not_ready extends \phpbb\cron\task\base
{
public function run()
{
}
public function should_run()
{
return false;
}
}

View File

@@ -0,0 +1,8 @@
<?php
class phpbb_cron_task_simple_ready extends \phpbb\cron\task\base
{
public function run()
{
}
}