4 files changed, 253 insertions, 32 deletions
diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php
new file mode 100644
index 0000000000..46705a585f
--- /dev/null
+++ b/tests/console/cron/cron_list_test.php
@@ -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));
+	}
+}
diff --git a/tests/console/cron/tasks/simple_not_ready.php b/tests/console/cron/tasks/simple_not_ready.php
new file mode 100644
index 0000000000..887768e5fe
--- /dev/null
+++ b/tests/console/cron/tasks/simple_not_ready.php
@@ -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;
+	}
+}
diff --git a/tests/console/cron/tasks/simple_ready.php b/tests/console/cron/tasks/simple_ready.php
new file mode 100644
index 0000000000..47970e104f
--- /dev/null
+++ b/tests/console/cron/tasks/simple_ready.php
@@ -0,0 +1,8 @@
+<?php
+
+class phpbb_cron_task_simple_ready extends \phpbb\cron\task\base
+{
+	public function run()
+	{
+	}
+}
diff --git a/tests/log/delete_test.php b/tests/log/delete_test.php
index f10e3e582b..b8be15efa5 100644
--- a/tests/log/delete_test.php
+++ b/tests/log/delete_test.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -13,48 +17,141 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_log_delete_test extends phpbb_database_test_case
 {
+	protected $log;
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_log.xml');
 	}
 
-	public function test_log_delete()
+	protected function setUp()
 	{
 		global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher, $auth;
 
 		$db = $this->new_dbal();
-		$cache = new phpbb_mock_cache;
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$user = $this->getMock('\phpbb\user');
 		$user->data['user_id'] = 1;
 		$auth = $this->getMock('\phpbb\auth\auth');
 
-		$log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
-
-		// Delete all admin logs
-		$this->assertCount(2, $log->get_logs('admin'));
-		$log->delete('admin');
-		// One entry is added to the admin log when the logs are purged
-		$this->assertCount(1, $log->get_logs('admin'));
-
-		// Delete with keyword
-		$this->assertCount(1, $log->get_logs('mod', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC', 'guest'));
-		$log->delete('mod', array('keywords' => 'guest'));
-		$this->assertEmpty($log->get_logs('mod', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC', 'guest'));
-
-		// Delete with simples conditions
-		$this->assertCount(3, $log->get_logs('mod', false, 0, 0, 12, 0, 1, 0, 'l.log_time DESC'));
-		$log->delete('mod', array('forum_id' => 12, 'user_id' => 1));
-		$this->assertEmpty($log->get_logs('mod', false, 0, 0, 12, 0, 1, 0, 'l.log_time DESC'));
-
-		// Delete with IN condition
-		$this->assertCount(2, $log->get_logs('mod', false, 0, 0, array(13, 14), 0, 0, 0, 'l.log_time DESC'));
-		$log->delete('mod', array('forum_id' => array('IN' => array(14, 13))));
-		$this->assertEmpty($log->get_logs('mod', false, 0, 0, array(13, 14), 0, 0, 0, 'l.log_time DESC'));
-
-		// Delete with a custom condition (ie: WHERE x >= 10)
-		$this->assertCount(3, $log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC'));
-		$log->delete('critical', array('user_id' => array('>', 1)));
-		$this->assertCount(1, $log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC'));
+		$this->log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+
+		parent::setUp();
+	}
+
+	public function log_delete_data()
+	{
+		return array(
+			array(
+				array(1, 2),
+				array(16),
+				array(),
+				'admin',
+				false,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				'l.log_id ASC',
+				'',
+			),
+			array(
+				array(11),
+				array(),
+				array('keywords' => 'guest'),
+				'mod',
+				false,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				'l.log_id ASC',
+				'guest',
+			),
+			array(
+				array(4, 5, 7),
+				array(),
+				array('forum_id' => 12, 'user_id' => 1),
+				'mod',
+				false,
+				0,
+				0,
+				12,
+				0,
+				1,
+				0,
+				'l.log_id ASC',
+				'',
+			),
+			array(
+				array(12, 13),
+				array(),
+				array('forum_id' => array('IN' => array(14, 13))),
+				'mod',
+				false,
+				0,
+				0,
+				array(13, 14),
+				0,
+				0,
+				0,
+				'l.log_id ASC',
+				'',
+			),
+			array(
+				array(3, 14, 15),
+				array(3),
+				array('user_id' => array('>', 1)),
+				'critical',
+				false,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				'l.log_id ASC',
+				'',
+			),
+			array(
+				array(3, 14, 15),
+				array(),
+				array('keywords' => ''),
+				'critical',
+				false,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				'l.log_id ASC',
+				'',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider log_delete_data
+	*/
+	public function test_log_delete($expected_before, $expected_after, $delete_conditions, $mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $log_time, $sort_by, $keywords)
+	{
+		$this->assertSame($expected_before, $this->get_ids($this->log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $log_time, $sort_by, $keywords)), 'before');
+		$this->log->delete($mode, $delete_conditions);
+		$this->assertSame($expected_after, $this->get_ids($this->log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $log_time, $sort_by, $keywords)), 'after');
+	}
+
+	public function get_ids($logs)
+	{
+		$ids = array();
+		foreach ($logs as $log_entry)
+		{
+			$ids[] = (int) $log_entry['id'];
+		}
+		return $ids;
 	}
 }