8 files changed, 49 insertions, 63 deletions
diff --git a/tests/cron/ext/testext/cron/dummy_task.php b/tests/cron/ext/testext/cron/dummy_task.php
index 996f5b39cf..3e81db1895 100644
--- a/tests/cron/ext/testext/cron/dummy_task.php
+++ b/tests/cron/ext/testext/cron/dummy_task.php
@@ -9,7 +9,12 @@
 
 class phpbb_ext_testext_cron_dummy_task extends phpbb_cron_task_base
 {
-	public static $was_run = 0;
+	static public $was_run = 0;
+
+	public function get_name()
+	{
+		return get_class($this);
+	}
 
 	public function run()
 	{
diff --git a/tests/cron/includes/cron/task/core/dummy_task.php b/tests/cron/includes/cron/task/core/dummy_task.php
index 6e2e2db636..c94455603f 100644
--- a/tests/cron/includes/cron/task/core/dummy_task.php
+++ b/tests/cron/includes/cron/task/core/dummy_task.php
@@ -9,7 +9,12 @@
 
 class phpbb_cron_task_core_dummy_task extends phpbb_cron_task_base
 {
-	public static $was_run = 0;
+	static public $was_run = 0;
+
+	public function get_name()
+	{
+		return get_class($this);
+	}
 
 	public function run()
 	{
diff --git a/tests/cron/includes/cron/task/core/second_dummy_task.php b/tests/cron/includes/cron/task/core/second_dummy_task.php
index 8cd0bddfc0..77ef6f70ed 100644
--- a/tests/cron/includes/cron/task/core/second_dummy_task.php
+++ b/tests/cron/includes/cron/task/core/second_dummy_task.php
@@ -9,7 +9,12 @@
 
 class phpbb_cron_task_core_second_dummy_task extends phpbb_cron_task_base
 {
-	public static $was_run = 0;
+	static public $was_run = 0;
+
+	public function get_name()
+	{
+		return get_class($this);
+	}
 
 	public function run()
 	{
diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php
index f433fc9a9b..3c541be2a6 100644
--- a/tests/cron/manager_test.php
+++ b/tests/cron/manager_test.php
@@ -7,7 +7,6 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/extension_manager.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';
@@ -19,10 +18,10 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 {
 	public function setUp()
 	{
-		$this->manager = new phpbb_cron_manager(array(
-			'phpbb_cron_task_core_dummy_task',
-			'phpbb_cron_task_core_second_dummy_task',
-			'phpbb_ext_testext_cron_dummy_task',
+		$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';
 	}
@@ -34,13 +33,6 @@ 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();
@@ -55,10 +47,10 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 
 	public function test_manager_finds_only_ready_tasks()
 	{
-		$manager = new phpbb_cron_manager(array(
-			'phpbb_cron_task_core_simple_ready',
-			'phpbb_cron_task_core_simple_not_runnable',
-			'phpbb_cron_task_core_simple_should_not_run',
+		$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);
@@ -70,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);
+	}
 }
diff --git a/tests/cron/task_provider_test.php b/tests/cron/task_provider_test.php
deleted file mode 100644
index 4547c61a55..0000000000
--- a/tests/cron/task_provider_test.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/../mock/extension_manager.php';
-
-class phpbb_cron_task_provider_test extends PHPUnit_Framework_TestCase
-{
-	public function setUp()
-	{
-		$this->extension_manager = new phpbb_mock_extension_manager(
-			dirname(__FILE__) . '/',
-			array(
-				'testext' => array(
-					'ext_name'      => 'testext',
-					'ext_active'    => true,
-					'ext_path'      => 'ext/testext/'
-				),
-			));
-		$this->provider = new phpbb_cron_task_provider($this->extension_manager);
-	}
-
-	public function test_manager_finds_shipped_tasks()
-	{
-		$tasks = array();
-		foreach ($this->provider as $task)
-		{
-			$tasks[] = $task;
-		}
-		sort($tasks);
-
-		$this->assertEquals(array(
-			'phpbb_cron_task_core_dummy_task',
-			'phpbb_cron_task_core_second_dummy_task',
-			'phpbb_ext_testext_cron_dummy_task',
-		), $tasks);
-	}
-}
diff --git a/tests/cron/tasks/simple_not_runnable.php b/tests/cron/tasks/simple_not_runnable.php
index 837f28f1c0..56d484eacd 100644
--- a/tests/cron/tasks/simple_not_runnable.php
+++ b/tests/cron/tasks/simple_not_runnable.php
@@ -2,6 +2,11 @@
 
 class phpbb_cron_task_core_simple_not_runnable extends phpbb_cron_task_base
 {
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
 	public function run()
 	{
 	}
diff --git a/tests/cron/tasks/simple_ready.php b/tests/cron/tasks/simple_ready.php
index de5f10e491..8aa0507406 100644
--- a/tests/cron/tasks/simple_ready.php
+++ b/tests/cron/tasks/simple_ready.php
@@ -2,6 +2,11 @@
 
 class phpbb_cron_task_core_simple_ready extends phpbb_cron_task_base
 {
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
 	public function run()
 	{
 	}
diff --git a/tests/cron/tasks/simple_should_not_run.php b/tests/cron/tasks/simple_should_not_run.php
index c2a41616f6..58f6df2616 100644
--- a/tests/cron/tasks/simple_should_not_run.php
+++ b/tests/cron/tasks/simple_should_not_run.php
@@ -2,6 +2,11 @@
 
 class phpbb_cron_task_core_simple_should_not_run extends phpbb_cron_task_base
 {
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
 	public function run()
 	{
 	}