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]');