2 files changed, 231 insertions, 0 deletions
diff --git a/tests/functions_acp/insert_config_array_test.php b/tests/functions_acp/insert_config_array_test.php
new file mode 100644
index 0000000000..1264b35bf4
--- /dev/null
+++ b/tests/functions_acp/insert_config_array_test.php
@@ -0,0 +1,144 @@
+<?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.
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
+
+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_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index 3c9af4a889..4bf6ba3984 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -162,4 +162,91 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $phpbb_error);
 	}
+
+	public function data_validate_path_linux()
+	{
+		return array(
+			array('/usr/bin', 'absolute_path', true),
+			array('/usr/bin/', 'absolute_path:50:200', true),
+			array('/usr/bin/which', 'absolute_path', 'DIRECTORY_NOT_DIR'),
+			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('C:\Windows', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('.', 'absolute_path', true),
+			array('', 'absolute_path', true),
+			array('mkdir /foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			// Make sure above command didn't do anything
+			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_validate_path_linux
+	 */
+	public function test_validate_path_linux($path, $validation_type, $expected)
+	{
+		if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
+		{
+			$this->markTestSkipped('Unable to test linux specific paths on other OS.');
+		}
+
+		$error = array();
+		$config_ary = array(
+			'path' => $path,
+		);
+
+		validate_config_vars(array(
+				'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
+			),
+			$config_ary,
+			$error
+		);
+	}
+
+	public function data_validate_path_windows()
+	{
+		return array(
+			array('C:\Windows', 'absolute_path', true),
+			array('C:\Windows\\', 'absolute_path:50:200', true),
+			array('C:\Windows\explorer.exe', 'absolute_path', 'DIRECTORY_NOT_DIR'),
+			array('C:\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('/usr/bin', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('.', 'absolute_path', true),
+			array('', 'absolute_path', true),
+			array('mkdir C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			// Make sure above command didn't do anything
+			array('C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_validate_path_windows
+	 */
+	public function test_validate_path_windows($path, $validation_type, $expected)
+	{
+		if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
+		{
+			$this->markTestSkipped('Unable to test windows specific paths on other OS.');
+		}
+
+		$error = array();
+		$config_ary = array(
+			'path' => $path,
+		);
+
+		validate_config_vars(array(
+			'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
+		),
+			$config_ary,
+			$error
+		);
+
+		if ($expected === true)
+		{
+			$this->assertEmpty($error);
+		}
+		else
+		{
+			$this->assertEquals(array($expected), $error);
+		}
+	}
 }