diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-25 11:46:24 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-25 11:46:24 +0200 |
| commit | 01e2d7c26c9974405c073d43ecd12614aca6faa5 (patch) | |
| tree | 7df6a85255233543dbcdac639cf3c26e122e9732 | |
| parent | 142fe1a0e57797aa77059edda42ebedd91b11397 (diff) | |
| download | forums-01e2d7c26c9974405c073d43ecd12614aca6faa5.tar forums-01e2d7c26c9974405c073d43ecd12614aca6faa5.tar.gz forums-01e2d7c26c9974405c073d43ecd12614aca6faa5.tar.bz2 forums-01e2d7c26c9974405c073d43ecd12614aca6faa5.tar.xz forums-01e2d7c26c9974405c073d43ecd12614aca6faa5.zip | |
[ticket/12273] Fix unit tests for multi line arrays
PHPBB3-12273
| -rw-r--r-- | tests/event/fixtures/trigger_many_vars.test | 26 | ||||
| -rw-r--r-- | tests/event/php_exporter_test.php | 46 |
2 files changed, 61 insertions, 11 deletions
diff --git a/tests/event/fixtures/trigger_many_vars.test b/tests/event/fixtures/trigger_many_vars.test index fadfcffefc..da72f4c57f 100644 --- a/tests/event/fixtures/trigger_many_vars.test +++ b/tests/event/fixtures/trigger_many_vars.test @@ -39,7 +39,27 @@ * post_id, topic_id, forum_id, submit, preview, save, load, * delete, cancel, refresh, error, page_data, message_parser */ - $vars = array('post_data', 'moderators', 'mode', 'page_title', 's_topic_icons', 'form_enctype'); - $vars = array_merge($vars, array('s_action', 's_hidden_fields', 'post_id', 'topic_id', 'forum_id', 'submit', 'preview')); - $vars = array_merge($vars, array('save', 'load', 'delete', 'cancel', 'refresh', 'error', 'page_data', 'message_parser')); + $vars = array( + 'post_data', + 'moderators', + 'mode', + 'page_title', + 's_topic_icons', + 'form_enctype', + 's_action', + 's_hidden_fields', + 'post_id', + 'topic_id', + 'forum_id', + 'submit', + 'preview', + 'save', + 'load', + 'delete', + 'cancel', + 'refresh', + 'error', + 'page_data', + 'message_parser', + ); extract($phpbb_dispatcher->trigger_event('core.posting_modify_template_vars', compact($vars))); diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php index 5df7713bdf..03f6974af1 100644 --- a/tests/event/php_exporter_test.php +++ b/tests/event/php_exporter_test.php @@ -343,47 +343,77 @@ class phpbb_event_php_exporter_test extends phpbb_test_case array( '/**', '*/', - '$phpbb_dispatcher->dispatch(\'test\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', ), 2, - 3, + 1, ), array( array( '/**', '*/', '$vars = $bertie;', - '$phpbb_dispatcher->dispatch(\'test\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', ), 3, + 1, + ), + array( + array( + '/**', + '*/', + '$vars = array(\'$bertie\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', + ), 3, + 1, ), array( array( '/**', '*/', '$vars = array();', - '$phpbb_dispatcher->dispatch(\'test\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', ), 3, + 1, + ), + array( + array( + '/**', + '*/', + '$vars = array(\'t1\', \'t2\', \'t3\', \'t4\', \'t5\', \'t6\', \'t7\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', + ), 3, + 2, ), array( array( '/**', '*/', '$vars = array(\'test2\', \'\');', - '$phpbb_dispatcher->dispatch(\'test\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', ), 3, - 4, + 3, ), array( array( '/**', '*/', - '$vars = array(\'$bertie\');', - '$phpbb_dispatcher->dispatch(\'test\');', + '$vars = array(\'bertie\'\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', + ), + 3, + 3, + ), + array( + array( + '/**', + '*/', + '$vars = array(\'bertie\',\'basically_valid\');', + '$phpbb_dispatcher->trigger_event(\'test\', compact($vars));', ), 3, 3, |