1 files changed, 28 insertions, 35 deletions
diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php
index 65d8360fbb..3c541be2a6 100644
--- a/tests/cron/manager_test.php
+++ b/tests/cron/manager_test.php
@@ -3,29 +3,27 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/cache.php';
-require_once dirname(__FILE__) . '/task/testmod/dummy_task.php';
-require_once dirname(__FILE__) . '/task/testmod/second_dummy_task.php';
-require_once dirname(__FILE__) . '/task2/testmod/simple_ready.php';
-require_once dirname(__FILE__) . '/task2/testmod/simple_not_runnable.php';
-require_once dirname(__FILE__) . '/task2/testmod/simple_should_not_run.php';
+require_once dirname(__FILE__) . '/includes/cron/task/core/dummy_task.php';
+require_once dirname(__FILE__) . '/includes/cron/task/core/second_dummy_task.php';
+require_once dirname(__FILE__) . '/ext/testext/cron/dummy_task.php';
+require_once dirname(__FILE__) . '/tasks/simple_ready.php';
+require_once dirname(__FILE__) . '/tasks/simple_not_runnable.php';
+require_once dirname(__FILE__) . '/tasks/simple_should_not_run.php';
 
 class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 {
 	public function setUp()
 	{
-		$this->manager = new phpbb_cron_manager(dirname(__FILE__) . '/task/', 'php');
-		$this->task_name = 'phpbb_cron_task_testmod_dummy_task';
-	}
-
-	public function test_manager_finds_shipped_tasks()
-	{
-		$tasks = $this->manager->find_cron_task_names();
-		$this->assertEquals(2, sizeof($tasks));
+		$this->manager = $this->create_cron_manager(array(
+			new phpbb_cron_task_core_dummy_task(),
+			new phpbb_cron_task_core_second_dummy_task(),
+			new phpbb_ext_testext_cron_dummy_task(),
+		));
+		$this->task_name = 'phpbb_cron_task_core_dummy_task';
 	}
 
 	public function test_manager_finds_shipped_task_by_name()
@@ -35,17 +33,10 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 		$this->assertEquals($this->task_name, $task->get_name());
 	}
 
-	public function test_manager_instantiates_task_by_name()
-	{
-		$task = $this->manager->instantiate_task($this->task_name, array());
-		$this->assertInstanceOf('phpbb_cron_task_wrapper', $task);
-		$this->assertEquals($this->task_name, $task->get_name());
-	}
-
 	public function test_manager_finds_all_ready_tasks()
 	{
 		$tasks = $this->manager->find_all_ready_tasks();
-		$this->assertEquals(2, sizeof($tasks));
+		$this->assertEquals(3, sizeof($tasks));
 	}
 
 	public function test_manager_finds_one_ready_task()
@@ -54,21 +45,16 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 		$this->assertInstanceOf('phpbb_cron_task_wrapper', $task);
 	}
 
-	public function test_manager_finds_all_ready_tasks_cached()
-	{
-		$cache = new phpbb_mock_cache(array('_cron_tasks' => array($this->task_name)));
-		$manager = new phpbb_cron_manager(dirname(__FILE__) . '/../../phpBB/', 'php', $cache);
-
-		$tasks = $manager->find_all_ready_tasks();
-		$this->assertEquals(1, sizeof($tasks));
-	}
-
 	public function test_manager_finds_only_ready_tasks()
 	{
-		$manager = new phpbb_cron_manager(dirname(__FILE__) . '/task2/', 'php');
+		$manager = $this->create_cron_manager(array(
+			new phpbb_cron_task_core_simple_ready(),
+			new phpbb_cron_task_core_simple_not_runnable(),
+			new phpbb_cron_task_core_simple_should_not_run(),
+		));
 		$tasks = $manager->find_all_ready_tasks();
 		$task_names = $this->tasks_to_names($tasks);
-		$this->assertEquals(array('phpbb_cron_task_testmod_simple_ready'), $task_names);
+		$this->assertEquals(array('phpbb_cron_task_core_simple_ready'), $task_names);
 	}
 
 	private function tasks_to_names($tasks)
@@ -76,8 +62,15 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 		$names = array();
 		foreach ($tasks as $task)
 		{
-			$names[] = get_class($task->task);
+			$names[] = $task->get_name();
 		}
 		return $names;
 	}
+
+	private function create_cron_manager($tasks)
+	{
+		global $phpbb_root_path, $phpEx;
+
+		return new phpbb_cron_manager($tasks, $phpbb_root_path, $phpEx);
+	}
 }