aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-13 08:22:27 -0400
committerNils Adermann <naderman@naderman.de>2011-09-29 15:42:33 +0200
commitfabde989a2676c762f58e17b06772c9a3ba2f85e (patch)
treee635e30f2fc1eb70bc1f2b2fcb5d3885bfb28524 /tests
parent14f1e581faa3b66e7689c55c1e9c0485c0872b1e (diff)
downloadforums-fabde989a2676c762f58e17b06772c9a3ba2f85e.tar
forums-fabde989a2676c762f58e17b06772c9a3ba2f85e.tar.gz
forums-fabde989a2676c762f58e17b06772c9a3ba2f85e.tar.bz2
forums-fabde989a2676c762f58e17b06772c9a3ba2f85e.tar.xz
forums-fabde989a2676c762f58e17b06772c9a3ba2f85e.zip
[feature/extension-manager] Porting cron tasks over to the extension finder
PHPBB3-10323
Diffstat (limited to 'tests')
-rw-r--r--tests/cron/ext/testext/cron/dummy_task.php (renamed from tests/cron/task/testmod/dummy_task.php)2
-rw-r--r--tests/cron/includes/cron/task/core/dummy_task.php23
-rw-r--r--tests/cron/includes/cron/task/core/second_dummy_task.php (renamed from tests/cron/task/testmod/second_dummy_task.php)2
-rw-r--r--tests/cron/manager_test.php43
-rw-r--r--tests/cron/root2/includes/cron/task/core/simple_not_runnable.php (renamed from tests/cron/task2/testmod/simple_not_runnable.php)2
-rw-r--r--tests/cron/root2/includes/cron/task/core/simple_ready.php8
-rw-r--r--tests/cron/root2/includes/cron/task/core/simple_should_not_run.php (renamed from tests/cron/task2/testmod/simple_should_not_run.php)2
-rw-r--r--tests/cron/task2/testmod/simple_ready.php8
-rw-r--r--tests/extension/finder_test.php30
-rw-r--r--tests/mock/extension_manager.php4
10 files changed, 76 insertions, 48 deletions
diff --git a/tests/cron/task/testmod/dummy_task.php b/tests/cron/ext/testext/cron/dummy_task.php
index 5941157589..06546ada05 100644
--- a/tests/cron/task/testmod/dummy_task.php
+++ b/tests/cron/ext/testext/cron/dummy_task.php
@@ -7,7 +7,7 @@
*
*/
-class phpbb_cron_task_testmod_dummy_task extends phpbb_cron_task_base
+class phpbb_ext_testext_cron_dummy_task extends phpbb_cron_task_base
{
public static $was_run = 0;
diff --git a/tests/cron/includes/cron/task/core/dummy_task.php b/tests/cron/includes/cron/task/core/dummy_task.php
new file mode 100644
index 0000000000..ddaf6a9b7c
--- /dev/null
+++ b/tests/cron/includes/cron/task/core/dummy_task.php
@@ -0,0 +1,23 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class phpbb_cron_task_core_dummy_task extends phpbb_cron_task_base
+{
+ public static $was_run = 0;
+
+ public function run()
+ {
+ self::$was_run++;
+ }
+
+ public function should_run()
+ {
+ return true;
+ }
+}
diff --git a/tests/cron/task/testmod/second_dummy_task.php b/tests/cron/includes/cron/task/core/second_dummy_task.php
index 7118b2ebe7..36c3912c30 100644
--- a/tests/cron/task/testmod/second_dummy_task.php
+++ b/tests/cron/includes/cron/task/core/second_dummy_task.php
@@ -7,7 +7,7 @@
*
*/
-class phpbb_cron_task_testmod_second_dummy_task extends phpbb_cron_task_base
+class phpbb_cron_task_core_second_dummy_task extends phpbb_cron_task_base
{
public static $was_run = 0;
diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php
index 65d8360fbb..80f2cd55a8 100644
--- a/tests/cron/manager_test.php
+++ b/tests/cron/manager_test.php
@@ -7,25 +7,35 @@
*
*/
-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__) . '/../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';
+require_once dirname(__FILE__) . '/root2/includes/cron/task/core/simple_ready.php';
+require_once dirname(__FILE__) . '/root2/includes/cron/task/core/simple_not_runnable.php';
+require_once dirname(__FILE__) . '/root2/includes/cron/task/core/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';
+ $this->extension_manager = new phpbb_mock_extension_manager(
+ dirname(__FILE__) . '/',
+ array(
+ 'testext' => array(
+ 'ext_name' => 'testext',
+ 'ext_active' => true,
+ 'ext_path' => dirname(__FILE__) . '/ext/testext/'
+ ),
+ ));
+ $this->manager = new phpbb_cron_manager($this->extension_manager);
+ $this->task_name = 'phpbb_cron_task_core_dummy_task';
}
public function test_manager_finds_shipped_tasks()
{
$tasks = $this->manager->find_cron_task_names();
- $this->assertEquals(2, sizeof($tasks));
+ $this->assertEquals(3, sizeof($tasks));
}
public function test_manager_finds_shipped_task_by_name()
@@ -45,7 +55,7 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
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 +64,12 @@ 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 = new phpbb_cron_manager(new phpbb_mock_extension_manager(dirname(__FILE__) . '/root2/'));
$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)
diff --git a/tests/cron/task2/testmod/simple_not_runnable.php b/tests/cron/root2/includes/cron/task/core/simple_not_runnable.php
index 54869fa1cc..837f28f1c0 100644
--- a/tests/cron/task2/testmod/simple_not_runnable.php
+++ b/tests/cron/root2/includes/cron/task/core/simple_not_runnable.php
@@ -1,6 +1,6 @@
<?php
-class phpbb_cron_task_testmod_simple_not_runnable extends phpbb_cron_task_base
+class phpbb_cron_task_core_simple_not_runnable extends phpbb_cron_task_base
{
public function run()
{
diff --git a/tests/cron/root2/includes/cron/task/core/simple_ready.php b/tests/cron/root2/includes/cron/task/core/simple_ready.php
new file mode 100644
index 0000000000..de5f10e491
--- /dev/null
+++ b/tests/cron/root2/includes/cron/task/core/simple_ready.php
@@ -0,0 +1,8 @@
+<?php
+
+class phpbb_cron_task_core_simple_ready extends phpbb_cron_task_base
+{
+ public function run()
+ {
+ }
+}
diff --git a/tests/cron/task2/testmod/simple_should_not_run.php b/tests/cron/root2/includes/cron/task/core/simple_should_not_run.php
index 14ba4cdbd3..c2a41616f6 100644
--- a/tests/cron/task2/testmod/simple_should_not_run.php
+++ b/tests/cron/root2/includes/cron/task/core/simple_should_not_run.php
@@ -1,6 +1,6 @@
<?php
-class phpbb_cron_task_testmod_simple_should_not_run extends phpbb_cron_task_base
+class phpbb_cron_task_core_simple_should_not_run extends phpbb_cron_task_base
{
public function run()
{
diff --git a/tests/cron/task2/testmod/simple_ready.php b/tests/cron/task2/testmod/simple_ready.php
deleted file mode 100644
index e407441e90..0000000000
--- a/tests/cron/task2/testmod/simple_ready.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class phpbb_cron_task_testmod_simple_ready extends phpbb_cron_task_base
-{
- public function run()
- {
- }
-}
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index a1b216face..b0c98da554 100644
--- a/tests/extension/finder_test.php
+++ b/tests/extension/finder_test.php
@@ -17,20 +17,22 @@ class phpbb_extension_finder_test extends phpbb_test_case
public function setUp()
{
- $this->extension_manager = new phpbb_mock_extension_manager(array(
- 'foo' => array(
- 'ext_name' => 'foo',
- 'ext_active' => '1',
- 'ext_path' => dirname(__FILE__) . '/ext/foo/',
- ),
- 'bar' => array(
- 'ext_name' => 'bar',
- 'ext_active' => '1',
- 'ext_path' => dirname(__FILE__) . '/ext/bar/',
- ),
- ));
-
- $this->finder = new phpbb_extension_finder($this->extension_manager, dirname(__FILE__) . '/');
+ $this->extension_manager = new phpbb_mock_extension_manager(
+ dirname(__FILE__) . '/',
+ array(
+ 'foo' => array(
+ 'ext_name' => 'foo',
+ 'ext_active' => '1',
+ 'ext_path' => dirname(__FILE__) . '/ext/foo/',
+ ),
+ 'bar' => array(
+ 'ext_name' => 'bar',
+ 'ext_active' => '1',
+ 'ext_path' => dirname(__FILE__) . '/ext/bar/',
+ ),
+ ));
+
+ $this->finder = $this->extension_manager->get_finder();
}
public function test_suffix_get_classes()
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
index 49d727db37..5155716181 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -9,8 +9,10 @@
class phpbb_mock_extension_manager extends phpbb_extension_manager
{
- public function __construct($extensions = array())
+ public function __construct($phpbb_root_path, $extensions = array())
{
+ $this->phpbb_root_path = $phpbb_root_path;
+ $this->phpEx = '.php';
$this->extensions = $extensions;
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-22 18:21:19 +0000