From dda5992a7931b4620d742e7ce489a006f1a7b05a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 14 Jan 2014 10:20:33 +0100 Subject: [ticket/11201] Rename test file for now, so the other tests run PHPBB3-11201 --- tests/profile/custom_test.php | 55 ------------------------------------------ tests/profile/custom_test~.php | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 tests/profile/custom_test.php create mode 100644 tests/profile/custom_test~.php (limited to 'tests/profile') diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php deleted file mode 100644 index 1f33b45ba9..0000000000 --- a/tests/profile/custom_test.php +++ /dev/null @@ -1,55 +0,0 @@ -createXMLDataSet(dirname(__FILE__).'/fixtures/profile_fields.xml'); - } - - static public function dropdownFields() - { - return array( - // note, there is an offset of 1 between option_id (0-indexed) - // in the database and values (1-indexed) to avoid problems with - // transmitting 0 in an HTML form - // required, value, expected - array(1, '0', 'FIELD_INVALID_VALUE', 'Required field should throw error for out-of-range value'), - array(1, '1', 'FIELD_REQUIRED', 'Required field should throw error for default value'), - array(1, '2', false, 'Required field should accept non-default value'), - array(0, '0', 'FIELD_INVALID_VALUE', 'Optional field should throw error for out-of-range value'), - array(0, '1', false, 'Optional field should accept default value'), - array(0, '2', false, 'Optional field should accept non-default value'), - ); - } - - /** - * @dataProvider dropdownFields - */ - public function test_dropdown_validate($field_required, $field_value, $expected, $description) - { - global $db; - $db = $this->new_dbal(); - - $field_data = array( - 'field_id' => 1, - 'lang_id' => 1, - 'field_novalue' => 1, - 'field_required' => $field_required, - ); - - $cp = new custom_profile; - $result = $cp->validate_profile_field(FIELD_DROPDOWN, $field_value, $field_data); - - $this->assertEquals($expected, $result, $description); - } -} diff --git a/tests/profile/custom_test~.php b/tests/profile/custom_test~.php new file mode 100644 index 0000000000..1f33b45ba9 --- /dev/null +++ b/tests/profile/custom_test~.php @@ -0,0 +1,55 @@ +createXMLDataSet(dirname(__FILE__).'/fixtures/profile_fields.xml'); + } + + static public function dropdownFields() + { + return array( + // note, there is an offset of 1 between option_id (0-indexed) + // in the database and values (1-indexed) to avoid problems with + // transmitting 0 in an HTML form + // required, value, expected + array(1, '0', 'FIELD_INVALID_VALUE', 'Required field should throw error for out-of-range value'), + array(1, '1', 'FIELD_REQUIRED', 'Required field should throw error for default value'), + array(1, '2', false, 'Required field should accept non-default value'), + array(0, '0', 'FIELD_INVALID_VALUE', 'Optional field should throw error for out-of-range value'), + array(0, '1', false, 'Optional field should accept default value'), + array(0, '2', false, 'Optional field should accept non-default value'), + ); + } + + /** + * @dataProvider dropdownFields + */ + public function test_dropdown_validate($field_required, $field_value, $expected, $description) + { + global $db; + $db = $this->new_dbal(); + + $field_data = array( + 'field_id' => 1, + 'lang_id' => 1, + 'field_novalue' => 1, + 'field_required' => $field_required, + ); + + $cp = new custom_profile; + $result = $cp->validate_profile_field(FIELD_DROPDOWN, $field_value, $field_data); + + $this->assertEquals($expected, $result, $description); + } +} -- cgit v1.2.1