1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

[ticket/11579] Use test case helper class and use assert prefix for method

PHPBB3-11579
This commit is contained in:
Marc Alexander
2013-06-03 16:06:11 +02:00
parent 33a0859f4a
commit 3487b70cc0
5 changed files with 100 additions and 95 deletions

View File

@@ -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'),
));
}
}