4 files changed, 166 insertions, 34 deletions
diff --git a/tests/profile/custom_string_test.php b/tests/profile/custom_string_test.php
new file mode 100644
index 0000000000..bd0b20573c
--- /dev/null
+++ b/tests/profile/custom_string_test.php
@@ -0,0 +1,116 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
+
+class phpbb_profile_custom_string_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/profile_fields.xml');
+	}
+
+	static public function string_fields()
+	{
+		return array(
+			// note, there is an offset of 1 between option_id (0-indexed)
+			// in the database and values (1-indexed) to avoid problems with
+			// transmitting 0 in an HTML form
+			//    required, value, validation, expected, description
+			array(
+					1,
+					'H3110',
+					'[0-9]+',
+					'FIELD_INVALID_CHARS_NUMBERS_ONLY-field',
+					'Required field should reject characters in a numbers-only field',
+			),
+			array(
+					1,
+					'This string is too long',
+					'.*',
+					'FIELD_TOO_LONG-10-field',
+					'Required field should reject a field too long',
+			),
+			array(
+					0,
+					'&lt;&gt;&quot;&amp;%&amp;&gt;&lt;&gt;',
+					'.*',
+					false,
+					'Optional field should accept html entities',
+			),
+			array(
+					1,
+					'ö ä ü ß',
+					'.*',
+					false,
+					'Required field should accept UTF-8 string',
+			),
+			array(
+					1,
+					'This ö ä string has to b',
+					'.*',
+					'FIELD_TOO_LONG-10-field',
+					'Required field should reject an UTF-8 string which is too long',
+			),
+			array(
+					1,
+					'ö äö äö ä',
+					'[\w]+',
+					'FIELD_INVALID_CHARS_ALPHA_ONLY-field',
+					'Required field should reject UTF-8 in alpha only field',
+			),
+			array(
+					1,
+					'Hello',
+					'[\w]+',
+					false,
+					'Required field should accept a characters only field',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider string_fields
+	*/
+	public function test_string_validate($field_required, $field_value, $field_validation, $expected, $description)
+	{
+		$db = $this->new_dbal();
+
+		$field_data = array(
+			'field_id'          => 1,
+			'lang_id'			=> 1,
+			'lang_name'			=> 'field',
+			'field_novalue'		=> 1,
+			'field_required'    => $field_required,
+			'field_maxlen'      => 10,
+			'field_validation'  => $field_validation,
+		);
+		$user = $this->getMock('\phpbb\user');
+		$user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
+
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
+
+		$cp = new \phpbb\profilefields\type\type_string(
+			$request,
+			$template,
+			$user
+		);
+		$result = $cp->validate_profile_field($field_value, $field_data);
+
+		$this->assertEquals($expected, $result, $description);
+	}
+
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
+}
diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php
index 1f33b45ba9..e68f1f7c4b 100644
--- a/tests/profile/custom_test.php
+++ b/tests/profile/custom_test.php
@@ -7,49 +7,65 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions_profile_fields.php';
-
 class phpbb_profile_custom_test extends phpbb_database_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/profile_fields.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/profile_fields.xml');
 	}
 
-	static public function dropdownFields()
+	static public function dropdown_fields()
 	{
 		return array(
 			// note, there is an offset of 1 between option_id (0-indexed)
 			// in the database and values (1-indexed) to avoid problems with
 			// transmitting 0 in an HTML form
 			//    required, value, expected
-			array(1,        '0',   'FIELD_INVALID_VALUE', 'Required field should throw error for out-of-range value'),
-			array(1,        '1',   'FIELD_REQUIRED',      'Required field should throw error for default value'),
-			array(1,        '2',   false,                 'Required field should accept non-default value'),
-			array(0,        '0',   'FIELD_INVALID_VALUE', 'Optional field should throw error for out-of-range value'),
-			array(0,        '1',   false,                 'Optional field should accept default value'),
-			array(0,        '2',   false,                 'Optional field should accept non-default value'),
+			array(1,        '0',   'FIELD_INVALID_VALUE-field',	'Required field should throw error for out-of-range value'),
+			array(1,        '1',   'FIELD_REQUIRED-field',		'Required field should throw error for default value'),
+			array(1,        '2',   false,						'Required field should accept non-default value'),
+			array(0,        '0',   'FIELD_INVALID_VALUE-field', 'Optional field should throw error for out-of-range value'),
+			array(0,        '1',   false,						'Optional field should accept default value'),
+			array(0,        '2',   false,						'Optional field should accept non-default value'),
 		);
 	}
 
 	/**
-	* @dataProvider dropdownFields
+	* @dataProvider dropdown_fields
 	*/
 	public function test_dropdown_validate($field_required, $field_value, $expected, $description)
 	{
-		global $db;
+		global $db, $table_prefix;
 		$db = $this->new_dbal();
 
 		$field_data = array(
 			'field_id'			=> 1,
 			'lang_id'			=> 1,
+			'lang_name'			=> 'field',
 			'field_novalue'		=> 1,
 			'field_required'	=> $field_required,
 		);
+		$user = $this->getMock('\phpbb\user');
+		$user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
+
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
 
-		$cp = new custom_profile;
-		$result = $cp->validate_profile_field(FIELD_DROPDOWN, $field_value, $field_data);
+		$cp = new \phpbb\profilefields\type\type_dropdown(
+			new \phpbb\profilefields\lang_helper($db, $table_prefix . 'profile_fields_lang'),
+			$request,
+			$template,
+			$user
+		);
+		$result = $cp->validate_profile_field($field_value, $field_data);
 
 		$this->assertEquals($expected, $result, $description);
 	}
+
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
 }
diff --git a/tests/profile/fixtures/profile_fields.xml b/tests/profile/fixtures/profile_fields.xml
index 0b2929f625..e0c260bbf5 100644
--- a/tests/profile/fixtures/profile_fields.xml
+++ b/tests/profile/fixtures/profile_fields.xml
@@ -10,21 +10,21 @@
 			<value>1</value>
 			<value>1</value>
 			<value>0</value>
-			<value>5</value>
+			<value>profilefields.type.dropdown</value>
 			<value>Default Option</value>
 		</row>
 		<row>
 			<value>1</value>
 			<value>1</value>
 			<value>1</value>
-			<value>5</value>
+			<value>profilefields.type.dropdown</value>
 			<value>First Alternative</value>
 		</row>
 		<row>
 			<value>1</value>
 			<value>1</value>
 			<value>2</value>
-			<value>5</value>
+			<value>profilefields.type.dropdown</value>
 			<value>Third Alternative</value>
 		</row>
 	</table>
diff --git a/tests/profile/get_profile_value_test.php b/tests/profile/get_profile_value_test.php
index a5f37a85ce..e867455a03 100644
--- a/tests/profile/get_profile_value_test.php
+++ b/tests/profile/get_profile_value_test.php
@@ -7,21 +7,19 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions_profile_fields.php';
-
 class phpbb_profile_get_profile_value_test extends phpbb_test_case
 {
 	static public function get_profile_value_int_data()
 	{
 		return array(
-			array(FIELD_INT,	'10',	true,	10),
-			array(FIELD_INT,	'0',	true,	0),
-			array(FIELD_INT,	'',		true,	0),
-			array(FIELD_INT,	null,	true,	0),
-			array(FIELD_INT,	'10',	false,	10),
-			array(FIELD_INT,	'0',	false,	0),
-			array(FIELD_INT,	'',		false,	null),
-			array(FIELD_INT,	null,	false,	null),
+			array('\phpbb\profilefields\type\type_int',	'10',	true,	10),
+			array('\phpbb\profilefields\type\type_int',	'0',	true,	0),
+			array('\phpbb\profilefields\type\type_int',	'',		true,	0),
+			array('\phpbb\profilefields\type\type_int',	null,	true,	0),
+			array('\phpbb\profilefields\type\type_int',	'10',	false,	10),
+			array('\phpbb\profilefields\type\type_int',	'0',	false,	0),
+			array('\phpbb\profilefields\type\type_int',	'',		false,	null),
+			array('\phpbb\profilefields\type\type_int',	null,	false,	null),
 		);
 	}
 
@@ -30,13 +28,15 @@ class phpbb_profile_get_profile_value_test extends phpbb_test_case
 	*/
 	public function test_get_profile_value_int($type, $value, $show_novalue, $expected)
 	{
-		$cp = new custom_profile;
-		$this->assertSame($expected, $cp->get_profile_value(array(
-			'value'	=> $value,
-			'data'	=> array(
-				'field_type'			=> $type,
-				'field_show_novalue'	=> $show_novalue,
-			),
+		$cp = new $type(
+			$this->getMock('\phpbb\request\request'),
+			$this->getMock('\phpbb\template\template'),
+			$this->getMock('\phpbb\user')
+		);
+
+		$this->assertSame($expected, $cp->get_profile_value($value, array(
+			'field_type'			=> $type,
+			'field_show_novalue'	=> $show_novalue,
 		)));
 	}
 }