3 files changed, 1 insertions, 143 deletions
diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php
index 5cfd1300de..a59b94c744 100644
--- a/tests/functions/build_url_test.php
+++ b/tests/functions/build_url_test.php
@@ -85,7 +85,6 @@ class phpbb_build_url_test extends phpbb_test_case
 		global $user, $phpbb_root_path;
 
 		$user->page['page'] = $page;
-
 		$output = build_url($strip_vars);
 
 		$this->assertEquals($expected, $output);
diff --git a/tests/functions/insert_config_array_test.php b/tests/functions/insert_config_array_test.php
deleted file mode 100644
index bfcb05862e..0000000000
--- a/tests/functions/insert_config_array_test.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-class phpbb_functions_insert_config_array_test extends phpbb_test_case
-{
-	public function config_display_vars()
-	{
-		return array(
-			'legend1'		=> '',
-			'acp_config_1'	=> array(),
-			'acp_config_2'	=> array(),
-			'acp_config_3'	=> array(),
-			'acp_config_4'	=> array(),
-			'acp_config_5'	=> array(),
-		);
-	}
-
-	public function insert_config_array_data()
-	{
-		return array(
-			array( // Add a new config after 1st array item
-				array('new_config_1' => array()),
-				array('after' => 'legend1'),
-				array(
-					'legend1'		=> '',
-					'new_config_1'	=> array(),
-					'acp_config_1'	=> array(),
-					'acp_config_2'	=> array(),
-					'acp_config_3'	=> array(),
-					'acp_config_4'	=> array(),
-					'acp_config_5'	=> array(),
-				),
-			),
-			array( // Add a new config after last array item
-				array('new_config_1' => array()),
-				array('after' => 'acp_config_5'),
-				array(
-					'legend1'		=> '',
-					'acp_config_1'	=> array(),
-					'acp_config_2'	=> array(),
-					'acp_config_3'	=> array(),
-					'acp_config_4'	=> array(),
-					'acp_config_5'	=> array(),
-					'new_config_1'	=> array(),
-				),
-			),
-			array( // Add a new config before 2nd array item
-				array('new_config_1' => array()),
-				array('before' => 'acp_config_1'),
-				array(
-					'legend1'		=> '',
-					'new_config_1'	=> array(),
-					'acp_config_1'	=> array(),
-					'acp_config_2'	=> array(),
-					'acp_config_3'	=> array(),
-					'acp_config_4'	=> array(),
-					'acp_config_5'	=> array(),
-				),
-			),
-			array( // Add a new config before last config item
-				array('new_config_1' => array()),
-				array('before' => 'acp_config_5'),
-				array(
-					'legend1'		=> '',
-					'acp_config_1'	=> array(),
-					'acp_config_2'	=> array(),
-					'acp_config_3'	=> array(),
-					'acp_config_4'	=> array(),
-					'new_config_1'	=> array(),
-					'acp_config_5'	=> array(),
-				),
-			),
-			array( // When an array key does not exist
-				array('new_config_1' => array()),
-				array('after' => 'foobar'),
-				array(
-					'legend1'		=> '',
-					'acp_config_1'	=> array(),
-					'acp_config_2'	=> array(),
-					'acp_config_3'	=> array(),
-					'acp_config_4'	=> array(),
-					'acp_config_5'	=> array(),
-				),
-			),
-			array( // When after|before is not used correctly (defaults to after)
-				array('new_config_1' => array()),
-				array('foobar' => 'acp_config_1'),
-				array(
-					'legend1'		=> '',
-					'acp_config_1'	=> array(),
-					'new_config_1'	=> array(),
-					'acp_config_2'	=> array(),
-					'acp_config_3'	=> array(),
-					'acp_config_4'	=> array(),
-					'acp_config_5'	=> array(),
-				),
-			),
-			array( // Add a new config set after the last array item
-				array(
-					'legend2' => array(),
-					'new_config_1' => array(),
-					'new_config_2' => array(),
-					'new_config_3' => array(),
-				),
-				array('after' => 'acp_config_5'),
-				array(
-					'legend1'		=> '',
-					'acp_config_1'	=> array(),
-					'acp_config_2'	=> array(),
-					'acp_config_3'	=> array(),
-					'acp_config_4'	=> array(),
-					'acp_config_5'	=> array(),
-					'legend2' => array(),
-					'new_config_1' => array(),
-					'new_config_2' => array(),
-					'new_config_3' => array(),
-				),
-			),
-		);
-	}
-
-	/**
-	* @dataProvider insert_config_array_data
-	*/
-	public function test_insert_config_array($new_config, $position, $expected)
-	{
-		$config_array = $this->config_display_vars();
-		$new_config_array = phpbb_insert_config_array($config_array, $new_config, $position);
-
-		$this->assertSame($expected, $new_config_array);
-	}
-}
diff --git a/tests/functions/validate_username_test.php b/tests/functions/validate_username_test.php
index dc9f685f04..4fa5af7ff3 100644
--- a/tests/functions/validate_username_test.php
+++ b/tests/functions/validate_username_test.php
@@ -11,6 +11,7 @@
 *
 */
 
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 require_once dirname(__FILE__) . '/../mock/cache.php';