diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-06-03 16:06:11 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-06-03 16:06:11 +0200 |
| commit | 3487b70cc066f090c55990a9082ed9684d438147 (patch) | |
| tree | 850fbd6caacdc29c3632cdf4ce76413f69498684 /tests/functions/validate_username_test.php | |
| parent | 33a0859f4ac3454c12dda651f708e16fc6c45adb (diff) | |
| download | forums-3487b70cc066f090c55990a9082ed9684d438147.tar forums-3487b70cc066f090c55990a9082ed9684d438147.tar.gz forums-3487b70cc066f090c55990a9082ed9684d438147.tar.bz2 forums-3487b70cc066f090c55990a9082ed9684d438147.tar.xz forums-3487b70cc066f090c55990a9082ed9684d438147.zip | |
[ticket/11579] Use test case helper class and use assert prefix for method
PHPBB3-11579
Diffstat (limited to 'tests/functions/validate_username_test.php')
| -rw-r--r-- | tests/functions/validate_username_test.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/functions/validate_username_test.php b/tests/functions/validate_username_test.php index 656248cec3..92c5ba6ee1 100644 --- a/tests/functions/validate_username_test.php +++ b/tests/functions/validate_username_test.php @@ -10,13 +10,13 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; require_once dirname(__FILE__) . '/../mock/cache.php'; -require_once dirname(__FILE__) . '/common_validate_data.php'; +require_once dirname(__FILE__) . '/validate_data_helper.php'; class phpbb_functions_validate_data_test extends phpbb_database_test_case { protected $db; protected $cache; - protected $common; + protected $helper; public function getDataSet() { @@ -29,7 +29,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case $this->db = $this->new_dbal(); $this->cache = new phpbb_mock_cache; - $this->common = new phpbb_functions_common_validate_data; + $this->helper = new phpbb_functions_validate_data_helper($this); } public function validate_username_data() @@ -129,7 +129,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case $config['allow_name_chars'] = $allow_name_chars; - $this->common->validate_data_check(array( + $this->helper->assert_validate_data($expected, array( 'foobar_allow' => 'foobar', 'foobar_ascii' => 'foobar', 'foobar_any' => 'f*~*^=oo_bar1', @@ -154,7 +154,6 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case 'barfoo_disallow' => array('username'), 'admin_taken' => array('username'), 'group_taken' => array('username'), - ), - $expected); + )); } } |