3 files changed, 571 insertions, 0 deletions
diff --git a/tests/version/version_fetch_test.php b/tests/version/version_fetch_test.php
new file mode 100644
index 0000000000..cfc87183cf
--- /dev/null
+++ b/tests/version/version_fetch_test.php
@@ -0,0 +1,63 @@
+<?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.
+*
+*/
+
+/*
+* @group slow
+*/
+class phpbb_version_helper_fetch_test extends phpbb_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		$this->cache = $this->getMockBuilder('\phpbb\cache\service')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->version_helper = new \phpbb\version_helper(
+			$this->cache,
+			new \phpbb\config\config(array(
+				'version'	=> '3.1.0',
+			)),
+			new \phpbb\file_downloader(),
+			new \phpbb\user('\phpbb\datetime')
+		);
+	}
+
+	public function test_version_phpbb_com()
+	{
+		global $phpbb_root_path, $phpEx;
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		if (!phpbb_checkdnsrr('version.phpbb.com', 'A'))
+		{
+			$this->markTestSkipped(sprintf(
+				'Could not find a DNS record for hostname %s. ' .
+				'Assuming network is down.',
+				'version.phpbb.com'
+			));
+		}
+
+		$this->version_helper->get_versions();
+
+		// get_versions checks to make sure we got a valid versions file or
+		// throws an exception if we did not. We don't need to test anything
+		// here, but adding an assertion so we do not get a warning about no
+		// assertions in this test
+		$this->assertSame(true, true);
+	}
+}
diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php
new file mode 100644
index 0000000000..65ae7646b9
--- /dev/null
+++ b/tests/version/version_helper_remote_test.php
@@ -0,0 +1,173 @@
+<?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 version_helper_remote_test extends \phpbb_test_case
+{
+	protected $file_downloader;
+	protected $cache;
+	protected $version_helper;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		$config = new \phpbb\config\config(array(
+			'version'	=> '3.1.0',
+		));
+		$container = new \phpbb_mock_container_builder();
+		$db = new \phpbb\db\driver\factory($container);
+		$this->cache = $this->getMock('\phpbb\cache\service', array('get'), array(new \phpbb\cache\driver\null(), $config, $db, '../../', 'php'));
+		$this->cache->expects($this->any())
+			->method('get')
+			->with($this->anything())
+			->will($this->returnValue(false));
+		$this->file_downloader = new phpbb_mock_file_downloader();
+
+		$this->version_helper = new \phpbb\version_helper(
+			$this->cache,
+			$config,
+			$this->file_downloader,
+			new \phpbb\user('\phpbb\datetime')
+		);
+		$this->user = new \phpbb\user('\phpbb\datetime');
+		$this->user->add_lang('acp/common');
+	}
+
+	public function provider_get_versions()
+	{
+		return array(
+			array('', false),
+			array('foobar', false),
+			array('{
+    "stable": {
+        "1.0": {
+            "current": "1.0.1",
+            "download": "https://www.phpbb.com/customise/db/download/104136",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/",
+            "eol": null,
+            "security": false
+        }
+    }
+}', true, array (
+				'stable' => array (
+					'1.0' => array (
+						'current' => '1.0.1',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/',
+						'eol' => NULL,
+						'security' => false,
+					),
+				),
+				'unstable' => array (
+					'1.0' => array (
+						'current' => '1.0.1',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/',
+						'eol' => NULL,
+						'security' => false,
+					),
+				),
+			)),
+			array('{
+    "foobar": {
+        "1.0": {
+            "current": "1.0.1",
+            "download": "https://www.phpbb.com/customise/db/download/104136",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/",
+            "eol": null,
+            "security": false
+        }
+    }
+}', false),
+			array('{
+    "stable": {
+        "1.0": {
+            "current": "1.0.1<script>alert(\'foo\');</script>",
+            "download": "https://www.phpbb.com/customise/db/download/104136<script>alert(\'foo\');</script>",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/<script>alert(\'foo\');</script>",
+            "eol": "<script>alert(\'foo\');</script>",
+            "security": "<script>alert(\'foo\');</script>"
+        }
+    }
+}', true, array (
+				'stable' => array (
+					'1.0' => array (
+						'current' => '1.0.1&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'eol' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'security' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+					),
+				),
+				'unstable' => array (
+					'1.0' => array (
+						'current' => '1.0.1&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'eol' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'security' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+					),
+				),
+			)),
+			array('{
+    "unstable": {
+        "1.0": {
+            "current": "1.0.1<script>alert(\'foo\');</script>",
+            "download": "https://www.phpbb.com/customise/db/download/104136<script>alert(\'foo\');</script>",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/<script>alert(\'foo\');</script>",
+            "eol": "<script>alert(\'foo\');</script>",
+            "security": "<script>alert(\'foo\');</script>"
+        }
+    }
+}', true, array (
+				'unstable' => array (
+					'1.0' => array (
+						'current' => '1.0.1&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'eol' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'security' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+					),
+				),
+				'stable' => array(),
+			)),
+		);
+	}
+
+	/**
+	 * @dataProvider provider_get_versions
+	 */
+	public function test_get_versions($input, $valid_data, $expected_return = '')
+	{
+		$this->file_downloader->set($input);
+
+		if (!$valid_data)
+		{
+			try {
+				$return = $this->version_helper->get_versions();
+			} catch (\RuntimeException $e) {
+				$this->assertEquals((string)$e->getMessage(), $this->user->lang('VERSIONCHECK_FAIL'));
+			}
+		}
+		else
+		{
+			$return = $this->version_helper->get_versions();
+		}
+
+		$this->assertEquals($expected_return, $return);
+	}
+}
diff --git a/tests/version/version_test.php b/tests/version/version_test.php
new file mode 100644
index 0000000000..528f1602d6
--- /dev/null
+++ b/tests/version/version_test.php
@@ -0,0 +1,335 @@
+<?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_version_helper_test extends phpbb_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		$this->cache = $this->getMockBuilder('\phpbb\cache\service')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->version_helper = new \phpbb\version_helper(
+			$this->cache,
+			new \phpbb\config\config(array(
+				'version'	=> '3.1.0',
+			)),
+			new \phpbb\file_downloader(),
+			new \phpbb\user('\phpbb\datetime')
+		);
+	}
+
+	public function is_stable_data()
+	{
+		return array(
+			array(
+				'3.0.0-a1',
+				false,
+			),
+			array(
+				'3.0.0-b1',
+				false,
+			),
+			array(
+				'3.0.0-rc1',
+				false,
+			),
+			array(
+				'3.0.0-RC1',
+				false,
+			),
+			array(
+				'3.0.0',
+				true,
+			),
+			array(
+				'3.0.0-pl1',
+				true,
+			),
+			array(
+				'3.0.0.1-pl1',
+				true,
+			),
+			array(
+				'3.1-dev',
+				false,
+			),
+			array(
+				'foobar',
+				false,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider is_stable_data
+	*/
+	public function test_is_stable($version, $expected)
+	{
+		$this->assertSame($expected, $this->version_helper->is_stable($version));
+	}
+
+	public function get_suggested_updates_data()
+	{
+		return array(
+			array(
+				'1.0.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+			),
+			array(
+				'1.0.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+			),
+			array(
+				'1.0.1-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1-a2',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0',
+					),
+				),
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1-a2',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0',
+					),
+				),
+			),
+			array(
+				'1.1.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+			),
+			array(
+				'1.1.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			array(
+				'1.1.0-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0-a2',
+					),
+				),
+				array(
+					'1.1'	=> array(
+						'current'		=> '1.1.0-a2',
+					),
+				),
+			),
+			array(
+				'1.1.0',
+				array(),
+				array(),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider get_suggested_updates_data
+	*/
+	public function test_get_suggested_updates($current_version, $versions, $expected)
+	{
+		$version_helper = $this
+			->getMockBuilder('\phpbb\version_helper')
+			->setMethods(array(
+				'get_versions_matching_stability',
+			))
+			->setConstructorArgs(array(
+				$this->cache,
+				new \phpbb\config\config(array(
+					'version'	=> $current_version,
+				)),
+				new \phpbb\file_downloader(),
+				new \phpbb\user('\phpbb\datetime'),
+			))
+			->getMock()
+		;
+
+		$version_helper->expects($this->any())
+			->method('get_versions_matching_stability')
+			->will($this->returnValue($versions));
+
+		$this->assertSame($expected, $version_helper->get_suggested_updates());
+	}
+
+	public function get_latest_on_current_branch_data()
+	{
+		return array(
+			array(
+				'1.0.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.0.1',
+			),
+			array(
+				'1.0.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.0.1',
+			),
+			array(
+				'1.0.1-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1-a2',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0',
+					),
+				),
+				'1.0.1-a2',
+			),
+			array(
+				'1.1.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.1.1',
+			),
+			array(
+				'1.1.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.1.1',
+			),
+			array(
+				'1.1.0-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0-a2',
+					),
+				),
+				'1.1.0-a2',
+			),
+			array(
+				'1.1.0',
+				array(),
+				null,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider get_latest_on_current_branch_data
+	*/
+	public function test_get_latest_on_current_branch($current_version, $versions, $expected)
+	{
+		$version_helper = $this
+			->getMockBuilder('\phpbb\version_helper')
+			->setMethods(array(
+				'get_versions_matching_stability',
+			))
+			->setConstructorArgs(array(
+				$this->cache,
+				new \phpbb\config\config(array(
+					'version'	=> $current_version,
+				)),
+				new \phpbb\file_downloader(),
+				new \phpbb\user('\phpbb\datetime'),
+			))
+			->getMock()
+		;
+
+		$version_helper->expects($this->any())
+			->method('get_versions_matching_stability')
+			->will($this->returnValue($versions));
+
+		$this->assertSame($expected, $version_helper->get_latest_on_current_branch());
+	}
+}