From 580cec619b399f710aedc1d3c2dd92c2287ebaff Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 8 Jul 2012 14:39:18 +0100
Subject: [ticket/10941] Added subdirectory for file operations

Also removed common.php as it was unnecessary.

PHPBB3-10941
---
 tests/upload/fileupload_test.php | 116 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 tests/upload/fileupload_test.php

(limited to 'tests/upload/fileupload_test.php')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
new file mode 100644
index 0000000000..2b3c17b8e0
--- /dev/null
+++ b/tests/upload/fileupload_test.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
+require_once __DIR__ . '/../mock/filespec.php';
+
+class phpbb_fileupload_test extends phpbb_test_case
+{
+	private $path;
+
+	protected function setUp()
+	{
+		// Global $config required by unique_id
+		// Global $user required by several functions dealing with translations
+		global $config, $user;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+
+		$user = new phpbb_mock_user();
+		$user->lang = new phpbb_mock_lang();
+		$this->path = __DIR__ . '/fixture/';
+	}
+
+	private function gen_valid_filespec()
+	{
+		$filespec = new phpbb_mock_filespec();
+		$filespec->filesize = 1;
+		$filespec->extension = 'jpg';
+		$filespec->realname = 'valid';
+		$filespec->width = 2;
+		$filespec->height = 2;
+
+		return $filespec;
+	}
+
+	protected function tearDown()
+	{
+		// Clear globals
+		global $config, $user;
+		$config = array();
+		$user = null;
+	}
+
+	public function test_common_checks_invalid_extension()
+	{
+		$upload = new fileupload('', array('png'), 100);
+		$file = $this->gen_valid_filespec();
+		$upload->common_checks($file);
+		$this->assertEquals('DISALLOWED_EXTENSION', $file->error[0]);
+	}
+
+	public function test_common_checks_invalid_filename()
+	{
+		$upload = new fileupload('', array('jpg'), 100);
+		$file = $this->gen_valid_filespec();
+		$file->realname = 'invalid?';
+		$upload->common_checks($file);
+		$this->assertEquals('INVALID_FILENAME', $file->error[0]);
+	}
+
+	public function test_common_checks_too_large()
+	{
+		$upload = new fileupload('', array('jpg'), 100);
+		$file = $this->gen_valid_filespec();
+		$file->filesize = 1000;
+		$upload->common_checks($file);
+		$this->assertEquals('WRONG_FILESIZE', $file->error[0]);
+	}
+
+	public function test_common_checks_valid_file()
+	{
+		$upload = new fileupload('', array('jpg'), 1000);
+		$file = $this->gen_valid_filespec();
+		$upload->common_checks($file);
+		$this->assertEquals(0, sizeof($file->error));
+	}
+
+	public function test_local_upload()
+	{
+		$upload = new fileupload('', array('jpg'), 1000);
+
+		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
+		$file = $upload->local_upload($this->path . 'jpg.jpg');
+		$this->assertEquals(0, sizeof($file->error));
+		unlink($this->path . 'jpg.jpg');
+	}
+
+	public function test_valid_dimensions()
+	{
+		$upload = new fileupload('', false, false, 1, 1, 100, 100);
+
+		$file1 = $this->gen_valid_filespec();
+		$file2 = $this->gen_valid_filespec();
+		$file2->height = 101;
+		$file3 = $this->gen_valid_filespec();
+		$file3->width = 0;
+
+		$this->assertTrue($upload->valid_dimensions($file1));
+		$this->assertFalse($upload->valid_dimensions($file2));
+		$this->assertFalse($upload->valid_dimensions($file3));
+	}
+}
-- 
cgit v1.2.1


From 9f3a02d4755409407a26bf75324ac0a8a15d87e2 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Mon, 9 Jul 2012 00:10:41 +0100
Subject: [ticket/10941] Removed manual includes of mock classes

Also marked a test as incomplete even though this appears to be
ignored when actually running the tests.

PHPBB3-10941
---
 tests/upload/fileupload_test.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests/upload/fileupload_test.php')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 2b3c17b8e0..076855ab56 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -10,7 +10,6 @@
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
-require_once __DIR__ . '/../mock/filespec.php';
 
 class phpbb_fileupload_test extends phpbb_test_case
 {
-- 
cgit v1.2.1