7 files changed, 49 insertions, 25 deletions
diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php
index ac5377f2f6..23d6910843 100644
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -193,12 +193,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			'user_sig' => '',
 			'user_sig_bbcode_uid' => '',
 			'user_sig_bbcode_bitfield' => '',
-			'user_icq' => '',
-			'user_aim' => '',
-			'user_yim' => '',
-			'user_msnm' => '',
 			'user_jabber' => '',
-			'user_website' => '',
 			'user_actkey' => '',
 			'user_newpasswd' => '',
 			'user_form_salt' => '',
diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php
index 7af8051417..52a7b14f40 100644
--- a/tests/functional/search/mysql_test.php
+++ b/tests/functional/search/mysql_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_mysql_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_mysql';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('MySQL search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php
index ce568df616..512c6f2830 100644
--- a/tests/functional/search/native_test.php
+++ b/tests/functional/search/native_test.php
@@ -15,9 +15,4 @@ require_once dirname(__FILE__) . '/base.php';
 class phpbb_functional_search_native_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_native';
-
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Native search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php
index 487b8aeebb..974b417659 100644
--- a/tests/functional/search/postgres_test.php
+++ b/tests/functional/search/postgres_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_postgres_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_postgres';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Postgres search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/profile/get_profile_value_test.php b/tests/profile/get_profile_value_test.php
new file mode 100644
index 0000000000..e867455a03
--- /dev/null
+++ b/tests/profile/get_profile_value_test.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_profile_get_profile_value_test extends phpbb_test_case
+{
+	static public function get_profile_value_int_data()
+	{
+		return array(
+			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),
+		);
+	}
+
+	/**
+	* @dataProvider get_profile_value_int_data
+	*/
+	public function test_get_profile_value_int($type, $value, $show_novalue, $expected)
+	{
+		$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,
+		)));
+	}
+}
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index 18c6df2445..4911160cc0 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -106,17 +106,17 @@ class phpbb_search_native_test extends phpbb_search_test_case
 			array(
 				'-foo',
 				'all',
-				false,
-				null,
-				null,
+				true,
+				array(),
+				array(1),
 				array(),
 			),
 			array(
 				'-foo -bar',
 				'all',
-				false,
-				null,
-				null,
+				true,
+				array(),
+				array(1, 2),
 				array(),
 			),
 			// all common
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
index bc1bebd87a..32aa234316 100644
--- a/tests/security/hash_test.php
+++ b/tests/security/hash_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compatibility.php';
 
 class phpbb_security_hash_test extends phpbb_test_case
 {