1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
This commit is contained in:
Andreas Fischer
2011-06-09 12:47:27 +02:00
4 changed files with 100 additions and 1 deletions

View File

@@ -0,0 +1,55 @@
<?php
/**
*
* @package testing
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_profile_fields.php';
class phpbb_profile_custom_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->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);
}
}

View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_profile_fields_lang">
<column>field_id</column>
<column>lang_id</column>
<column>option_id</column>
<column>field_type</column>
<column>lang_value</column>
<row>
<value>1</value>
<value>1</value>
<value>0</value>
<value>5</value>
<value>Default Option</value>
</row>
<row>
<value>1</value>
<value>1</value>
<value>1</value>
<value>5</value>
<value>First Alternative</value>
</row>
<row>
<value>1</value>
<value>1</value>
<value>2</value>
<value>5</value>
<value>Third Alternative</value>
</row>
</table>
</dataset>