diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-16 16:20:55 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-16 16:20:55 +0100 |
| commit | 8851f9589a5295d569316e76b366f1b16f1a9a96 (patch) | |
| tree | 44eb0101ca2121f7d8cbe5e3d8f615fedad49597 /tests/functions | |
| parent | efd6f1df63c24ed2947bccb863bb92c2346bf697 (diff) | |
| download | forums-8851f9589a5295d569316e76b366f1b16f1a9a96.tar forums-8851f9589a5295d569316e76b366f1b16f1a9a96.tar.gz forums-8851f9589a5295d569316e76b366f1b16f1a9a96.tar.bz2 forums-8851f9589a5295d569316e76b366f1b16f1a9a96.tar.xz forums-8851f9589a5295d569316e76b366f1b16f1a9a96.zip | |
[ticket/11192] Merge dataProvider arrays because the test is the same now.
PHPBB3-11192
Diffstat (limited to 'tests/functions')
| -rw-r--r-- | tests/functions/get_formatted_filesize_test.php | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php index c4793e8073..96ea2be132 100644 --- a/tests/functions/get_formatted_filesize_test.php +++ b/tests/functions/get_formatted_filesize_test.php @@ -34,12 +34,8 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case array(1023, '1023 BYTES'), array(1025, '1 KIB'), array(1048575, '1024 KIB'), - ); - } - public function get_formatted_filesize_test_data_string() - { - return array( + // String values // exact powers of 2 array('1', '1 BYTES'), array('1024', '1 KIB'), @@ -72,14 +68,4 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case $this->assertEquals($expected, $output); } - - /** - * @dataProvider get_formatted_filesize_test_data_string - */ - public function test_get_formatted_filesize_string($input, $expected) - { - $output = get_formatted_filesize($input); - - $this->assertEquals($expected, $output); - } } |