5 files changed, 108 insertions, 76 deletions
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index e480716a49..b7074552ba 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -233,6 +233,66 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
+	public function not_like_expression_data()
+	{
+		// * = any_char; # = one_char
+		return array(
+			array('barfoo', array(
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie')
+			)),
+			array('bar', array(
+				array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'),
+			)),
+			array('bar*', array(
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))
+			),
+			array('*bar*', array(array('username_clean' => 'bertie'))),
+			array('b*r', array(
+				array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie')
+			)),
+			array('b*e', array(
+				array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar')
+			)),
+			array('#b*e', array(
+				array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie')
+			)),
+			array('b####e', array(
+				array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar')
+			)),
+		);
+	}
+
+	/**
+	* @dataProvider not_like_expression_data
+	*/
+	public function test_not_like_expression($like_expression, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$like_expression = str_replace('*', $db->get_any_char(), $like_expression);
+		$like_expression = str_replace('#', $db->get_one_char(), $like_expression);
+		$where = ($like_expression) ? 'username_clean ' . $db->sql_not_like_expression($like_expression) : '';
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
 	public function in_set_data()
 	{
 		return array(
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 559c0b122c..4ae6017989 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -191,6 +191,10 @@ namespace phpbb\db\driver
 		{
 		}
 
+		function sql_not_like_expression($expression)
+		{
+		}
+
 		function sql_fetchrowset($query_id = false)
 		{
 			return array(
diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php
index 6a6df14c81..4e4995c21e 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php
@@ -80,20 +80,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 			'attachments' => true,
 		));
 
-		// Download topic archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
@@ -147,18 +133,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		));
 		$this->add_lang('viewtopic');
 
-		// Download topic archive as guest: still works
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// No download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
 		// No download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
@@ -167,20 +141,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		// Login as admin and try again, should work now.
 		$this->login();
 
-		// Download topic archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as admin
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
@@ -235,16 +195,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		));
 		$this->add_lang('viewtopic');
 
-		// Download topic archive as guest: still works
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
-		// No download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
 		// No download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
@@ -253,20 +203,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		// Login as admin and try again, should work now.
 		$this->login();
 
-		// Download topic archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as admin
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
diff --git a/tests/profilefields/type_googleplus_test.php b/tests/profilefields/type_googleplus_test.php
index fdbdd86553..3e0af36a73 100644
--- a/tests/profilefields/type_googleplus_test.php
+++ b/tests/profilefields/type_googleplus_test.php
@@ -11,8 +11,27 @@
 *
 */
 
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+
 class phpbb_profilefield_type_googleplus_test extends phpbb_test_case
 {
+	protected  $field;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$user = new \phpbb\user();
+		$user->add_lang('ucp');
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
+
+		$this->field = new \phpbb\profilefields\type\type_googleplus(
+			$request,
+			$template,
+			$user
+		);
+	}
 	public function get_profile_contact_value_data()
 	{
 		return array(
@@ -36,16 +55,6 @@ class phpbb_profilefield_type_googleplus_test extends phpbb_test_case
 	*/
 	public function test_get_profile_contact_value($value, $field_options, $expected, $description)
 	{
-		$user = $this->getMock('\phpbb\user');
-		$request = $this->getMock('\phpbb\request\request');
-		$template = $this->getMock('\phpbb\template\template');
-
-		$field = new \phpbb\profilefields\type\type_googleplus(
-			$request,
-			$template,
-			$user
-		);
-
 		$default_field_options = array(
 			'field_type'       => '\phpbb\profilefields\type\type_googleplus',
 			'field_name' 	   => 'field',
@@ -57,6 +66,29 @@ class phpbb_profilefield_type_googleplus_test extends phpbb_test_case
 		);
 		$field_options = array_merge($default_field_options, $field_options);
 
-		$this->assertSame($expected, $field->get_profile_contact_value($value, $field_options), $description);
+		$this->assertSame($expected, $this->field->get_profile_contact_value($value, $field_options), $description);
+	}
+
+	public function data_validate_googleplus()
+	{
+		return array(
+			array('foobar', false),
+			array('2342340929304', false),
+			array('foo<bar', 'The field “googleplus” has invalid characters.'),
+			array('klkd.klkl', false),
+			array('kl+', 'The field “googleplus” has invalid characters.'),
+			array('foo=bar', 'The field “googleplus” has invalid characters.'),
+			array('..foo', 'The field “googleplus” has invalid characters.'),
+			array('foo..bar', 'The field “googleplus” has invalid characters.'),
+		);
+	}
+
+	/**
+	* @dataProvider data_validate_googleplus
+	*/
+	public function test_validate_googleplus($input, $expected)
+	{
+		$field_data = array_merge(array('lang_name' => 'googleplus'), $this->field->get_default_option_values());
+		$this->assertSame($expected, $this->field->validate_string_profile_field('string', $input, $field_data));
 	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 80e6293ff9..c131754d23 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -294,7 +294,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		$parseURL = parse_url(self::$config['phpbb_functional_url']);
 
-		$crawler = self::request('GET', 'install/index.php?mode=install');
+		$crawler = self::request('GET', 'install/index.php?mode=install&language=en');
 		self::assertContains('Welcome to Installation', $crawler->filter('#main')->text());
 		$form = $crawler->selectButton('submit')->form();