2 files changed, 64 insertions, 0 deletions
diff --git a/tests/functional/ucp_profile_test.php b/tests/functional/ucp_profile_test.php
index 2d68704162..e7abba9255 100644
--- a/tests/functional/ucp_profile_test.php
+++ b/tests/functional/ucp_profile_test.php
@@ -26,6 +26,7 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
 
 		$form = $crawler->selectButton('Submit')->form(array(
 			'pf_phpbb_facebook'	=> 'phpbb',
+			'pf_phpbb_googleplus' => 'phpbb',
 			'pf_phpbb_location'	=> 'Bertie´s Empire',
 			'pf_phpbb_skype'	=> 'phpbb.skype.account',
 			'pf_phpbb_twitter'	=> 'phpbb_twitter',
@@ -39,6 +40,7 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
 		$form = $crawler->selectButton('Submit')->form();
 
 		$this->assertEquals('phpbb', $form->get('pf_phpbb_facebook')->getValue());
+		$this->assertEquals('phpbb', $form->get('pf_phpbb_googleplus')->getValue());
 		$this->assertEquals('Bertie´s Empire', $form->get('pf_phpbb_location')->getValue());
 		$this->assertEquals('phpbb.skype.account', $form->get('pf_phpbb_skype')->getValue());
 		$this->assertEquals('phpbb_twitter', $form->get('pf_phpbb_twitter')->getValue());
diff --git a/tests/profilefields/type_googleplus_test.php b/tests/profilefields/type_googleplus_test.php
new file mode 100644
index 0000000000..fdbdd86553
--- /dev/null
+++ b/tests/profilefields/type_googleplus_test.php
@@ -0,0 +1,62 @@
+<?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_profilefield_type_googleplus_test extends phpbb_test_case
+{
+	public function get_profile_contact_value_data()
+	{
+		return array(
+			array(
+				'112010191010100',
+				array(),
+				'112010191010100',
+				'Field should return a numerical Google+ ID as is',
+			),
+			array(
+				'TestUsername',
+				array(),
+				'+TestUsername',
+				'Field should return a string Google+ ID with a + prefixed',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider get_profile_contact_value_data
+	*/
+	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',
+			'field_id'	 	   => 1,
+			'lang_id'	 	   => 1,
+			'lang_name'        => 'field',
+			'field_required'   => false,
+			'field_validation' => '[\w]+',
+		);
+		$field_options = array_merge($default_field_options, $field_options);
+
+		$this->assertSame($expected, $field->get_profile_contact_value($value, $field_options), $description);
+	}
+}