13 files changed, 269 insertions, 1 deletions
diff --git a/tests/compress/archive/.gitkeep b/tests/compress/archive/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/compress/archive/.gitkeep
diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
new file mode 100644
index 0000000000..65094671e3
--- /dev/null
+++ b/tests/compress/compress_test.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compress.php';
+
+class phpbb_compress_test extends phpbb_test_case
+{
+	const EXTRACT_DIR = '/extract/';
+	const ARCHIVE_DIR = '/archive/';
+
+	private $path;
+
+	protected $filelist = array(
+		'1.txt',
+		'dir/2.txt',
+		'dir/3.txt',
+		'dir/subdir/4.txt',
+	);
+
+	protected function setUp()
+	{
+		// Required for compress::add_file
+		global $phpbb_root_path;
+		$phpbb_root_path = '';
+
+		$this->path = dirname(__FILE__) . '/fixtures/';
+
+		if (!@extension_loaded('zlib') || !@extension_loaded('bz2'))
+		{
+			$this->markTestSkipped('PHP needs to be compiled with --with-zlib and --with-bz2 in order to run these tests');
+		}
+	}
+
+	protected function tearDown()
+	{
+		foreach (array(dirname(__FILE__) . self::EXTRACT_DIR, dirname(__FILE__) . self::ARCHIVE_DIR) as $dir)
+		{
+			$this->clear_dir($dir);
+		}
+	}
+
+	protected function clear_dir($dir)
+	{
+		$iterator = new DirectoryIterator($dir);
+		foreach ($iterator as $fileinfo)
+		{
+			$name = $fileinfo->getFilename();
+			$path = $fileinfo->getPathname();
+
+			if ($name[0] !== '.')
+			{
+				if ($fileinfo->isDir())
+				{
+					$this->clear_dir($path);
+					rmdir($path);
+				}
+				else
+				{
+					unlink($path);
+				}
+			}
+		}
+	}
+
+	protected function archive_files($compress)
+	{
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file(
+			'tests/compress/fixtures/dir/',
+			'tests/compress/fixtures/',
+			'',
+			// The comma here is not an error, this is a comma-separated list
+			'subdir/4.txt,3.txt'
+		);
+		$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');
+		$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt');
+	}
+
+	protected function valid_extraction($extra = array())
+	{
+		$filelist = array_merge($this->filelist, $extra);
+
+		foreach ($filelist as $filename)
+		{
+			$path = dirname(__FILE__) . self::EXTRACT_DIR . $filename;
+			$this->assertTrue(file_exists($path));
+
+			// Check the file's contents is correct
+			$contents = explode('_', basename($filename, '.txt'));
+			$contents = $contents[0];
+			$this->assertEquals($contents . "\n", file_get_contents($path));
+		}
+	}
+
+	public function tar_archive_list()
+	{
+		return array(
+			array('archive.tar', '.tar'),
+			array('archive.tar.gz', '.tar.gz'),
+			array('archive.tar.bz2', '.tar.bz2'),
+		);
+	}
+
+	/**
+	 * @dataProvider tar_archive_list
+	 */
+	public function test_extract_tar($filename, $type)
+	{
+		$compress = new compress_tar('r', $this->path . $filename);
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	public function test_extract_zip()
+	{
+		$compress = new compress_zip('r', $this->path . 'archive.zip');
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	/**
+	 * @depends test_extract_tar
+	 * @dataProvider tar_archive_list
+	 */
+	public function test_compress_tar($filename, $type)
+	{
+		$tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename;
+		$compress = new compress_tar('w', $tar);
+		$this->archive_files($compress);
+		$compress->close();
+		$this->assertTrue(file_exists($tar));
+
+		$compress->mode = 'r';
+		$compress->open();
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	/**
+	 * @depends test_extract_zip
+	 */
+	public function test_compress_zip()
+	{
+		$zip =  dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip';
+		$compress = new compress_zip('w', $zip);
+		$this->archive_files($compress);
+		$compress->close();
+		$this->assertTrue(file_exists($zip));
+
+		$compress = new compress_zip('r', $zip);
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+}
diff --git a/tests/compress/extract/.gitkeep b/tests/compress/extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/compress/extract/.gitkeep
diff --git a/tests/compress/fixtures/1.txt b/tests/compress/fixtures/1.txt
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/compress/fixtures/1.txt
@@ -0,0 +1 @@
+1
diff --git a/tests/compress/fixtures/archive.tar b/tests/compress/fixtures/archive.tar
new file mode 100644
index 0000000000..54ed56084e
--- /dev/null
+++ b/tests/compress/fixtures/archive.tar
diff --git a/tests/compress/fixtures/archive.tar.bz2 b/tests/compress/fixtures/archive.tar.bz2
new file mode 100644
index 0000000000..04c0eccd74
--- /dev/null
+++ b/tests/compress/fixtures/archive.tar.bz2
diff --git a/tests/compress/fixtures/archive.tar.gz b/tests/compress/fixtures/archive.tar.gz
new file mode 100644
index 0000000000..195e7a060a
--- /dev/null
+++ b/tests/compress/fixtures/archive.tar.gz
diff --git a/tests/compress/fixtures/archive.zip b/tests/compress/fixtures/archive.zip
new file mode 100644
index 0000000000..bdb618fc26
--- /dev/null
+++ b/tests/compress/fixtures/archive.zip
diff --git a/tests/compress/fixtures/dir/2.txt b/tests/compress/fixtures/dir/2.txt
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/compress/fixtures/dir/2.txt
@@ -0,0 +1 @@
+2
diff --git a/tests/compress/fixtures/dir/3.txt b/tests/compress/fixtures/dir/3.txt
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/compress/fixtures/dir/3.txt
@@ -0,0 +1 @@
+3
diff --git a/tests/compress/fixtures/dir/subdir/4.txt b/tests/compress/fixtures/dir/subdir/4.txt
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/compress/fixtures/dir/subdir/4.txt
@@ -0,0 +1 @@
+4
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
new file mode 100644
index 0000000000..f54a3591b2
--- /dev/null
+++ b/tests/functional/posting_test.php
@@ -0,0 +1,102 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_posting_test extends phpbb_functional_test_case
+{
+	public function test_post_new_topic()
+	{
+		$this->login();
+		$this->add_lang('posting');
+
+		$crawler = $this->request('GET', 'posting.php?mode=post&f=2&sid=' . $this->sid);
+		$this->assertContains($this->lang('POST_TOPIC'), $crawler->filter('html')->text());
+
+		$hidden_fields = array();
+		$hidden_fields[] = $crawler->filter('[type="hidden"]')->each(function ($node, $i) {
+			return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
+		});
+
+		$test_message = 'This is a test topic posted by the testing framework.';
+		$form_data = array(
+			'subject'		=> 'Test Topic 1',
+			'message'		=> $test_message,
+			'post'			=> true,
+			'f'				=> 2,
+			'mode'			=> 'post',
+			'sid'			=> $this->sid,
+		);
+
+		foreach ($hidden_fields as $fields)
+		{
+			foreach($fields as $field)
+			{
+				$form_data[$field['name']] = $field['value'];
+			}
+		}
+
+		// Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened)
+		// is not at least 2 seconds before submission, cancel the form
+		$form_data['lastclick'] = 0;
+
+		// I use a request because the form submission method does not allow you to send data that is not
+		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
+		// Instead, I send it as a request with the submit button "post" set to true.
+		$crawler = $this->client->request('POST', 'posting.php', $form_data);
+		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
+
+		$crawler = $this->request('GET', 'viewtopic.php?t=2&sid=' . $this->sid);
+		$this->assertContains($test_message, $crawler->filter('html')->text());
+	}
+
+	public function test_post_reply()
+	{
+		$this->login();
+		$this->add_lang('posting');
+
+		$crawler = $this->request('GET', 'posting.php?mode=reply&t=2&f=2&sid=' . $this->sid);
+		$this->assertContains($this->lang('POST_REPLY'), $crawler->filter('html')->text());
+
+		$hidden_fields = array();
+		$hidden_fields[] = $crawler->filter('[type="hidden"]')->each(function ($node, $i) {
+			return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
+		});
+
+		$test_message = 'This is a test post posted by the testing framework.';
+		$form_data = array(
+			'subject'		=> 'Re: Test Topic 1',
+			'message'		=> $test_message,
+			'post'			=> true,
+			't'				=> 2,
+			'f'				=> 2,
+			'mode'			=> 'reply',
+			'sid'			=> $this->sid,
+		);
+
+		foreach ($hidden_fields as $fields)
+		{
+			foreach($fields as $field)
+			{
+				$form_data[$field['name']] = $field['value'];
+			}
+		}
+
+		// For reasoning behind the following command, see the test_post_new_topic() test
+		$form_data['lastclick'] = 0;
+
+		// Submit the post
+		$crawler = $this->client->request('POST', 'posting.php', $form_data);
+		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
+
+		$crawler = $this->request('GET', 'viewtopic.php?t=2&sid=' . $this->sid);
+		$this->assertContains($test_message, $crawler->filter('html')->text());
+	}
+}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 2423299b7c..d35913e415 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -140,7 +140,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->do_request('create_table', $data);
 
 		$this->do_request('config_file', $data);
-		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true));
+		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true));
 
 		$this->do_request('final', $data);
 		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");