diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-05 16:15:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-05 16:15:54 +0000 |
| commit | 8243e9a3728feca2356add9684f91451bf28a43f (patch) | |
| tree | 1e53c8a9eed992836567803b7e348078764f1e6f /tests/request | |
| parent | 2e17e448deed073f8614bb555a8ef20c57291c2a (diff) | |
| download | forums-8243e9a3728feca2356add9684f91451bf28a43f.tar forums-8243e9a3728feca2356add9684f91451bf28a43f.tar.gz forums-8243e9a3728feca2356add9684f91451bf28a43f.tar.bz2 forums-8243e9a3728feca2356add9684f91451bf28a43f.tar.xz forums-8243e9a3728feca2356add9684f91451bf28a43f.zip | |
adjust tests a little bit to let them work again in trunk (not adjusted template/bbcode yet)
git-svn-id: file:///svn/phpbb/trunk@10212 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'tests/request')
| -rw-r--r-- | tests/request/all_tests.php | 4 | ||||
| -rw-r--r-- | tests/request/request_var.php | 49 |
2 files changed, 35 insertions, 18 deletions
diff --git a/tests/request/all_tests.php b/tests/request/all_tests.php index 3b235311d3..dc5d26417f 100644 --- a/tests/request/all_tests.php +++ b/tests/request/all_tests.php @@ -8,8 +8,6 @@ * */ -define('IN_PHPBB', true); - if (!defined('PHPUnit_MAIN_METHOD')) { define('PHPUnit_MAIN_METHOD', 'phpbb_request_all_tests::main'); @@ -19,7 +17,6 @@ require_once 'test_framework/framework.php'; require_once 'PHPUnit/TextUI/TestRunner.php'; require_once 'request/request_var.php'; -require_once 'request/request_class.php'; class phpbb_request_all_tests { @@ -32,7 +29,6 @@ class phpbb_request_all_tests { $suite = new PHPUnit_Framework_TestSuite('phpBB Request Parameter Handling'); - $suite->addTestSuite('phpbb_request_request_class_test'); $suite->addTestSuite('phpbb_request_request_var_test'); return $suite; diff --git a/tests/request/request_var.php b/tests/request/request_var.php index 549512753b..c0f8a22d95 100644 --- a/tests/request/request_var.php +++ b/tests/request/request_var.php @@ -8,10 +8,7 @@ * */ -define('IN_PHPBB', true); - require_once 'test_framework/framework.php'; - require_once '../phpBB/includes/functions.php'; class phpbb_request_request_var_test extends phpbb_test_case @@ -22,13 +19,11 @@ class phpbb_request_request_var_test extends phpbb_test_case public function test_post($variable_value, $default, $multibyte, $expected) { $variable_name = 'name'; + $this->unset_variables($variable_name); $_POST[$variable_name] = $variable_value; $_REQUEST[$variable_name] = $variable_value; - // reread data from super globals - request::reset(); - $result = request_var($variable_name, $default, $multibyte); $label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); @@ -41,13 +36,11 @@ class phpbb_request_request_var_test extends phpbb_test_case public function test_get($variable_value, $default, $multibyte, $expected) { $variable_name = 'name'; + $this->unset_variables($variable_name); $_GET[$variable_name] = $variable_value; $_REQUEST[$variable_name] = $variable_value; - // reread data from super globals - request::reset(); - $result = request_var($variable_name, $default, $multibyte); $label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); @@ -55,10 +48,39 @@ class phpbb_request_request_var_test extends phpbb_test_case } /** - * @dataProvider deep_access + * @dataProvider request_variables */ + public function test_cookie($variable_value, $default, $multibyte, $expected) + { + $variable_name = 'name'; + $this->unset_variables($variable_name); + + $_GET[$variable_name] = false; + $_POST[$variable_name] = false; + $_REQUEST[$variable_name] = false; + $_COOKIE[$variable_name] = $variable_value; + + $result = request_var($variable_name, $default, $multibyte, true); + + $label = 'Requesting COOKIE variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); + $this->assertEquals($expected, $result, $label); + } + + /** + * Helper for unsetting globals + */ + private function unset_variables($var) + { + unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]); + } + + /** + * @dataProvider deep_access + * Only possible with 3.1.x (later) public function test_deep_multi_dim_array_access($path, $default, $expected) { + $this->unset_variables('var'); + $_REQUEST['var'] = array( 0 => array( 'b' => array( @@ -75,9 +97,6 @@ class phpbb_request_request_var_test extends phpbb_test_case ), ); - // reread data from super globals - request::reset(); - $result = request_var($path, $default); $this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path); } @@ -92,7 +111,7 @@ class phpbb_request_request_var_test extends phpbb_test_case array(array('var', 0, 'b', true), array(0 => ''), array(5 => 'c', 6 => 'd')), ); } - +*/ public static function request_variables() { return array( @@ -193,6 +212,7 @@ class phpbb_request_request_var_test extends phpbb_test_case 'abc' => array() ) ), + /* 3-dimensional (not supported atm! array( // input: array( @@ -237,6 +257,7 @@ class phpbb_request_request_var_test extends phpbb_test_case 'ä' => array(4 => array('a' => 2, 'ö' => 3)), ) ), + */ ); } |