diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/libraries/common/PMA_GetDropdown_test.php (renamed from test/libraries/common/PMA_generate_html_dropdown_test.php) | 16 | ||||
| -rw-r--r-- | test/libraries/common/PMA_getCheckbox_test.php | 6 | ||||
| -rw-r--r-- | test/libraries/common/PMA_getDivForSliderEffect_test.php (renamed from test/libraries/common/PMA_generate_slider_effect_test.php) | 16 | ||||
| -rw-r--r-- | test/libraries/common/PMA_getRadioFields_test.php (renamed from test/libraries/common/PMA_display_html_radio_test.php) | 20 | ||||
| -rw-r--r-- | test/libraries/common/PMA_showMessage_test_disabled.php | 6 |
5 files changed, 32 insertions, 32 deletions
diff --git a/test/libraries/common/PMA_generate_html_dropdown_test.php b/test/libraries/common/PMA_GetDropdown_test.php index bffef4d2e3..ab01d800be 100644 --- a/test/libraries/common/PMA_generate_html_dropdown_test.php +++ b/test/libraries/common/PMA_GetDropdown_test.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA_generateHtmlDropdown from common.lib.php + * Test for PMA_getDropdown from common.lib.php * * @package PhpMyAdmin-test * @group common.lib-tests @@ -12,9 +12,9 @@ */ require_once 'libraries/common.lib.php'; -class PMA_GenerateHtmlDropdownTest extends PHPUnit_Framework_TestCase +class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase { - function testGenerateHtmlDropdownEmpty() + function testGetDropdownEmpty() { $name = "test_dropdown_name"; $choices = array(); @@ -23,10 +23,10 @@ class PMA_GenerateHtmlDropdownTest extends PHPUnit_Framework_TestCase $result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '"></select>'; - $this->assertEquals($result, PMA_generateHtmlDropdown($name, $choices, $active_choice, $id)); + $this->assertEquals($result, PMA_getDropdown($name, $choices, $active_choice, $id)); } - function testGenerateHtmlDropdown() + function testGetDropdown() { $name = "&test_dropdown_name"; $choices = array("value_1" => "label_1", "value&_2\"" => "label_2"); @@ -43,10 +43,10 @@ class PMA_GenerateHtmlDropdownTest extends PHPUnit_Framework_TestCase } $result .= '</select>'; - $this->assertEquals($result, PMA_generateHtmlDropdown($name, $choices, $active_choice, $id)); + $this->assertEquals($result, PMA_getDropdown($name, $choices, $active_choice, $id)); } - function testGenerateHtmlDropdownWithActive() + function testGetDropdownWithActive() { $name = "&test_dropdown_name"; $choices = array("value_1" => "label_1", "value&_2\"" => "label_2"); @@ -63,6 +63,6 @@ class PMA_GenerateHtmlDropdownTest extends PHPUnit_Framework_TestCase } $result .= '</select>'; - $this->assertEquals($result, PMA_generateHtmlDropdown($name, $choices, $active_choice, $id)); + $this->assertEquals($result, PMA_getDropdown($name, $choices, $active_choice, $id)); } }
\ No newline at end of file diff --git a/test/libraries/common/PMA_getCheckbox_test.php b/test/libraries/common/PMA_getCheckbox_test.php index 454f30f5ad..8030b7385b 100644 --- a/test/libraries/common/PMA_getCheckbox_test.php +++ b/test/libraries/common/PMA_getCheckbox_test.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA_display_html_checkbox from common.lib.php + * Test for PMA_getCheckbox from common.lib.php * * @package PhpMyAdmin-test * @group common.lib-tests @@ -12,7 +12,7 @@ */ require_once 'libraries/common.lib.php'; -class PMA_display_html_checkbox_test extends PHPUnit_Framework_TestCase +class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase { function testGetCheckbox() { @@ -59,4 +59,4 @@ class PMA_display_html_checkbox_test extends PHPUnit_Framework_TestCase } } -//PMA_display_html_checkbox +//PMA_getCheckbox diff --git a/test/libraries/common/PMA_generate_slider_effect_test.php b/test/libraries/common/PMA_getDivForSliderEffect_test.php index a291456b20..ce272d530e 100644 --- a/test/libraries/common/PMA_generate_slider_effect_test.php +++ b/test/libraries/common/PMA_getDivForSliderEffect_test.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA_generateSliderEffect from common.lib.php + * Test for PMA_getDivForSliderEffect from common.lib.php * * @package PhpMyAdmin-test * @group common.lib-tests @@ -12,9 +12,9 @@ */ require_once 'libraries/common.lib.php'; -class PMA_GenerateSliderEffectTest extends PHPUnit_Framework_TestCase +class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase { - function testGenerateSliderEffectTest() + function testGetDivForSliderEffectTest() { global $cfg; $cfg['InitialSlidersState'] = 'undefined'; @@ -23,10 +23,10 @@ class PMA_GenerateSliderEffectTest extends PHPUnit_Framework_TestCase $message = "test_message"; $this->expectOutputString('<div id="' . $id . '" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' '); - PMA_generateSliderEffect($id, $message); + PMA_getDivForSliderEffect($id, $message); } - function testGenerateSliderEffectTestClosed() + function testGetDivForSliderEffectTestClosed() { global $cfg; $cfg['InitialSlidersState'] = 'closed'; @@ -35,10 +35,10 @@ class PMA_GenerateSliderEffectTest extends PHPUnit_Framework_TestCase $message = "test_message"; $this->expectOutputString('<div id="' . $id . '" style="display: none; overflow:auto;" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' '); - PMA_generateSliderEffect($id, $message); + PMA_getDivForSliderEffect($id, $message); } - function testGenerateSliderEffectTestDisabled() + function testGetDivForSliderEffectTestDisabled() { global $cfg; $cfg['InitialSlidersState'] = 'disabled'; @@ -47,6 +47,6 @@ class PMA_GenerateSliderEffectTest extends PHPUnit_Framework_TestCase $message = "test_message"; $this->expectOutputString('<div id="' . $id . '">'); - PMA_generateSliderEffect($id, $message); + PMA_getDivForSliderEffect($id, $message); } }
\ No newline at end of file diff --git a/test/libraries/common/PMA_display_html_radio_test.php b/test/libraries/common/PMA_getRadioFields_test.php index 2af2e986a2..441213fff2 100644 --- a/test/libraries/common/PMA_display_html_radio_test.php +++ b/test/libraries/common/PMA_getRadioFields_test.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA_displayHtmlRadio from common.lib.php + * Test for PMA_getRadioFields from common.lib.php * * @package PhpMyAdmin-test * @group common.lib-tests @@ -12,9 +12,9 @@ */ require_once 'libraries/common.lib.php'; -class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase +class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase { - function testDisplayHtmlRadioEmpty() + function testGetRadioFieldsEmpty() { $name = "test_display_radio"; $choices = array(); @@ -23,7 +23,7 @@ class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase PMA_displayHtmlRadio($name, $choices); } - function testDisplayHtmlRadio() + function testGetRadioFields() { $name = "test_display_radio"; $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2'); @@ -42,7 +42,7 @@ class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase PMA_displayHtmlRadio($name, $choices); } - function testDisplayHtmlRadioWithChecked() + function testGetRadioFieldsWithChecked() { $name = "test_display_radio"; $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2'); @@ -65,7 +65,7 @@ class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase PMA_displayHtmlRadio($name, $choices, $checked_choice); } - function testDisplayHtmlRadioWithCheckedWithClass() + function testGetRadioFieldsWithCheckedWithClass() { $name = "test_display_radio"; $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2'); @@ -91,7 +91,7 @@ class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase PMA_displayHtmlRadio($name, $choices, $checked_choice, true, false, $class); } - function testDisplayHtmlRadioWithoutBR() + function testGetRadioFieldsWithoutBR() { $name = "test_display_radio"; $choices = array('value_1'=>'choice_1', 'value&_<2>'=>'choice_2'); @@ -113,7 +113,7 @@ class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase PMA_displayHtmlRadio($name, $choices, $checked_choice, false); } - function testDisplayHtmlRadioEscapeLabelEscapeLabel() + function testGetRadioFieldsEscapeLabelEscapeLabel() { $name = "test_display_radio"; $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_<2>'); @@ -136,7 +136,7 @@ class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase PMA_displayHtmlRadio($name, $choices, $checked_choice, true, true); } - function testDisplayHtmlRadioEscapeLabelNotEscapeLabel() + function testGetRadioFieldsEscapeLabelNotEscapeLabel() { $name = "test_display_radio"; $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_<2>'); @@ -159,7 +159,7 @@ class PMA_DisplayHtmlRadioTest extends PHPUnit_Framework_TestCase PMA_displayHtmlRadio($name, $choices, $checked_choice, true, false); } - function testDisplayHtmlRadioEscapeLabelEscapeLabelWithClass() + function testGetRadioFieldsEscapeLabelEscapeLabelWithClass() { $name = "test_display_radio"; $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_<2>'); diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php index 7aed63527b..2b25cfc80d 100644 --- a/test/libraries/common/PMA_showMessage_test_disabled.php +++ b/test/libraries/common/PMA_showMessage_test_disabled.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA_showMessage from common.lib + * Test for PMA_getMessage from common.lib * * @package PhpMyAdmin-test * @group common.lib-tests @@ -60,9 +60,9 @@ class PMA_showMessage_test extends PHPUnit_Framework_TestCase ]</div></div>" ); - echo PMA_showMessage("msg"); + echo PMA_getMessage("msg"); - //$this->assertEquals("",PMA_showMessage("msg")); + //$this->assertEquals("",PMA_getMessage("msg")); $this->assertTrue(true); } }
\ No newline at end of file |