makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10941] Re-arranged dataProvidor methods to be near their callers

Browse source 
PHPBB3-10941
This commit is contained in:
Fyorl 2012-07-02 22:55:15 +01:00
parent 59a7b10f14
commit 943af957e6
1 changed files with 67 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
tests/uploads/filespec_test.php
View file

@ -59,50 +59,6 @@ class phpbb_filespec_test extends phpbb_test_case
} }
} }
public function additional_checks_variables()
{
return array(
array('gif', true),
array('jpg', false),
array('png', true),
array('tif', false),
array('txt', true),
);
}
public function check_content_variables()
{
return array(
array('gif', true),
array('jpg', true),
array('png', true),
array('tif', true),
array('txt', false),
);
}
public function clean_filename_variables()
{
$chunks = str_split('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\'\\" /:*?<>|[];(){},#+=-_`', 8);
return array(
array($chunks[0] . $chunks[7]),
array($chunks[1] . $chunks[8]),
array($chunks[2] . $chunks[9]),
array($chunks[3] . $chunks[4]),
array($chunks[5] . $chunks[6]),
);
}
public function get_extension_variables()
{
return array(
array('file.png', 'png'),
array('file.phpbb.gif', 'gif'),
array('file..', ''),
array('.file..jpg.webp', 'webp'),
);
}
private function init_filespec($override = array()) private function init_filespec($override = array())
{ {
// Initialise a blank filespec object for use with trivial methods // Initialise a blank filespec object for use with trivial methods
@ -117,29 +73,6 @@ class phpbb_filespec_test extends phpbb_test_case
$this->filespec = new filespec(array_merge($upload_ary, $override), null); $this->filespec = new filespec(array_merge($upload_ary, $override), null);
} }
public function is_image_variables()
{
return array(
array('gif', 'image/gif', true),
array('jpg', 'image/jpg', true),
array('png', 'image/png', true),
array('tif', 'image/tif', true),
array('txt', 'text/plain', false),
);
}
public function move_file_variables()
{
return array(
array('gif_copy', 'gif_moved', 'image/gif', 'gif', false, true),
array('non_existant', 'still_non_existant', 'text/plain', 'txt', true, false),
array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', true, true),
array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true),
array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true),
array('png_copy', 'png_moved', 'image/png', 'jpg', true, true),
);
}
protected function tearDown() protected function tearDown()
{ {
$files = array( $files = array(
@ -168,6 +101,17 @@ class phpbb_filespec_test extends phpbb_test_case
$this->config = array(); $this->config = array();
} }
public function additional_checks_variables()
{
return array(
array('gif', true),
array('jpg', false),
array('png', true),
array('tif', false),
array('txt', true),
);
}
/** /**
* @dataProvider additional_checks_variables * @dataProvider additional_checks_variables
*/ */
@ -188,6 +132,17 @@ class phpbb_filespec_test extends phpbb_test_case
$user = null; $user = null;
} }
public function check_content_variables()
{
return array(
array('gif', true),
array('jpg', true),
array('png', true),
array('tif', true),
array('txt', false),
);
}
/** /**
* @dataProvider check_content_variables * @dataProvider check_content_variables
*/ */
@ -198,6 +153,18 @@ class phpbb_filespec_test extends phpbb_test_case
$this->assertEquals($expected, $this->filespec->check_content($disallowed_content)); $this->assertEquals($expected, $this->filespec->check_content($disallowed_content));
} }
public function clean_filename_variables()
{
$chunks = str_split('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\'\\" /:*?<>|[];(){},#+=-_`', 8);
return array(
array($chunks[0] . $chunks[7]),
array($chunks[1] . $chunks[8]),
array($chunks[2] . $chunks[9]),
array($chunks[3] . $chunks[4]),
array($chunks[5] . $chunks[6]),
);
}
/** /**
* @dataProvider clean_filename_variables * @dataProvider clean_filename_variables
*/ */
@ -232,6 +199,16 @@ class phpbb_filespec_test extends phpbb_test_case
} }
} }
public function get_extension_variables()
{
return array(
array('file.png', 'png'),
array('file.phpbb.gif', 'gif'),
array('file..', ''),
array('.file..jpg.webp', 'webp'),
);
}
/** /**
* @dataProvider get_extension_variables * @dataProvider get_extension_variables
*/ */
@ -240,6 +217,17 @@ class phpbb_filespec_test extends phpbb_test_case
$this->assertEquals($expected, $this->filespec->get_extension($filename)); $this->assertEquals($expected, $this->filespec->get_extension($filename));
} }
public function is_image_variables()
{
return array(
array('gif', 'image/gif', true),
array('jpg', 'image/jpg', true),
array('png', 'image/png', true),
array('tif', 'image/tif', true),
array('txt', 'text/plain', false),
);
}
/** /**
* @dataProvider is_image_variables * @dataProvider is_image_variables
*/ */
@ -249,6 +237,18 @@ class phpbb_filespec_test extends phpbb_test_case
$this->assertEquals($expected, $this->filespec->is_image()); $this->assertEquals($expected, $this->filespec->is_image());
} }
public function move_file_variables()
{
return array(
array('gif_copy', 'gif_moved', 'image/gif', 'gif', false, true),
array('non_existant', 'still_non_existant', 'text/plain', 'txt', true, false),
array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', true, true),
array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true),
array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true),
array('png_copy', 'png_moved', 'image/png', 'jpg', true, true),
);
}
/** /**
* @dataProvider move_file_variables * @dataProvider move_file_variables
*/ */