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_lang_iso_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_lang_iso_test.php')
| -rw-r--r-- | tests/functions/validate_lang_iso_test.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/functions/validate_lang_iso_test.php b/tests/functions/validate_lang_iso_test.php index b8a1827432..baf75108b7 100644 --- a/tests/functions/validate_lang_iso_test.php +++ b/tests/functions/validate_lang_iso_test.php @@ -8,12 +8,12 @@ */ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/common_validate_data.php'; +require_once dirname(__FILE__) . '/validate_data_helper.php'; class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case { protected $db; - protected $common; + protected $helper; public function getDataSet() { @@ -25,7 +25,7 @@ class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->common = new phpbb_functions_common_validate_data; + $this->helper = new phpbb_functions_validate_data_helper($this); } public function test_validate_lang_iso() @@ -34,7 +34,13 @@ class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case $db = $this->db; - $this->common->validate_data_check(array( + $this->helper->assert_validate_data(array( + 'empty' => array('WRONG_DATA'), + 'en' => array(), + 'cs' => array(), + 'de' => array('WRONG_DATA'), + ), + array( 'empty' => '', 'en' => 'en', 'cs' => 'cs', @@ -45,12 +51,6 @@ class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case 'en' => array('language_iso_name'), 'cs' => array('language_iso_name'), 'de' => array('language_iso_name'), - ), - array( - 'empty' => array('WRONG_DATA'), - 'en' => array(), - 'cs' => array(), - 'de' => array('WRONG_DATA'), )); } } |