diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:18:30 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:18:30 +0100 |
| commit | 1f8ab1c196351e4adecf63bc102771010b821fda (patch) | |
| tree | a9dc61eb3cc82e1283b99bdfe711c470221157b7 /tests/functions | |
| parent | f3d8dfd1e32fd0c58b601d8a7131fa959bff7b53 (diff) | |
| download | forums-1f8ab1c196351e4adecf63bc102771010b821fda.tar forums-1f8ab1c196351e4adecf63bc102771010b821fda.tar.gz forums-1f8ab1c196351e4adecf63bc102771010b821fda.tar.bz2 forums-1f8ab1c196351e4adecf63bc102771010b821fda.tar.xz forums-1f8ab1c196351e4adecf63bc102771010b821fda.zip | |
[ticket/12202] Use an array in the data provider instead of exploding manually
PHPBB3-12202
Diffstat (limited to 'tests/functions')
| -rw-r--r-- | tests/functions/parse_cfg_file_test.php | 82 |
1 files changed, 44 insertions, 38 deletions
diff --git a/tests/functions/parse_cfg_file_test.php b/tests/functions/parse_cfg_file_test.php index 43a90ded4f..69000ddf72 100644 --- a/tests/functions/parse_cfg_file_test.php +++ b/tests/functions/parse_cfg_file_test.php @@ -15,28 +15,29 @@ class phpbb_functions_parse_cfg_file extends phpbb_test_case { return array( array( - '# -# phpBB Style Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this style -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.12', + array( + '#', + '# phpBB Style Configuration File', + '#', + '# @package phpBB3', + '# @copyright (c) 2005 phpBB Group', + '# @license http://opensource.org/licenses/gpl-license.php GNU Public License', + '#', + '#', + '# At the left is the name, please do not change this', + '# At the right the value is entered', + '# For on/off options the valid values are on, off, 1, 0, true and false', + '#', + '# Values get trimmed, if you want to add a space in front or at the end of', + '# the value, then enclose the value with single or double quotes.', + '# Single and double quotes do not need to be escaped.', + '#', + '', + '# General Information about this style', + 'name = prosilver', + 'copyright = © phpBB Group, 2007', + 'version = 3.0.12', + ), array( 'name' => 'prosilver', 'copyright' => '© phpBB Group, 2007', @@ -44,9 +45,11 @@ version = 3.0.12', ), ), array( - 'name = subsilver2 -copyright = © 2005 phpBB Group -version = 3.0.12', + array( + 'name = subsilver2', + 'copyright = © 2005 phpBB Group', + 'version = 3.0.12', + ), array( 'name' => 'subsilver2', 'copyright' => '© 2005 phpBB Group', @@ -54,15 +57,17 @@ version = 3.0.12', ), ), array( - 'foo = on -foo1 = true -foo2 = 1 -bar = off -bar1 = false -bar2 = 0 -foobar = -foobar1 = "asdf" -foobar2 = \'qwer\'', + array( + 'foo = on', + 'foo1 = true', + 'foo2 = 1', + 'bar = off', + 'bar1 = false', + 'bar2 = 0', + 'foobar =', + 'foobar1 = "asdf"', + 'foobar2 = \'qwer\'', + ), array( 'foo' => true, 'foo1' => true, @@ -76,8 +81,10 @@ foobar2 = \'qwer\'', ), ), array( - 'foo = & bar -bar = <a href="test">Test</a>', + array( + 'foo = & bar', + 'bar = <a href="test">Test</a>', + ), array( 'foo' => '&amp; bar', 'bar' => '<a href="test">Test</a>', @@ -91,7 +98,6 @@ bar = <a href="test">Test</a>', */ public function test_parse_cfg_file($file_contents, $expected) { - $lines = explode("\n", $file_contents); - $this->assertEquals($expected, parse_cfg_file(false, $lines)); + $this->assertEquals($expected, parse_cfg_file(false, $file_contents)); } } |