6 files changed, 250 insertions, 5 deletions
diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php
new file mode 100644
index 0000000000..6ad811e3ca
--- /dev/null
+++ b/tests/network/ftp_fsock_pasv_epsv_test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php';
+
+/**
+* @group slow
+*/
+class phpbb_network_ftp_fsock_pasv_epsv_test extends phpbb_test_case
+{
+	static protected $ipv4;
+
+	static public function setUpBeforeClass()
+	{
+		$hostname = 'ftp.debian.org.';
+		self::$ipv4 = gethostbyname($hostname);
+
+		if (self::$ipv4 == $hostname)
+		{
+			self::markTestSkipped("Got no A record back from DNS query for $hostname");
+		}
+	}
+
+	public function test_pasv()
+	{
+		// PASV
+		$this->assert_ls_contains_debian(self::$ipv4);
+	}
+
+	public function test_epsv()
+	{
+		$ipv4 = self::$ipv4;
+		// EPSV
+		$this->assert_ls_contains_debian("[::ffff:$ipv4]");
+	}
+
+	protected function assert_ls_contains_debian($hostname)
+	{
+		$o = $this->get_object($hostname);
+		$result = $o->_init();
+		// This test may fail on IPv6 addresses if IPv6 support is
+		// not available. PHP must be compiled with IPv6 support enabled,
+		// and your operating system must be configured for IPv6 as well.
+		if ($result !== true)
+		{
+			$this->markTestSkipped("Failed to connect to $hostname: $result");
+		}
+		$this->assertContains('debian', $o->_ls());
+		$o->_close();
+	}
+
+	protected function get_object($hostname)
+	{
+		return new ftp_fsock($hostname, 'anonymous', 'anonymous@localhost.tld', '/');
+	}
+}
diff --git a/tests/utf/data/.gitkeep b/tests/tmp/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/tests/utf/data/.gitkeep
+++ b/tests/tmp/.gitkeep
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index f78dba8004..a0ba470416 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -14,10 +14,13 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_normalizer.php';
 */
 class phpbb_utf_normalizer_test extends phpbb_test_case
 {
+	static private $data_dir;
+
 	static public function setUpBeforeClass()
 	{
-		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', dirname(__FILE__).'/data');
-		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', dirname(__FILE__).'/data');
+		self::$data_dir = dirname(__file__) . '/../tmp';
+		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', self::$data_dir);
+		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', self::$data_dir);
 	}
 
 	public function test_normalizer()
@@ -62,7 +65,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 
 		$tested_chars = array();
 
-		$fp = fopen(dirname(__FILE__).'/data/NormalizationTest.txt', 'rb');
+		$fp = fopen(self::$data_dir . '/NormalizationTest.txt', 'rb');
 		while (!feof($fp))
 		{
 			$line = fgets($fp);
@@ -117,7 +120,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 	*/
 	public function test_invariants(array $tested_chars)
 	{
-		$fp = fopen(dirname(__FILE__).'/data/UnicodeData.txt', 'rb');
+		$fp = fopen(self::$data_dir . '/UnicodeData.txt', 'rb');
 
 		while (!feof($fp))
 		{
diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php
new file mode 100644
index 0000000000..0b4c3378a9
--- /dev/null
+++ b/tests/wrapper/gmgetdate_test.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_wrapper_gmgetdate_test extends phpbb_test_case
+{
+	public function test_gmgetdate()
+	{
+		$this->run_gmgetdate_assertion();
+		$this->run_test_with_timezone('UTC');
+		$this->run_test_with_timezone('Europe/Berlin');
+		$this->run_test_with_timezone('America/Los_Angeles');
+		$this->run_test_with_timezone('Antarctica/South_Pole');
+	}
+
+	protected function run_test_with_timezone($timezone_identifier)
+	{
+		$current_timezone = date_default_timezone_get();
+
+		date_default_timezone_set($timezone_identifier);
+		$this->run_gmgetdate_assertion();
+		date_default_timezone_set($current_timezone);
+	}
+
+	protected function run_gmgetdate_assertion()
+	{
+		$expected = time();
+
+		$date_array = phpbb_gmgetdate($expected);
+
+		$actual = gmmktime(
+			$date_array['hours'],
+			$date_array['minutes'],
+			$date_array['seconds'],
+			$date_array['mon'],
+			$date_array['mday'],
+			$date_array['year']
+		);
+
+		$this->assertEquals($expected, $actual);
+	}
+}
diff --git a/tests/random/mt_rand.php b/tests/wrapper/mt_rand_test.php
index d6502c4e80..c8bcb3d14c 100644
--- a/tests/random/mt_rand.php
+++ b/tests/wrapper/mt_rand_test.php
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
-class phpbb_random_mt_rand_test extends phpbb_test_case
+class phpbb_wrapper_mt_rand_test extends phpbb_test_case
 {
 	public function test_max_equals_min()
 	{
diff --git a/tests/wrapper/version_compare_test.php b/tests/wrapper/version_compare_test.php
new file mode 100644
index 0000000000..f718cfd16b
--- /dev/null
+++ b/tests/wrapper/version_compare_test.php
@@ -0,0 +1,130 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_wrapper_version_compare_test extends phpbb_test_case
+{
+	public function test_two_parameters()
+	{
+		$this->assertEquals(-1, phpbb_version_compare('1.0.0', '1.0.1'));
+		$this->assertEquals(0, phpbb_version_compare('1.0.0', '1.0.0'));
+		$this->assertEquals(1, phpbb_version_compare('1.0.1', '1.0.0'));
+	}
+	
+	public function test_three_parameters()
+	{
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.1', '<'));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '<='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '>='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.1', '1.0.0', '>'));
+	}
+
+	public function test_strict_order()
+	{
+		$releases = array(
+			'2.0.0',
+			'2.0.1',
+			// Those are not version_compare() compatible
+			//'2.0.6a',
+			//'2.0.6b',
+			//'2.0.6c',
+			//'2.0.6d',
+			'2.0.7',
+			'2.0.23',
+			'3.0.A1',
+			'3.0.A2',
+			'3.0.A3',
+			'3.0.B1',
+			'3.0.B2',
+			'3.0.B4',
+			'3.0.B5',
+			'3.0.RC1',
+			'3.0.RC5',
+			'3.0.0',
+			'3.0.1',
+			'3.0.2',
+			'3.0.7',
+			'3.0.7-PL1',
+			'3.0.8-RC1',
+			'3.0.8',
+			'3.0.9-dev',
+			'3.0.9-RC1',
+			'3.0.9-RC2',
+			'3.0.9-RC4',
+			'3.0.10-RC1',
+			'3.1-dev',
+			'3.2-A1',
+		);
+
+		for ($i = 0, $size = sizeof($releases); $i < $size - 1; ++$i)
+		{
+			$version1 = $releases[$i];
+			$version2 = $releases[$i + 1];
+
+			$this->assertEquals(
+				true,
+				phpbb_version_compare($version1, $version2, '<'),
+				"Result of version comparison $version1 < $version2 is incorrect."
+			);
+		}
+	}
+
+	/**
+	* @dataProvider equality_test_data
+	*/
+	public function test_equality($version1, $version2)
+	{
+		$this->assertEquals(
+			0,
+			phpbb_version_compare($version1, $version2),
+			"Result of version comparison $version1 = $version2 is incorrect."
+		);
+
+		$this->assertEquals(
+			true,
+			phpbb_version_compare($version1, $version2, '='),
+			"Result of version comparison $version1 = $version2 is incorrect."
+		);
+	}
+
+	public function equality_test_data()
+	{
+		return array(
+			array('1.1.0-A2', '1.1.0-a2'),
+			array('1.1.0-B1', '1.1.0-b1'),
+		);
+	}
+
+	/**
+	* @dataProvider alpha_beta_test_data
+	*/
+	public function test_alpha_beta($expected, $version1, $version2)
+	{
+		$this->assertEquals(
+			$expected,
+			phpbb_version_compare($version1, $version2),
+			"Result of version comparison ($version1, $version2) = $expected is incorrect."
+		);
+		
+	}
+
+	public function alpha_beta_test_data()
+	{
+		return array(
+			array(-1, '1.1.0-A2', '1.1.0-B1'),
+			array(-1, '1.1.0-a2', '1.1.0-b1'),
+
+			array(-1, '1.1.0-a2', '1.1.0-B1'),
+			array(-1, '1.1.0-A2', '1.1.0-b1'),
+		);
+	}
+
+}