From febc05dae0613d097522ffff88aab4467f03d410 Mon Sep 17 00:00:00 2001 From: ayushchd Date: Wed, 12 Jun 2013 16:14:09 +0545 Subject: [PATCH 01/10] Unit tests for charset conversions Added test cases for: 1. libraries/char* 2. libraries/iconv* 3. libraries/kanji* --- libraries/dbi/DBIDummy.class.php | 22 +- .../libraries/PMA_charset_conversion_test.php | 61 ++++ test/libraries/PMA_iconv_wrapper_test.php | 73 +++++ test/libraries/PMA_kanji-encoding_test.php | 168 +++++++++++ test/libraries/PMA_mysql_charsets_test.php | 280 ++++++++++++++++++ 5 files changed, 603 insertions(+), 1 deletion(-) create mode 100644 test/libraries/PMA_charset_conversion_test.php create mode 100644 test/libraries/PMA_iconv_wrapper_test.php create mode 100644 test/libraries/PMA_kanji-encoding_test.php create mode 100644 test/libraries/PMA_mysql_charsets_test.php diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php index 0a7d4a5a45..218e593c59 100644 --- a/libraries/dbi/DBIDummy.class.php +++ b/libraries/dbi/DBIDummy.class.php @@ -255,7 +255,27 @@ $GLOBALS['dummy_queries'] = array( 'query' => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost''' AND PRIVILEGE_TYPE='TRIGGER' AND TABLE_SCHEMA='pma'", 'result' => array(), ), - + array( + 'query' => 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'pma_test\' LIMIT 1', + 'columns' => array('DEFAULT_COLLATION_NAME'), + 'result' => array( + array('utf8_general_ci') + ) + ), + array( + 'query' => 'SELECT DEFAULT_COLLATION_NAME FROM data_dictionary.SCHEMAS WHERE SCHEMA_NAME = \'pma_test\' LIMIT 1', + 'columns' => array('DEFAULT_COLLATION_NAME'), + 'result' => array( + array('utf8_general_ci_pma_drizzle') + ) + ), + array( + 'query' => 'SHOW VARIABLES LIKE \'collation_database\'', + 'columns' => array('variable_name', 'variable_value'), + 'result' => array( + array('foo', 'bar'), + ) + ) ); /** * Current database. diff --git a/test/libraries/PMA_charset_conversion_test.php b/test/libraries/PMA_charset_conversion_test.php new file mode 100644 index 0000000000..495a9889ac --- /dev/null +++ b/test/libraries/PMA_charset_conversion_test.php @@ -0,0 +1,61 @@ +assertEquals( + 'test', + PMA_convertString('UTF-8', 'UTF-8', 'test') + ); + + $GLOBALS['PMA_recoding_engine'] = 6; + $this->assertEquals( + 'test', + PMA_convertString('UTF-8', 'flat', 'test') + ); + + // TODO: remove function_exists if recode_string exists on server + + if (@function_exists('recode_string')) { + $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_RECODE; + $this->assertEquals( + 'Only That ecole & Can Be My Blame', + PMA_convertString('UTF-8', 'flat', 'Only That école & Can Be My Blame') + ); + } + + $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_ICONV; + $GLOBALS['cfg']['IconvExtraParams'] = '//TRANSLIT'; + $this->assertEquals( + "This is the Euro symbol 'EUR'.", + PMA_convertString('UTF-8', 'ISO-8859-1', "This is the Euro symbol '€'.") + ); + + $GLOBALS['cfg']['IconvExtraParams'] = '//IGNORE'; + $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_ICONV_AIX; + $this->assertEquals( + "This is the Euro symbol ''.", + PMA_convertString('UTF-8', 'ISO-8859-1', "This is the Euro symbol '€'.") + ); + + } +} +?> diff --git a/test/libraries/PMA_iconv_wrapper_test.php b/test/libraries/PMA_iconv_wrapper_test.php new file mode 100644 index 0000000000..ed0e7fc23f --- /dev/null +++ b/test/libraries/PMA_iconv_wrapper_test.php @@ -0,0 +1,73 @@ +assertEquals( + iconv($in_charset_mapped, $out_charset_mapped, $str), + PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) + ); + + } + + + /** + * Data provider for testIconvWrapper + * + * @return array data for testIconvWrapper test case + */ + public function IconvDataProvider() + { + return array( + array( + 'UTF-8', + 'ISO-8859-1//IGNORE', + 'UTF-8', + 'ISO-8859-1//IGNORE', + 'Euro Symbol: €' + ), + array( + 'UTF-8', + 'ISO-8859-1//IGNORE//TRANSLIT', + 'UTF-8', + 'ISO-8859-1//IGNORE', + 'Euro Symbol: €' + ), + array('UTF-8', + 'ISO-8859-9', + 'UTF-8', + 'ISO8859-9', + 'Testing "string"' + ) + ); + } +} +?> diff --git a/test/libraries/PMA_kanji-encoding_test.php b/test/libraries/PMA_kanji-encoding_test.php new file mode 100644 index 0000000000..ee562f1422 --- /dev/null +++ b/test/libraries/PMA_kanji-encoding_test.php @@ -0,0 +1,168 @@ +assertTrue(PMA_Kanji_checkEncoding()); + $this->assertEquals($expected, $GLOBALS['kanji_encoding_list']); + + } + + + /** + * Data provider for testPMA_Kanji_checkEncoding + * @return array Test data + */ + public function checkEncodingData() { + return array( + array('UTF-8', 'ASCII,SJIS,EUC-JP,JIS'), + array('EUC-JP', 'ASCII,EUC-JP,SJIS,JIS') + ); + } + + + /** + * Test for PMA_Kanji_changeOrder + * @param string $kanji_test_list current list + * @param string $expected expected list + * + * @return void + * + * @dataProvider changeOrderData + */ + public function testPMA_Kanji_changeOrder($kanji_test_list, $expected) { + $GLOBALS['kanji_encoding_list'] = $kanji_test_list; + $this->assertTrue(PMA_Kanji_changeOrder()); + $this->assertEquals($expected, $GLOBALS['kanji_encoding_list']); + } + + + /** + * Data Provider for testPMA_Kanji_changeOrder + * + * @return array Test data + */ + public function changeOrderData() { + return array( + array('ASCII,SJIS,EUC-JP,JIS', 'ASCII,EUC-JP,SJIS,JIS'), + array('ASCII,EUC-JP,SJIS,JIS', 'ASCII,SJIS,EUC-JP,JIS') + ); + } + + + /** + * Test for PMA_Kanji_strConv + * + * @return void + */ + public function testPMA_Kanji_strConv() { + + $this->assertEquals( + 'test', + PMA_Kanji_strConv('test', '', '') + ); + + $GLOBALS['kanji_encoding_list'] = 'ASCII,SJIS,EUC-JP,JIS'; + + $this->assertEquals( + 'test è', + PMA_Kanji_strConv('test è', '', '') + ); + + $this->assertEquals( + mb_convert_encoding('test è', 'ASCII', 'SJIS'), + PMA_Kanji_strConv('test è', 'ASCII', '') + ); + + $this->assertEquals( + mb_convert_kana('全角', 'KV', 'SJIS'), + PMA_Kanji_strConv('全角', '', 'kana') + ); + + } + + + /** + * Test for PMA_Kanji_fileConv + * + * @return void + */ + public function testPMA_Kanji_fileConv() { + + $file_str = "教育漢字常用漢字"; + $filename = 'test.kanji'; + $file = fopen($filename, 'w'); + fputs($file, $file_str); + fclose($file); + $GLOBALS['kanji_encoding_list'] = 'ASCII,EUC-JP,SJIS,JIS'; + + $result = PMA_Kanji_fileConv($filename, 'JIS', 'kana'); + + $string = file_get_contents($result); + PMA_Kanji_changeOrder(); + $expected = PMA_Kanji_strConv($file_str, 'JIS', 'kana'); + PMA_Kanji_changeOrder(); + $this->assertEquals($string, $expected); + unlink($result); + + } + + + /** + * Test for PMA_Kanji_encodingForm + * + * @return void + */ + public function testPMA_Kanji_encodingForm() { + + $actual = PMA_Kanji_encodingForm(); + $this->assertContains( + 'assertContains( + 'type="radio" name="knjenc"', + $actual + ); + $this->assertContains( + '', + $actual + ); + $this->assertContains( + '', + $actual + ); + $this->assertContains( + '', + $actual + ); + + } + + +} +?> diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php new file mode 100644 index 0000000000..0af9831257 --- /dev/null +++ b/test/libraries/PMA_mysql_charsets_test.php @@ -0,0 +1,280 @@ +assertEquals( + $expected, + PMA_generateCharsetQueryPart($collation) + ); + } + + + /** + * Data Provider for testPMA_generateCharsetQueryPart + * + * @return array test data + */ + public function charsetQueryData() + { + return array( + array(false, "a_b_c_d", " CHARACTER SET a COLLATE a_b_c_d"), + array(false, "a_", " CHARACTER SET a COLLATE a_"), + array(false, "a", " CHARACTER SET a"), + array(true, "a_b_c_d", " COLLATE a_b_c_d") + ); + } + + + /** + * Test for PMA_getDbCollation + * + * @return void + * + */ + public function testPMA_getDbCollation() + { + + // test case for system schema + $this->assertEquals( + 'utf8_general_ci', + PMA_getDbCollation("information_schema") + ); + + // test case with no pma drizzle + if (defined('PMA_DRIZZLE')) { + runkit_constant_redefine('PMA_DRIZZLE', false); + } else { + define('PMA_DRIZZLE', false); + } + $GLOBALS['cfg']['Server']['DisableIS'] = false; + $GLOBALS['cfg']['DBG']['sql'] = false; + $this->assertEquals( + 'utf8_general_ci', + PMA_getDbCollation('pma_test') + ); + + // test case with pma drizzle as true + runkit_constant_redefine('PMA_DRIZZLE', true); + $this->assertEquals( + 'utf8_general_ci_pma_drizzle', + PMA_getDbCollation('pma_test') + ); + + + $GLOBALS['cfg']['Server']['DisableIS'] = true; + $GLOBALS['db'] = 'pma_test2'; + $this->assertEquals( + 'bar', + PMA_getDbCollation('pma_test') + ); + $this->assertNotEquals( + 'pma_test', + $GLOBALS['dummy_db'] + ); + + } + + + /** + * Test case for PMA_getCollationDescr() + * + * @param string $collation Collation for which description is reqd + * @param string $desc Expected Description + * + * @return void + * @dataProvider collationDescr + */ + public function testPMA_getCollationDescr($collation, $desc) { + $this->assertEquals( + $desc, + PMA_getCollationDescr($collation) + ); + } + + + /** + * Data Provider for testPMA_getCollationDescr() + * + * @return array Test data for testPMA_getCollationDescr() + */ + public function collationDescr() { + return array( + array('binary', 'Binary'), + array('foo_bulgarian_bar', 'Bulgarian'), + array('gb2312_chinese', 'Simplified Chinese'), + array('gbk_chinese', 'Simplified Chinese'), + array('big5_chinese', 'Traditional Chinese'), + array('foo_ci_bar', 'unknown, case-insensitive'), + array('foo_cs_bar', 'unknown, case-sensitive'), + array('foo_croatian_bar', 'Croatian'), + array('foo_czech_bar', 'Czech'), + array('foo_danish_bar', 'Danish'), + array('foo_english_bar', 'English'), + array('foo_esperanto_bar', 'Esperanto'), + array('foo_estonian_bar', 'Estonian'), + array('foo_german1_bar', 'German (dictionary)'), + array('foo_german2_bar', 'German (phone book)'), + array('foo_hungarian_bar', 'Hungarian'), + array('foo_icelandic_bar', 'Icelandic'), + array('foo_japanese_bar', 'Japanese'), + array('foo_latvian_bar', 'Latvian'), + array('foo_lithuanian_bar', 'Lithuanian'), + array('foo_korean_bar', 'Korean'), + array('foo_persian_bar', 'Persian'), + array('foo_polish_bar', 'Polish'), + array('foo_roman_bar', 'West European'), + array('foo_romanian_bar', 'Romanian'), + array('foo_slovak_bar', 'Slovak'), + array('foo_slovenian_bar', 'Slovenian'), + array('foo_spanish_bar', 'Spanish'), + array('foo_spanish2_bar', 'Traditional Spanish'), + array('foo_swedish_bar', 'Swedish'), + array('foo_thai_bar', 'Thai'), + array('foo_turkish_bar', 'Turkish'), + array('foo_ukrainian_bar', 'Ukrainian'), + array('foo_unicode_bar', 'Unicode (multilingual)'), + array('ucs2', 'Unicode (multilingual)'), + array('utf8', 'Unicode (multilingual)'), + array('ascii', 'West European (multilingual)'), + array('cp850', 'West European (multilingual)'), + array('dec8', 'West European (multilingual)'), + array('hp8', 'West European (multilingual)'), + array('latin1', 'West European (multilingual)'), + array('cp1250', 'Central European (multilingual)'), + array('cp852', 'Central European (multilingual)'), + array('latin2', 'Central European (multilingual)'), + array('macce', 'Central European (multilingual)'), + array('cp866', 'Russian'), + array('koi8r', 'Russian'), + array('gb2312', 'Simplified Chinese'), + array('gbk', 'Simplified Chinese'), + array('sjis', 'Japanese'), + array('ujis', 'Japanese'), + array('cp932', 'Japanese'), + array('eucjpms', 'Japanese'), + array('cp1257', 'Baltic (multilingual)'), + array('latin7', 'Baltic (multilingual)'), + array('armscii8', 'Armenian'), + array('armscii', 'Armenian'), + array('big5', 'Traditional Chinese'), + array('cp1251', 'Cyrillic (multilingual)'), + array('cp1256', 'Arabic'), + array('euckr', 'Korean'), + array('hebrew', 'Hebrew'), + array('geostd8', 'Georgian'), + array('greek', 'Greek'), + array('keybcs2', 'Czech-Slovak'), + array('koi8u', 'Ukrainian'), + array('latin5', 'Turkish'), + array('swe7', 'Swedish'), + array('tis620', 'Thai'), + array('foobar', 'unknown'), + array('foo_test_bar', 'unknown'), + array('foo_bin_bar', 'unknown, Binary') + ); + } + + + /** + * Test for PMA_generateCharsetDropdownBox + * + * @return void + */ + public function testPMA_generateCharsetDropdownBox() { + + $GLOBALS['mysql_charsets'] = array('latin1', 'latin2', 'latin3'); + $GLOBALS['mysql_charsets_available'] = array( + 'latin1' => true, + 'latin2' => false, + 'latin3' => true + ); + $GLOBALS['mysql_charsets_descriptions'] = array( + 'latin1' => 'abc', + 'latin2' => 'def' + ); + $GLOBALS['mysql_collations'] = array( + 'latin1' => array( + 'latin1_german1_ci', + 'latin1_swedish1_ci' + ), + 'latin2' => array('latin1_general_ci'), + 'latin3' => array() + ); + $GLOBALS['mysql_collations_available'] = array( + 'latin1_german1_ci' => true, + 'latin1_swedish1_ci' => false, + 'latin2_general_ci' => true + ); + $result = PMA_generateCharsetDropdownBox(); + + $this->assertContains('name="collation"', $result); + $this->assertNotContains('id="', $result); + $this->assertNotContains('class="autosubmit"', $result); + $this->assertContains('', $result); + $this->assertContains('assertContains('title="latin3', $result); + $this->assertContains('title="abc', $result); + $this->assertNotContains('value="latin1_swedish1_ci"', $result); + $this->assertContains('value="latin1_german1_ci"', $result); + $this->assertNotContains('value="latin2_general1_ci"', $result); + $this->assertContains('title="German', $result); + + $result = PMA_generateCharsetDropdownBox(2, null, "test_id", "latin1", + false, 0, true, false + ); + $this->assertContains('name="character_set"', $result); + $this->assertNotContains('Charset', $result); + $this->assertContains('class="autosubmit"', $result); + $this->assertContains('id="test_id"', $result); + $this->assertContains('selected="selected">latin1', $result); + } + + + /** + * Test for PMA_getServerCollation + * + * @return void + */ + public function testPMA_getServerCollation() { + + $GLOBALS['cfg']['DBG']['sql'] = false; + $this->assertEquals('utf8_general_ci', PMA_getServerCollation()); + + } +} +?> From dd56dd2401332778319e2f7ba3070969c6f80278 Mon Sep 17 00:00:00 2001 From: ayushchd Date: Wed, 12 Jun 2013 17:06:48 +0545 Subject: [PATCH 02/10] Mark test incomplete if runkit is missing --- test/libraries/PMA_kanji-encoding_test.php | 2 +- test/libraries/PMA_mysql_charsets_test.php | 104 ++++++++++++--------- 2 files changed, 63 insertions(+), 43 deletions(-) diff --git a/test/libraries/PMA_kanji-encoding_test.php b/test/libraries/PMA_kanji-encoding_test.php index ee562f1422..ac63d19d1e 100644 --- a/test/libraries/PMA_kanji-encoding_test.php +++ b/test/libraries/PMA_kanji-encoding_test.php @@ -15,7 +15,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase { /** - * Test fp\or PMA_Kanji_checkEncoding + * Test for PMA_Kanji_checkEncoding * * @param string $encoding Encoding to set * @param strin $expected Expected encoding list diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php index 0af9831257..d6719421c5 100644 --- a/test/libraries/PMA_mysql_charsets_test.php +++ b/test/libraries/PMA_mysql_charsets_test.php @@ -29,16 +29,27 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase public function testPMA_generateCharsetQueryPart( $drizzle, $collation, $expected ) { - if (defined('PMA_DRIZZLE')) { - runkit_constant_redefine('PMA_DRIZZLE', $drizzle); - } else { - define('PMA_DRIZZLE', $drizzle); - } - $this->assertEquals( - $expected, - PMA_generateCharsetQueryPart($collation) - ); + if (!function_exists("runkit_constant_redefine")) { + + $this->markTestSkipped( + 'Cannot redefine constant/function - missing APD or/and runkit extension' + ); + + } else { + + if (defined('PMA_DRIZZLE')) { + runkit_constant_redefine('PMA_DRIZZLE', $drizzle); + } else { + define('PMA_DRIZZLE', $drizzle); + } + + $this->assertEquals( + $expected, + PMA_generateCharsetQueryPart($collation) + ); + + } } @@ -67,43 +78,52 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase public function testPMA_getDbCollation() { - // test case for system schema - $this->assertEquals( - 'utf8_general_ci', - PMA_getDbCollation("information_schema") - ); - - // test case with no pma drizzle - if (defined('PMA_DRIZZLE')) { - runkit_constant_redefine('PMA_DRIZZLE', false); + if (!function_exists("runkit_constant_redefine")) { + + $this->markTestSkipped( + 'Cannot redefine constant/function - missing APD or/and runkit extension' + ); + } else { - define('PMA_DRIZZLE', false); - } - $GLOBALS['cfg']['Server']['DisableIS'] = false; - $GLOBALS['cfg']['DBG']['sql'] = false; - $this->assertEquals( - 'utf8_general_ci', - PMA_getDbCollation('pma_test') - ); - // test case with pma drizzle as true - runkit_constant_redefine('PMA_DRIZZLE', true); - $this->assertEquals( - 'utf8_general_ci_pma_drizzle', - PMA_getDbCollation('pma_test') - ); + // test case for system schema + $this->assertEquals( + 'utf8_general_ci', + PMA_getDbCollation("information_schema") + ); + + // test case with no pma drizzle + if (defined('PMA_DRIZZLE')) { + runkit_constant_redefine('PMA_DRIZZLE', false); + } else { + define('PMA_DRIZZLE', false); + } + $GLOBALS['cfg']['Server']['DisableIS'] = false; + $GLOBALS['cfg']['DBG']['sql'] = false; + $this->assertEquals( + 'utf8_general_ci', + PMA_getDbCollation('pma_test') + ); + + // test case with pma drizzle as true + runkit_constant_redefine('PMA_DRIZZLE', true); + $this->assertEquals( + 'utf8_general_ci_pma_drizzle', + PMA_getDbCollation('pma_test') + ); - $GLOBALS['cfg']['Server']['DisableIS'] = true; - $GLOBALS['db'] = 'pma_test2'; - $this->assertEquals( - 'bar', - PMA_getDbCollation('pma_test') - ); - $this->assertNotEquals( - 'pma_test', - $GLOBALS['dummy_db'] - ); + $GLOBALS['cfg']['Server']['DisableIS'] = true; + $GLOBALS['db'] = 'pma_test2'; + $this->assertEquals( + 'bar', + PMA_getDbCollation('pma_test') + ); + $this->assertNotEquals( + 'pma_test', + $GLOBALS['dummy_db'] + ); + } } From 817dd4e357e68135e78d92abd6b0632f73ae3dc5 Mon Sep 17 00:00:00 2001 From: ayushchd Date: Wed, 12 Jun 2013 17:17:37 +0545 Subject: [PATCH 03/10] Comment added for test case --- test/libraries/PMA_charset_conversion_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/test/libraries/PMA_charset_conversion_test.php b/test/libraries/PMA_charset_conversion_test.php index 495a9889ac..7260272cd7 100644 --- a/test/libraries/PMA_charset_conversion_test.php +++ b/test/libraries/PMA_charset_conversion_test.php @@ -26,6 +26,7 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase PMA_convertString('UTF-8', 'UTF-8', 'test') ); + // 6 represents an arbitrary value for testing the default case $GLOBALS['PMA_recoding_engine'] = 6; $this->assertEquals( 'test', From 93dd3214377de782ec2eabc667a018b6ce215b9c Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Wed, 12 Jun 2013 16:02:06 +0100 Subject: [PATCH 04/10] JSlint fixes --- js/server_privileges.js | 6 +++--- js/tbl_structure.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 8a643c7625..8dacea8ba4 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -166,7 +166,7 @@ function addUser($form) /** * Unbind all event handlers before tearing down a page */ -AJAX.registerTeardown('server_privileges.js', function() { +AJAX.registerTeardown('server_privileges.js', function () { $("#fieldset_add_user_login input[name='username']").die("focusout"); $("#fieldset_add_user a.ajax").die("click"); $('form[name=usersForm]').unbind('submit'); @@ -185,7 +185,7 @@ AJAX.registerOnload('server_privileges.js', function () { /** * Display a warning if there is already a user by the name entered as the username. */ - $("#fieldset_add_user_login input[name='username']").live("focusout", function() { + $("#fieldset_add_user_login input[name='username']").live("focusout", function () { var username = $(this).val(); var $warning = $("#user_exists_warning"); if ($("#select_pred_username").val() == 'userdefined' && username != '') { @@ -196,7 +196,7 @@ AJAX.registerOnload('server_privileges.js', function () { 'validate_username' : true, 'username' : username }; - $.get(href, params, function(data) { + $.get(href, params, function (data) { if (data.user_exists) { $warning.show(); } else { diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 9ea8d5f1bf..3f45583d2f 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -54,7 +54,7 @@ AJAX.registerOnload('tbl_structure.js', function () { /** *Ajax action for submitting the "Column Change" and "Add Column" form */ - $(".append_fields_form.ajax").die().live('submit', function(event) { + $(".append_fields_form.ajax").die().live('submit', function (event) { event.preventDefault(); /** * @var the_form object referring to the export form @@ -73,7 +73,7 @@ AJAX.registerOnload('tbl_structure.js', function () { PMA_prepareForAjaxRequest($form); //User wants to submit the form $msg = PMA_ajaxShowMessage(); - $.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function(data) { + $.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) { if ($("#sqlqueryresults").length != 0) { $("#sqlqueryresults").remove(); } else if ($(".error:not(.tab)").length != 0) { From 2cf24c85b29d10a90fd9a33791727d1afdf1844d Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Wed, 12 Jun 2013 14:52:30 +0200 Subject: [PATCH 05/10] Translated using Weblate (Dutch) Currently translated at 99.7% (2666 of 2673) --- po/nl.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index 617a38ce2f..9c72fa8e5e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-12 09:39+0200\n" -"PO-Revision-Date: 2013-06-05 13:42+0200\n" +"PO-Revision-Date: 2013-06-12 14:52+0200\n" "Last-Translator: Dieter Adriaenssens \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -8444,10 +8444,9 @@ msgstr "" "probeer opnieuw." #: libraries/plugins/import/ImportOds.class.php:182 -#, fuzzy #| msgid "OpenDocument Spreadsheet" msgid "Could not parse OpenDocument Spreasheet!" -msgstr "OpenDocument-rekenblad" +msgstr "Kon OpenDocument-rekenblad niet inlezen!" #: libraries/plugins/import/ImportShp.class.php:53 msgid "ESRI Shape File" From f3a6270f5f5dafca28906a4ccc01174bf3ce6533 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 12 Jun 2013 16:43:35 +0200 Subject: [PATCH 06/10] Translated using Weblate (French) Currently translated at 100.0% (2673 of 2673) --- po/fr.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/fr.po b/po/fr.po index 588b435165..fe89510992 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-12 09:39+0200\n" -"PO-Revision-Date: 2013-06-05 13:51+0200\n" +"PO-Revision-Date: 2013-06-12 16:43+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: French \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4139,7 +4138,7 @@ msgstr "Permettre aux utilisateurs de personnaliser cette valeur" #: libraries/config/FormDisplay.tpl.php:392 msgid "Apply" -msgstr "" +msgstr "Appliquer" #: libraries/config/FormDisplay.tpl.php:394 libraries/insert_edit.lib.php:1551 #: libraries/schema/User_Schema.class.php:554 prefs_manage.php:326 @@ -6345,19 +6344,19 @@ msgstr "ZIP" #: libraries/config/messages.inc.php:531 msgid "Enter your public key for your domain reCaptcha service" -msgstr "" +msgstr "Saisissez la clé publique du service reCaptcha pour votre domaine" #: libraries/config/messages.inc.php:532 msgid "Public key for reCaptcha" -msgstr "" +msgstr "Clé publique pour reCaptcha" #: libraries/config/messages.inc.php:533 msgid "Enter your private key for your domain reCaptcha service" -msgstr "" +msgstr "Saisissez la clé privée du service reCaptcha pour votre domaine" #: libraries/config/messages.inc.php:534 msgid "Private key for reCaptcha" -msgstr "" +msgstr "Clé privée pour reCaptcha" #: libraries/config/setup.forms.php:41 msgid "Config authentication" @@ -7935,11 +7934,11 @@ msgstr "Choix du serveur : " #: libraries/plugins/auth/AuthenticationCookie.class.php:386 msgid "Entered captcha is wrong, try again!" -msgstr "" +msgstr "Erreur, essayez à nouveau !" #: libraries/plugins/auth/AuthenticationCookie.class.php:395 msgid "Please enter correct captcha!" -msgstr "" +msgstr "Veuillez saisir le captcha correct !" #: libraries/plugins/auth/AuthenticationCookie.class.php:657 #: libraries/plugins/auth/AuthenticationSignon.class.php:249 @@ -8435,10 +8434,9 @@ msgstr "" "et essayer à nouveau." #: libraries/plugins/import/ImportOds.class.php:182 -#, fuzzy #| msgid "OpenDocument Spreadsheet" msgid "Could not parse OpenDocument Spreasheet!" -msgstr "Tableur OpenDocument" +msgstr "Analyse incorrecte du tableur OpenDocument !" #: libraries/plugins/import/ImportShp.class.php:53 msgid "ESRI Shape File" From 3776935965117608248b69667c83e86351d4b1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 12 Jun 2013 18:24:56 +0200 Subject: [PATCH 07/10] Translated using Weblate (Spanish) Currently translated at 100.0% (2673 of 2673) --- po/es.po | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/po/es.po b/po/es.po index 1457469b0d..318923b8e4 100644 --- a/po/es.po +++ b/po/es.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-12 09:39+0200\n" -"PO-Revision-Date: 2013-06-04 17:59+0200\n" +"PO-Revision-Date: 2013-06-12 18:24+0200\n" "Last-Translator: Matías Bellone \n" -"Language-Team: Spanish \n" +"Language-Team: Spanish " +"\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4162,7 +4162,7 @@ msgstr "Permitir a los usuarios personalizar este valor" #: libraries/config/FormDisplay.tpl.php:392 msgid "Apply" -msgstr "" +msgstr "Aplicar" #: libraries/config/FormDisplay.tpl.php:394 libraries/insert_edit.lib.php:1551 #: libraries/schema/User_Schema.class.php:554 prefs_manage.php:326 @@ -6390,19 +6390,19 @@ msgstr "ZIP" #: libraries/config/messages.inc.php:531 msgid "Enter your public key for your domain reCaptcha service" -msgstr "" +msgstr "Ingrese su llave pública para el servicio reCaptcha de su dominio" #: libraries/config/messages.inc.php:532 msgid "Public key for reCaptcha" -msgstr "" +msgstr "Llave púlica para reCaptcha" #: libraries/config/messages.inc.php:533 msgid "Enter your private key for your domain reCaptcha service" -msgstr "" +msgstr "Ingrese su llave privada para el servicio reCaptcha de su dominio" #: libraries/config/messages.inc.php:534 msgid "Private key for reCaptcha" -msgstr "" +msgstr "Llave privada para reCaptcha" #: libraries/config/setup.forms.php:41 msgid "Config authentication" @@ -7997,11 +7997,11 @@ msgstr "Elección del servidor:" #: libraries/plugins/auth/AuthenticationCookie.class.php:386 msgid "Entered captcha is wrong, try again!" -msgstr "" +msgstr "El captcha ingresado es incorrecto, ¡intente nuevamente!" #: libraries/plugins/auth/AuthenticationCookie.class.php:395 msgid "Please enter correct captcha!" -msgstr "" +msgstr "¡Ingrese el captcha correcto!" #: libraries/plugins/auth/AuthenticationCookie.class.php:657 #: libraries/plugins/auth/AuthenticationSignon.class.php:249 @@ -8499,10 +8499,9 @@ msgstr "" "problema e intente nuevamente." #: libraries/plugins/import/ImportOds.class.php:182 -#, fuzzy #| msgid "OpenDocument Spreadsheet" msgid "Could not parse OpenDocument Spreasheet!" -msgstr "Hoja de cálculo Open Document" +msgstr "¡No se pudo procesar la hoja de cálculo Open Document!" #: libraries/plugins/import/ImportShp.class.php:53 msgid "ESRI Shape File" From 65f7f3eff5e8b30a6789962ee49cf52af6b5b37b Mon Sep 17 00:00:00 2001 From: Domen Date: Wed, 12 Jun 2013 18:46:08 +0200 Subject: [PATCH 08/10] Translated using Weblate (Slovenian) Currently translated at 99.9% (2671 of 2673) --- po/sl.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/po/sl.po b/po/sl.po index 3a1fc981e5..11c576b287 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-12 09:39+0200\n" -"PO-Revision-Date: 2013-06-05 21:28+0200\n" +"PO-Revision-Date: 2013-06-12 18:46+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4117,7 +4117,7 @@ msgstr "Dovoli uporabnikom prilagajati to vrednost" #: libraries/config/FormDisplay.tpl.php:392 msgid "Apply" -msgstr "" +msgstr "Uveljavi" #: libraries/config/FormDisplay.tpl.php:394 libraries/insert_edit.lib.php:1551 #: libraries/schema/User_Schema.class.php:554 prefs_manage.php:326 @@ -6306,7 +6306,7 @@ msgstr "" #: libraries/config/messages.inc.php:532 msgid "Public key for reCaptcha" -msgstr "" +msgstr "Javni ključ za reCaptcha" #: libraries/config/messages.inc.php:533 msgid "Enter your private key for your domain reCaptcha service" @@ -6314,7 +6314,7 @@ msgstr "" #: libraries/config/messages.inc.php:534 msgid "Private key for reCaptcha" -msgstr "" +msgstr "Zasebni ključ za reCaptcha" #: libraries/config/setup.forms.php:41 msgid "Config authentication" @@ -7883,11 +7883,11 @@ msgstr "Izbira strežnika:" #: libraries/plugins/auth/AuthenticationCookie.class.php:386 msgid "Entered captcha is wrong, try again!" -msgstr "" +msgstr "Vnesena captcha je napačna; poskusite znova!" #: libraries/plugins/auth/AuthenticationCookie.class.php:395 msgid "Please enter correct captcha!" -msgstr "" +msgstr "Prosimo, vnesite pravilno captcho!" #: libraries/plugins/auth/AuthenticationCookie.class.php:657 #: libraries/plugins/auth/AuthenticationSignon.class.php:249 @@ -8379,10 +8379,9 @@ msgstr "" "težave in poskusite znova." #: libraries/plugins/import/ImportOds.class.php:182 -#, fuzzy #| msgid "OpenDocument Spreadsheet" msgid "Could not parse OpenDocument Spreasheet!" -msgstr "Preglednica OpenDocument" +msgstr "Ne morem razčleniti preglednice OpenDocument!" #: libraries/plugins/import/ImportShp.class.php:53 msgid "ESRI Shape File" From df657a2a2ed54ae56b880353a871c6016f7a0bd9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 13 Jun 2013 00:32:02 +0530 Subject: [PATCH 09/10] Coding style fixes for new tests --- .../libraries/PMA_charset_conversion_test.php | 32 +++-- test/libraries/PMA_iconv_wrapper_test.php | 58 ++++---- test/libraries/PMA_kanji-encoding_test.php | 97 +++++++------- test/libraries/PMA_mysql_charsets_test.php | 125 ++++++++---------- 4 files changed, 155 insertions(+), 157 deletions(-) diff --git a/test/libraries/PMA_charset_conversion_test.php b/test/libraries/PMA_charset_conversion_test.php index 7260272cd7..238736bc91 100644 --- a/test/libraries/PMA_charset_conversion_test.php +++ b/test/libraries/PMA_charset_conversion_test.php @@ -1,7 +1,7 @@ assertEquals( - 'test', + 'test', PMA_convertString('UTF-8', 'UTF-8', 'test') ); - + // 6 represents an arbitrary value for testing the default case $GLOBALS['PMA_recoding_engine'] = 6; $this->assertEquals( - 'test', + 'test', PMA_convertString('UTF-8', 'flat', 'test') ); @@ -38,25 +43,30 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase if (@function_exists('recode_string')) { $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_RECODE; $this->assertEquals( - 'Only That ecole & Can Be My Blame', - PMA_convertString('UTF-8', 'flat', 'Only That école & Can Be My Blame') + 'Only That ecole & Can Be My Blame', + PMA_convertString( + 'UTF-8', 'flat', 'Only That école & Can Be My Blame' + ) ); } $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_ICONV; $GLOBALS['cfg']['IconvExtraParams'] = '//TRANSLIT'; $this->assertEquals( - "This is the Euro symbol 'EUR'.", - PMA_convertString('UTF-8', 'ISO-8859-1', "This is the Euro symbol '€'.") + "This is the Euro symbol 'EUR'.", + PMA_convertString( + 'UTF-8', 'ISO-8859-1', "This is the Euro symbol '€'." + ) ); - + $GLOBALS['cfg']['IconvExtraParams'] = '//IGNORE'; $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_ICONV_AIX; $this->assertEquals( "This is the Euro symbol ''.", - PMA_convertString('UTF-8', 'ISO-8859-1', "This is the Euro symbol '€'.") + PMA_convertString( + 'UTF-8', 'ISO-8859-1', "This is the Euro symbol '€'." + ) ); - } } ?> diff --git a/test/libraries/PMA_iconv_wrapper_test.php b/test/libraries/PMA_iconv_wrapper_test.php index ed0e7fc23f..c702df6b3a 100644 --- a/test/libraries/PMA_iconv_wrapper_test.php +++ b/test/libraries/PMA_iconv_wrapper_test.php @@ -1,7 +1,7 @@ assertEquals( iconv($in_charset_mapped, $out_charset_mapped, $str), PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) ); - } - + /** * Data provider for testIconvWrapper * * @return array data for testIconvWrapper test case */ - public function IconvDataProvider() + public function iconvDataProvider() { return array( array( - 'UTF-8', - 'ISO-8859-1//IGNORE', - 'UTF-8', - 'ISO-8859-1//IGNORE', + 'UTF-8', + 'ISO-8859-1//IGNORE', + 'UTF-8', + 'ISO-8859-1//IGNORE', 'Euro Symbol: €' ), array( - 'UTF-8', - 'ISO-8859-1//IGNORE//TRANSLIT', - 'UTF-8', - 'ISO-8859-1//IGNORE', + 'UTF-8', + 'ISO-8859-1//IGNORE//TRANSLIT', + 'UTF-8', + 'ISO-8859-1//IGNORE', 'Euro Symbol: €' ), - array('UTF-8', - 'ISO-8859-9', - 'UTF-8', - 'ISO8859-9', + array('UTF-8', + 'ISO-8859-9', + 'UTF-8', + 'ISO8859-9', 'Testing "string"' ) ); diff --git a/test/libraries/PMA_kanji-encoding_test.php b/test/libraries/PMA_kanji-encoding_test.php index ac63d19d1e..5bdf40a67e 100644 --- a/test/libraries/PMA_kanji-encoding_test.php +++ b/test/libraries/PMA_kanji-encoding_test.php @@ -1,7 +1,7 @@ assertTrue(PMA_Kanji_checkEncoding()); $this->assertEquals($expected, $GLOBALS['kanji_encoding_list']); - } - /** * Data provider for testPMA_Kanji_checkEncoding + * * @return array Test data */ - public function checkEncodingData() { + public function checkEncodingData() + { return array( array('UTF-8', 'ASCII,SJIS,EUC-JP,JIS'), array('EUC-JP', 'ASCII,EUC-JP,SJIS,JIS') ); } - /** * Test for PMA_Kanji_changeOrder - * @param string $kanji_test_list current list - * @param string $expected expected list - * + * + * @param string $kanji_test_list current list + * @param string $expected expected list + * * @return void - * + * * @dataProvider changeOrderData */ - public function testPMA_Kanji_changeOrder($kanji_test_list, $expected) { + public function testChangeOrder($kanji_test_list, $expected) + { $GLOBALS['kanji_encoding_list'] = $kanji_test_list; $this->assertTrue(PMA_Kanji_changeOrder()); $this->assertEquals($expected, $GLOBALS['kanji_encoding_list']); } - /** * Data Provider for testPMA_Kanji_changeOrder - * + * * @return array Test data */ - public function changeOrderData() { + public function changeOrderData() + { return array( array('ASCII,SJIS,EUC-JP,JIS', 'ASCII,EUC-JP,SJIS,JIS'), array('ASCII,EUC-JP,SJIS,JIS', 'ASCII,SJIS,EUC-JP,JIS') ); } - /** * Test for PMA_Kanji_strConv - * + * * @return void */ - public function testPMA_Kanji_strConv() { - + public function testStrConv() + { $this->assertEquals( - 'test', + 'test', PMA_Kanji_strConv('test', '', '') ); - + $GLOBALS['kanji_encoding_list'] = 'ASCII,SJIS,EUC-JP,JIS'; - + $this->assertEquals( - 'test è', + 'test è', PMA_Kanji_strConv('test è', '', '') ); - + $this->assertEquals( - mb_convert_encoding('test è', 'ASCII', 'SJIS'), + mb_convert_encoding('test è', 'ASCII', 'SJIS'), PMA_Kanji_strConv('test è', 'ASCII', '') ); $this->assertEquals( - mb_convert_kana('全角', 'KV', 'SJIS'), + mb_convert_kana('全角', 'KV', 'SJIS'), PMA_Kanji_strConv('全角', '', 'kana') ); - } /** * Test for PMA_Kanji_fileConv - * + * * @return void */ - public function testPMA_Kanji_fileConv() { - + public function testFileConv() + { $file_str = "教育漢字常用漢字"; $filename = 'test.kanji'; $file = fopen($filename, 'w'); @@ -128,41 +131,37 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase PMA_Kanji_changeOrder(); $this->assertEquals($string, $expected); unlink($result); - } /** * Test for PMA_Kanji_encodingForm - * + * * @return void */ - public function testPMA_Kanji_encodingForm() { - + public function testEncodingForm() + { $actual = PMA_Kanji_encodingForm(); $this->assertContains( - 'assertContains( - 'type="radio" name="knjenc"', + 'type="radio" name="knjenc"', $actual ); $this->assertContains( - '', + '', $actual ); $this->assertContains( - '', + '', $actual ); $this->assertContains( - '', + '', $actual ); - } - - } ?> diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php index d6719421c5..206f0d48df 100644 --- a/test/libraries/PMA_mysql_charsets_test.php +++ b/test/libraries/PMA_mysql_charsets_test.php @@ -1,7 +1,7 @@ markTestSkipped( 'Cannot redefine constant/function - missing APD or/and runkit extension' ); - } else { - if (defined('PMA_DRIZZLE')) { runkit_constant_redefine('PMA_DRIZZLE', $drizzle); } else { @@ -45,17 +43,15 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase } $this->assertEquals( - $expected, + $expected, PMA_generateCharsetQueryPart($collation) ); - } } - /** * Data Provider for testPMA_generateCharsetQueryPart - * + * * @return array test data */ public function charsetQueryData() @@ -68,27 +64,23 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase ); } - + /** * Test for PMA_getDbCollation * * @return void - * + * */ - public function testPMA_getDbCollation() + public function testGetDbCollation() { - - if (!function_exists("runkit_constant_redefine")) { - + if (! function_exists("runkit_constant_redefine")) { $this->markTestSkipped( 'Cannot redefine constant/function - missing APD or/and runkit extension' ); - } else { - // test case for system schema $this->assertEquals( - 'utf8_general_ci', + 'utf8_general_ci', PMA_getDbCollation("information_schema") ); @@ -111,8 +103,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase 'utf8_general_ci_pma_drizzle', PMA_getDbCollation('pma_test') ); - - + $GLOBALS['cfg']['Server']['DisableIS'] = true; $GLOBALS['db'] = 'pma_test2'; $this->assertEquals( @@ -124,33 +115,32 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase $GLOBALS['dummy_db'] ); } - } - /** * Test case for PMA_getCollationDescr() - * + * * @param string $collation Collation for which description is reqd - * @param string $desc Expected Description - * + * @param string $desc Expected Description + * * @return void * @dataProvider collationDescr */ - public function testPMA_getCollationDescr($collation, $desc) { + public function testGetCollationDescr($collation, $desc) + { $this->assertEquals( $desc, PMA_getCollationDescr($collation) ); } - /** * Data Provider for testPMA_getCollationDescr() - * + * * @return array Test data for testPMA_getCollationDescr() */ - public function collationDescr() { + public function collationDescr() + { return array( array('binary', 'Binary'), array('foo_bulgarian_bar', 'Bulgarian'), @@ -227,37 +217,36 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase ); } - /** * Test for PMA_generateCharsetDropdownBox - * + * * @return void */ - public function testPMA_generateCharsetDropdownBox() { - + public function testGenerateCharsetDropdownBox() + { $GLOBALS['mysql_charsets'] = array('latin1', 'latin2', 'latin3'); $GLOBALS['mysql_charsets_available'] = array( - 'latin1' => true, - 'latin2' => false, - 'latin3' => true - ); + 'latin1' => true, + 'latin2' => false, + 'latin3' => true + ); $GLOBALS['mysql_charsets_descriptions'] = array( - 'latin1' => 'abc', - 'latin2' => 'def' - ); + 'latin1' => 'abc', + 'latin2' => 'def' + ); $GLOBALS['mysql_collations'] = array( - 'latin1' => array( - 'latin1_german1_ci', - 'latin1_swedish1_ci' - ), - 'latin2' => array('latin1_general_ci'), - 'latin3' => array() - ); + 'latin1' => array( + 'latin1_german1_ci', + 'latin1_swedish1_ci' + ), + 'latin2' => array('latin1_general_ci'), + 'latin3' => array() + ); $GLOBALS['mysql_collations_available'] = array( - 'latin1_german1_ci' => true, - 'latin1_swedish1_ci' => false, - 'latin2_general_ci' => true - ); + 'latin1_german1_ci' => true, + 'latin1_swedish1_ci' => false, + 'latin2_general_ci' => true + ); $result = PMA_generateCharsetDropdownBox(); $this->assertContains('name="collation"', $result); @@ -274,8 +263,8 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase $this->assertNotContains('value="latin2_general1_ci"', $result); $this->assertContains('title="German', $result); - $result = PMA_generateCharsetDropdownBox(2, null, "test_id", "latin1", - false, 0, true, false + $result = PMA_generateCharsetDropdownBox( + 2, null, "test_id", "latin1", false, 0, true, false ); $this->assertContains('name="character_set"', $result); $this->assertNotContains('Charset', $result); @@ -284,17 +273,15 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase $this->assertContains('selected="selected">latin1', $result); } - /** * Test for PMA_getServerCollation - * + * * @return void */ - public function testPMA_getServerCollation() { - + public function testGetServerCollation() + { $GLOBALS['cfg']['DBG']['sql'] = false; $this->assertEquals('utf8_general_ci', PMA_getServerCollation()); - } } ?> From ca3c8a0383f4dd094bcd5cd368b4ec1786d030f0 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 13 Jun 2013 00:39:44 +0530 Subject: [PATCH 10/10] Optional @test annotation for tests --- test/libraries/PMA_charset_conversion_test.php | 2 +- test/libraries/PMA_iconv_wrapper_test.php | 1 + test/libraries/PMA_kanji-encoding_test.php | 7 +++++-- test/libraries/PMA_mysql_charsets_test.php | 6 +++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/test/libraries/PMA_charset_conversion_test.php b/test/libraries/PMA_charset_conversion_test.php index 238736bc91..15be6c8958 100644 --- a/test/libraries/PMA_charset_conversion_test.php +++ b/test/libraries/PMA_charset_conversion_test.php @@ -23,6 +23,7 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase * Test for PMA_convertString * * @return void + * @test */ public function testCharsetConversion() { @@ -39,7 +40,6 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase ); // TODO: remove function_exists if recode_string exists on server - if (@function_exists('recode_string')) { $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_RECODE; $this->assertEquals( diff --git a/test/libraries/PMA_iconv_wrapper_test.php b/test/libraries/PMA_iconv_wrapper_test.php index c702df6b3a..22be08e6a4 100644 --- a/test/libraries/PMA_iconv_wrapper_test.php +++ b/test/libraries/PMA_iconv_wrapper_test.php @@ -29,6 +29,7 @@ class PMA_Iconv_Wrapper_Test extends PHPUnit_Framework_TestCase * @param string $str String to test * * @return void + * @test * @dataProvider iconvDataProvider */ public function testIconvWrapper($in_charset, $out_charset, diff --git a/test/libraries/PMA_kanji-encoding_test.php b/test/libraries/PMA_kanji-encoding_test.php index 5bdf40a67e..fcbdec9401 100644 --- a/test/libraries/PMA_kanji-encoding_test.php +++ b/test/libraries/PMA_kanji-encoding_test.php @@ -25,7 +25,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase * @param string $expected Expected encoding list * * @return void - * + * @test * @dataProvider checkEncodingData */ public function testCheckEncoding($encoding, $expected) @@ -55,7 +55,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase * @param string $expected expected list * * @return void - * + * @test * @dataProvider changeOrderData */ public function testChangeOrder($kanji_test_list, $expected) @@ -82,6 +82,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase * Test for PMA_Kanji_strConv * * @return void + * @test */ public function testStrConv() { @@ -113,6 +114,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase * Test for PMA_Kanji_fileConv * * @return void + * @test */ public function testFileConv() { @@ -138,6 +140,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase * Test for PMA_Kanji_encodingForm * * @return void + * @test */ public function testEncodingForm() { diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php index 206f0d48df..4d817abac9 100644 --- a/test/libraries/PMA_mysql_charsets_test.php +++ b/test/libraries/PMA_mysql_charsets_test.php @@ -26,6 +26,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase * @param string $expected Expected Charset Query * * @return void + * @test * @dataProvider charsetQueryData */ public function testGenerateCharsetQueryPart( @@ -69,7 +70,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase * Test for PMA_getDbCollation * * @return void - * + * @test */ public function testGetDbCollation() { @@ -124,6 +125,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase * @param string $desc Expected Description * * @return void + * @test * @dataProvider collationDescr */ public function testGetCollationDescr($collation, $desc) @@ -221,6 +223,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase * Test for PMA_generateCharsetDropdownBox * * @return void + * @test */ public function testGenerateCharsetDropdownBox() { @@ -277,6 +280,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase * Test for PMA_getServerCollation * * @return void + * @test */ public function testGetServerCollation() {