From b6dc5e92da48e17600e04d9bc124fb9d3460e767 Mon Sep 17 00:00:00 2001 From: xmujay Date: Thu, 18 Jul 2013 20:36:49 +0800 Subject: [PATCH 1/4] Uts for PMA_server_status --- test/libraries/PMA_server_status_test.php | 227 ++++++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 test/libraries/PMA_server_status_test.php diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php new file mode 100644 index 0000000000..d31b55ea84 --- /dev/null +++ b/test/libraries/PMA_server_status_test.php @@ -0,0 +1,227 @@ +getMockBuilder('PMA_DatabaseInterface') + ->disableOriginalConstructor() + ->getMock(); + + //this data is needed when PMA_ServerStatusData constructs + $server_status = array( + "Aborted_clients" => "0", + "Aborted_connects" => "0", + "Com_delete_multi" => "0", + "Com_create_function" => "0", + "Com_empty_query" => "0", + ); + + $server_variables= array( + "auto_increment_increment" => "1", + "auto_increment_offset" => "1", + "automatic_sp_privileges" => "ON", + "back_log" => "50", + "big_tables" => "OFF", + ); + + $fetchResult = array( + array( + "SHOW GLOBAL STATUS", + 0, + 1, + null, + 0, + $server_status + ), + array( + "SHOW GLOBAL VARIABLES", + 0, + 1, + null, + 0, + $server_variables + ), + array( + "SELECT concat('Com_', variable_name), variable_value " + . "FROM data_dictionary.GLOBAL_STATEMENTS", + 0, + 1, + null, + 0, + $server_status + ), + ); + + $dbi->expects($this->any())->method('fetchResult') + ->will($this->returnValueMap($fetchResult)); + + $GLOBALS['dbi'] = $dbi; + + $this->ServerStatusData = new PMA_ServerStatusData(); + } + + /** + * Test for PMA_getHtmlForServerStatus + * + * @return void + */ + public function testPMAGetHtmlForServerStatus() + { + //paramaters + $upTime = "10h"; + $bytes_received = 100; + $bytes_sent = 200; + $max_used_conn = 500; + $aborted_conn = 200; + $conn = 1000; + $this->ServerStatusData->status['Uptime'] = $upTime; + $this->ServerStatusData->status['Bytes_received'] = $bytes_received; + $this->ServerStatusData->status['Bytes_sent'] = $bytes_sent; + $this->ServerStatusData->status['Max_used_connections'] = $max_used_conn; + $this->ServerStatusData->status['Aborted_connects'] = $aborted_conn; + $this->ServerStatusData->status['Connections'] = $conn; + + //Call the test function + $html = PMA_getHtmlForServerStatus($this->ServerStatusData); + + //validate 1: PMA_getHtmlForServerStateGeneralInfo + //traffic: $bytes_received + $bytes_sent + $traffic = $bytes_received + $bytes_sent; + $traffic_html = 'Network traffic since startup: ' . $traffic . ' B'; + $this->assertContains( + $traffic_html, + $html + ); + //updatetime + $upTime_html = 'This MySQL server has been running for ' + . '0 days, 0 hours, 0 minutes and 10h seconds'; + $this->assertContains( + $upTime_html, + $html + ); + //master state + $master_html = 'This MySQL server works as master'; + $this->assertContains( + $master_html, + $html + ); + + //validate 2: PMA_getHtmlForServerStateTraffic + $traffic_html = ''; + $this->assertContains( + $traffic_html, + $html + ); + //traffic hint + $traffic_html = 'On a busy server, the byte counters may overrun'; + $this->assertContains( + $traffic_html, + $html + ); + //$bytes_received + $this->assertContains( + '
' . $bytes_received . ' B', + $html + ); + //$bytes_sent + $this->assertContains( + '' . $bytes_sent . ' B', + $html + ); + + //validate 3: PMA_getHtmlForServerStateConnections + $this->assertContains( + '', + $html + ); + $this->assertContains( + '', + $html + ); + //Max_used_connections + $this->assertContains( + '
max. concurrent connections' . $max_used_conn, + $html + ); + //Aborted_connects + $this->assertContains( + '' . $aborted_conn, + $html + ); + } +} + From d835def51336abb0a685f2cdfc9ef0c241eb37ba Mon Sep 17 00:00:00 2001 From: Spun Nakandala Date: Thu, 18 Jul 2013 18:35:23 +0530 Subject: [PATCH 2/4] added missing parameter --- libraries/sql.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 6ec9efa841..6356cc2a64 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1919,10 +1919,11 @@ function PMA_getMessageIfMissingColumnIndex($table, $db, $editable, $disp_mode) * * @param string $query_type query type * @param boolean $selected selected + * @param string $db current database * * @return void */ -function PMA_getHtmlForIndexesProblems($query_type, $selected) +function PMA_getHtmlForIndexesProblems($query_type, $selected, $db) { // BEGIN INDEX CHECK See if indexes should be checked. if (isset($query_type) @@ -2107,7 +2108,7 @@ function PMA_sendResponseForResultsReturned($result, $justBrowsing, $indexes_problems_html = PMA_getHtmlForIndexesProblems( isset($query_type) ? $query_type : null, - isset($selected) ? $selected : null + isset($selected) ? $selected : null, $db ); $bookmark_support_html = PMA_getHtmlForBookmark( From 378f1978afa554eb5739d876376b75b0430811c7 Mon Sep 17 00:00:00 2001 From: Ballen Abdulkarim Date: Thu, 18 Jul 2013 14:40:28 +0200 Subject: [PATCH 3/4] Translated using Weblate (Kurdish Sorani) Currently translated at 19.8% (530 of 2680) --- po/ckb.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index 9949c14fe9..59afd40089 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,23 +8,22 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-12 16:06+0200\n" -"PO-Revision-Date: 2012-12-24 08:51+0200\n" -"Last-Translator: karwan hidayat \n" -"Language-Team: Kurdish Sorani \n" +"PO-Revision-Date: 2013-07-18 14:40+0200\n" +"Last-Translator: Ballen Abdulkarim \n" +"Language-Team: Kurdish Sorani " +"\n" "Language: ckb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.4-dev\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339 #: libraries/DisplayResults.class.php:813 #: libraries/server_privileges.lib.php:2652 -#, fuzzy msgid "Show all" -msgstr "هەمووی پێشاندە" +msgstr "هه‌مووی ببینه‌" #: browse_foreigners.php:93 libraries/PDF.class.php:70 #: libraries/Util.class.php:2559 From 07a9bed3e240372114dba9f54e71dc750c362967 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 18 Jul 2013 11:17:52 -0400 Subject: [PATCH 4/4] Fix typo --- js/rte.js | 2 +- test/libraries/PMA_server_status_test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/rte.js b/js/rte.js index fb19666a2f..1acb9ab894 100644 --- a/js/rte.js +++ b/js/rte.js @@ -831,7 +831,7 @@ $(function () { var $routine_params_table = $(this).closest('div.ui-dialog').find('.routine_params_table'); /** * @var new_param_row A string containing the HTML code for the - * new row for the routine paramaters table + * new row for the routine parameters table */ var new_param_row = RTE.param_template.replace(/%s/g, $routine_params_table.find('tr').length - 1); // Append the new row to the parameters table diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php index d31b55ea84..c19eeac673 100644 --- a/test/libraries/PMA_server_status_test.php +++ b/test/libraries/PMA_server_status_test.php @@ -141,7 +141,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase */ public function testPMAGetHtmlForServerStatus() { - //paramaters + //parameters $upTime = "10h"; $bytes_received = 100; $bytes_sent = 200;