mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 19:07:27 +01:00
Code Issues Releases Wiki Activity

[ticket/13904] Fix tests again

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander 2015-06-02 13:42:58 +02:00
parent 0121e60cd7
commit ef59e0228a
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/functional/fileupload_remote_test.php
View File

@ -22,6 +22,9 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
/** @var \phpbb\files\factory */ /** @var \phpbb\files\factory */
protected $factory; protected $factory;
/** @var \phpbb\language\language */
protected $language;
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
@ -30,7 +33,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
// Global $config required by unique_id // Global $config required by unique_id
// Global $user required by fileupload::remote_upload // Global $user required by fileupload::remote_upload
global $config, $user; global $config, $user, $phpbb_root_path, $phpEx;
if (!is_array($config)) if (!is_array($config))
{ {
@ -48,6 +51,8 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem)); $container->set('files.filespec', new \phpbb\files\filespec($this->filesystem));
$this->factory = new \phpbb\files\factory($container); $this->factory = new \phpbb\files\factory($container);
$container->set('files.factory', $this->factory); $container->set('files.factory', $this->factory);
$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
} }
public function tearDown() public function tearDown()
@ -60,7 +65,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_invalid_extension() public function test_invalid_extension()
{ {
/** @var \phpbb\files\upload $upload */ /** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('') $upload->set_error_prefix('')
->set_allowed_extensions(array('jpg')) ->set_allowed_extensions(array('jpg'))
->set_max_filesize(100); ->set_max_filesize(100);
@ -71,7 +76,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_empty_file() public function test_empty_file()
{ {
/** @var \phpbb\files\upload $upload */ /** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('') $upload->set_error_prefix('')
->set_allowed_extensions(array('jpg')) ->set_allowed_extensions(array('jpg'))
->set_max_filesize(100); ->set_max_filesize(100);
@ -82,7 +87,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_successful_upload() public function test_successful_upload()
{ {
/** @var \phpbb\files\upload $upload */ /** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('') $upload->set_error_prefix('')
->set_allowed_extensions(array('gif')) ->set_allowed_extensions(array('gif'))
->set_max_filesize(1000); ->set_max_filesize(1000);
@ -94,7 +99,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_too_large() public function test_too_large()
{ {
/** @var \phpbb\files\upload $upload */ /** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('') $upload->set_error_prefix('')
->set_allowed_extensions(array('gif')) ->set_allowed_extensions(array('gif'))
->set_max_filesize(100); ->set_max_filesize(100);

25
tests/upload/fileupload_test.php
View File

@ -27,12 +27,15 @@ class phpbb_fileupload_test extends phpbb_test_case
/** @var \phpbb\files\factory */ /** @var \phpbb\files\factory */
protected $factory; protected $factory;
/** @var \phpbb\language\language */
protected $language;
protected function setUp() protected function setUp()
{ {
// Global $config required by unique_id // Global $config required by unique_id
// Global $user required by several functions dealing with translations // Global $user required by several functions dealing with translations
// Global $request required by form_upload, local_upload and is_valid // Global $request required by form_upload, local_upload and is_valid
global $config, $user, $request, $phpbb_filesystem, $phpbb_container; global $config, $user, $request, $phpbb_filesystem, $phpbb_root_path, $phpEx;
if (!is_array($config)) if (!is_array($config))
{ {
@ -49,7 +52,7 @@ class phpbb_fileupload_test extends phpbb_test_case
$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem(); $this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
$this->container = new phpbb_mock_container_builder($this->phpbb_root_path, $this->phpEx); $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
$this->container->set('files.filespec', new \phpbb\files\filespec( $this->container->set('files.filespec', new \phpbb\files\filespec(
$this->filesystem, $this->filesystem,
new \phpbb\mimetype\guesser(array( new \phpbb\mimetype\guesser(array(
@ -57,6 +60,8 @@ class phpbb_fileupload_test extends phpbb_test_case
)))); ))));
$this->factory = new \phpbb\files\factory($this->container); $this->factory = new \phpbb\files\factory($this->container);
$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
$this->path = __DIR__ . '/fixture/'; $this->path = __DIR__ . '/fixture/';
} }
@ -82,7 +87,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_common_checks_invalid_extension() public function test_common_checks_invalid_extension()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(array('png')) $upload->set_allowed_extensions(array('png'))
->set_max_filesize(100); ->set_max_filesize(100);
$file = $this->gen_valid_filespec(); $file = $this->gen_valid_filespec();
@ -92,7 +97,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_common_checks_invalid_filename() public function test_common_checks_invalid_filename()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(array('jpg')) $upload->set_allowed_extensions(array('jpg'))
->set_max_filesize(100); ->set_max_filesize(100);
$file = $this->gen_valid_filespec(); $file = $this->gen_valid_filespec();
@ -103,7 +108,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_common_checks_too_large() public function test_common_checks_too_large()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(array('jpg')) $upload->set_allowed_extensions(array('jpg'))
->set_max_filesize(100); ->set_max_filesize(100);
$file = $this->gen_valid_filespec(); $file = $this->gen_valid_filespec();
@ -114,7 +119,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_common_checks_valid_file() public function test_common_checks_valid_file()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(array('jpg')) $upload->set_allowed_extensions(array('jpg'))
->set_max_filesize(1000); ->set_max_filesize(1000);
$file = $this->gen_valid_filespec(); $file = $this->gen_valid_filespec();
@ -124,7 +129,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_local_upload() public function test_local_upload()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(array('jpg')) $upload->set_allowed_extensions(array('jpg'))
->set_max_filesize(1000); ->set_max_filesize(1000);
@ -136,7 +141,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_move_existent_file() public function test_move_existent_file()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(array('jpg')) $upload->set_allowed_extensions(array('jpg'))
->set_max_filesize(1000); ->set_max_filesize(1000);
@ -150,7 +155,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_move_existent_file_overwrite() public function test_move_existent_file_overwrite()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(array('jpg')) $upload->set_allowed_extensions(array('jpg'))
->set_max_filesize(1000); ->set_max_filesize(1000);
@ -165,7 +170,7 @@ class phpbb_fileupload_test extends phpbb_test_case
public function test_valid_dimensions() public function test_valid_dimensions()
{ {
$upload = new \phpbb\files\upload($this->filesystem, $this->factory); $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_allowed_extensions(false) $upload->set_allowed_extensions(false)
->set_max_filesize(false) ->set_max_filesize(false)
->set_allowed_dimensions(1, 1, 100, 100); ->set_allowed_dimensions(1, 1, 100, 100);