diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:39:18 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:39:59 +0100 |
| commit | 14a84cf89cd41da36545f5f04348c49d4eadfb45 (patch) | |
| tree | b04a5988c982b8b367697f03bde3f20ace7d022c /tests/bbcode | |
| parent | da4617b14b11ade6f664b8c1ab94e3aeb5b7428d (diff) | |
| parent | 5b752a2fed82f27cb1e383583dc4ccb87f7e12e5 (diff) | |
| download | forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.gz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.bz2 forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.xz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.zip | |
Merge branch 'develop-olympus' into develop
This commit also ports all ascraeus tests to the new format.
Conflicts:
tests/all_tests.php
tests/network/all_tests.php
tests/request/all_tests.php
tests/request/request_var.php
tests/template/templates/includephp.html
Diffstat (limited to 'tests/bbcode')
| -rw-r--r-- | tests/bbcode/all_tests.php | 43 | ||||
| -rw-r--r-- | tests/bbcode/parser_test.php | 9 |
2 files changed, 4 insertions, 48 deletions
diff --git a/tests/bbcode/all_tests.php b/tests/bbcode/all_tests.php deleted file mode 100644 index 925971f504..0000000000 --- a/tests/bbcode/all_tests.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php -/** -* -* @package testing -* @version $Id$ -* @copyright (c) 2008 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -define('IN_PHPBB', true); - -if (!defined('PHPUnit_MAIN_METHOD')) -{ - define('PHPUnit_MAIN_METHOD', 'phpbb_bbcode_all_tests::main'); -} - -require_once 'test_framework/framework.php'; -require_once 'PHPUnit/TextUI/TestRunner.php'; - -require_once 'bbcode/parser_test.php'; - -class phpbb_bbcode_all_tests -{ - public static function main() - { - PHPUnit_TextUI_TestRunner::run(self::suite()); - } - - public static function suite() - { - $suite = new PHPUnit_Framework_TestSuite('phpBB Formatted Text / BBCode'); - - $suite->addTestSuite('phpbb_bbcode_parser_test'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'phpbb_bbcode_all_tests::main') -{ - phpbb_bbcode_all_tests::main(); -} diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php index 7c7aca6230..4a11f47680 100644 --- a/tests/bbcode/parser_test.php +++ b/tests/bbcode/parser_test.php @@ -8,16 +8,15 @@ * */ -define('IN_PHPBB', true); - -require_once 'test_framework/framework.php'; -require_once '../phpBB/includes/bbcode/bbcode_parser_base.php'; -require_once '../phpBB/includes/bbcode/bbcode_parser.php'; +// require_once __DIR__ . '/../../phpBB/includes/bbcode/bbcode_parser_base.php'; +// require_once __DIR__ . '/../../phpBB/includes/bbcode/bbcode_parser.php'; class phpbb_bbcode_parser_test extends PHPUnit_Framework_TestCase { public function test_both_passes() { + $this->markTestIncomplete('New bbcode parser has not been backported from feature/ascraeus-experiment yet.'); + $parser = new phpbb_bbcode_parser(); $result = $parser->first_pass('[i]Italic [u]underlined text[/u][/i]'); |