From a74ecf5034eca0caa521bacde8474062cf0317f0 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Sat, 6 Jul 2013 20:19:41 +0800
Subject: [PATCH 1/5] Unit test case for PMA_server_status_variables

---
 libraries/ServerStatusData.class.php          |   6 +-
 .../PMA_server_status_variables_test.php      | 216 ++++++++++++++++++
 2 files changed, 220 insertions(+), 2 deletions(-)
 create mode 100644 test/libraries/PMA_server_status_variables_test.php

diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php
index 17ed188dbf..18676bf42a 100644
--- a/libraries/ServerStatusData.class.php
+++ b/libraries/ServerStatusData.class.php
@@ -6,8 +6,10 @@
  *
  * @package PhpMyAdmin
  */
-
-require_once 'libraries/common.inc.php';
+if (!defined('TESTSUITE')) {
+    //the TESTSUITE has already included common.inc.php
+    require_once 'libraries/common.inc.php';
+}
 
 /**
  * This class provides data about the server status
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
new file mode 100644
index 0000000000..733155e59a
--- /dev/null
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -0,0 +1,216 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for server_status_variables.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/Util.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/ServerStatusData.class.php';
+require_once 'libraries/server_status_variables.lib.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/database_interface.inc.php';
+require_once 'libraries/Message.class.php';
+require_once 'libraries/sanitizing.lib.php';
+require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/js_escape.lib.php';
+
+class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+	public $ServerStatusData;
+	
+    public function setUp()
+    {
+        //$_REQUEST
+        $_REQUEST['log'] = "index1";
+        $_REQUEST['pos'] = 3;
+        
+        //$GLOBALS
+        $GLOBALS['cfg']['MaxRows'] = 10;
+        $GLOBALS['cfg']['ServerDefault'] = "server";
+        $GLOBALS['cfg']['RememberSorting'] = true;
+        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
+        $GLOBALS['cfg']['ShowSQL'] = true;
+        $GLOBALS['cfg']['SQP']['fmtType'] = 'none';
+        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
+        $GLOBALS['cfg']['LimitChars'] = 100;
+        $GLOBALS['cfg']['DBG']['sql'] = false;
+        $GLOBALS['cfg']['Server']['host'] = "localhost";   
+        $GLOBALS['cfg']['MySQLManualType'] = 'viewable';  
+        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
+        $GLOBALS['server_master_status'] = false;
+        $GLOBALS['server_slave_status'] = false;
+        
+        $GLOBALS['table'] = "table";
+        $GLOBALS['pmaThemeImage'] = 'image';
+        
+        //$_SESSION
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+
+        //Mock DBI
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+        ->disableOriginalConstructor()
+        ->getMock();
+        
+        $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",
+        );
+        
+        $dbi->expects($this->at(0))->method('fetchResult')
+        ->with('SHOW GLOBAL STATUS', 0, 1)
+        ->will($this->returnValue($server_status));
+        
+        $server_variables = array();
+        $dbi->expects($this->at(1))->method('fetchResult')
+        ->with('SHOW GLOBAL VARIABLES', 0, 1)
+        ->will($this->returnValue($server_variables));
+         
+        $GLOBALS['dbi'] = $dbi;
+        $this->ServerStatusData = new PMA_ServerStatusData();
+    }
+
+    /**
+     * Test for PMA_getHtmlForFilter
+     *
+     * @return void
+     */
+    public function testPMA_getHtmlForFilter()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForFilter($this->ServerStatusData);
+        		
+        //validate 1: PMA_getHtmlForFilter
+        $this->assertContains(
+            'server_status_variables.php',
+            $html
+        );
+        //validate 2: filter
+        $this->assertContains(
+            '<label for="filterText">Containing the word:</label>',
+            $html
+        );
+        //validate 3:Items
+        $this->assertContains(
+            '<label for="filterAlert">Show only alert values</label>',
+            $html
+        );
+        $this->assertContains(
+            'Filter by category',
+            $html
+        );
+        $this->assertContains(
+            'Show unformatted values',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForLinkSuggestions
+     *
+     * @return void
+     */
+    public function testPMA_getHtmlForLinkSuggestions()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForLinkSuggestions($this->ServerStatusData);
+        		
+        //validate 1: PMA_getHtmlForLinkSuggestions
+        $this->assertContains(
+            '<div id="linkSuggestions" class="defaultLinks"',
+            $html
+        );
+        //validate 2: linkSuggestions
+        $this->assertContains(
+            '<p class="notice">Related links:',
+            $html
+        );
+        $this->assertContains(
+            'Flush (close) all tables',
+            $html
+        );
+        $this->assertContains(
+            '<span class="status_binlog_cache">',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForVariablesList
+     *
+     * @return void
+     */
+    public function testPMA_getHtmlForVariablesList()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForVariablesList($this->ServerStatusData);
+        		
+        //validate 1: PMA_getHtmlForVariablesList
+        $this->assertContains(
+            '<table class="data sortable noclick" id="serverstatusvariables">',
+            $html
+        );
+        $this->assertContains(
+            '<th>Variable</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th>Value</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th>Description</th>',
+            $html
+        );
+        //validate 3:Items
+        $this->assertContains(
+            '<th class="name">Aborted clients</th>',
+            $html
+        );
+        $this->assertContains(
+            '<span class="allfine">0</span>',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Aborted connects</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Com delete multi</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Com create function</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Com empty query</th>',
+            $html
+        );
+    }
+}
+

From 480a6ede4f75fecccc1431f37b6879c6f2a88766 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Sat, 6 Jul 2013 20:38:31 +0800
Subject: [PATCH 2/5] Unit test case for PMA_server_status_monitor

---
 .../PMA_server_status_monitor_test.php        | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 test/libraries/PMA_server_status_monitor_test.php

diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
new file mode 100644
index 0000000000..5e960e43aa
--- /dev/null
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -0,0 +1,180 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for PMA_server_status_monitor.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/Util.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/ServerStatusData.class.php';
+require_once 'libraries/server_status_monitor.lib.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/database_interface.inc.php';
+require_once 'libraries/Message.class.php';
+require_once 'libraries/sanitizing.lib.php';
+require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/js_escape.lib.php';
+
+class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+	public $ServerStatusData;
+	
+    public function setUp()
+    {
+        //$_REQUEST
+        $_REQUEST['log'] = "index1";
+        $_REQUEST['pos'] = 3;
+        
+        //$GLOBALS
+        $GLOBALS['cfg']['MaxRows'] = 10;
+        $GLOBALS['cfg']['ServerDefault'] = "server";
+        $GLOBALS['cfg']['RememberSorting'] = true;
+        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
+        $GLOBALS['cfg']['ShowSQL'] = true;
+        $GLOBALS['cfg']['SQP']['fmtType'] = 'none';
+        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
+        $GLOBALS['cfg']['LimitChars'] = 100;
+        $GLOBALS['cfg']['DBG']['sql'] = false;
+        $GLOBALS['cfg']['Server']['host'] = "localhost";   
+        $GLOBALS['cfg']['MySQLManualType'] = 'viewable';  
+        $GLOBALS['cfg']['ShowHint'] = true;
+        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
+        $GLOBALS['server_master_status'] = false;
+        $GLOBALS['server_slave_status'] = false;
+        
+        $GLOBALS['table'] = "table";
+        $GLOBALS['pmaThemeImage'] = 'image';
+        
+        //$_SESSION
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+
+        //Mock DBI
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+        ->disableOriginalConstructor()
+        ->getMock();
+        
+        $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",
+        );
+        
+        $dbi->expects($this->at(0))->method('fetchResult')
+        ->with('SHOW GLOBAL STATUS', 0, 1)
+        ->will($this->returnValue($server_status));
+        
+        $server_variables = array();
+        $dbi->expects($this->at(1))->method('fetchResult')
+        ->with('SHOW GLOBAL VARIABLES', 0, 1)
+        ->will($this->returnValue($server_variables));
+         
+        $GLOBALS['dbi'] = $dbi;
+        $this->ServerStatusData = new PMA_ServerStatusData();
+    }
+
+    /**
+     * Test for PMA_getHtmlForMonitor
+     *
+     * @return void
+     */
+    public function testPMA_getHtmlForMonitor()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForMonitor($this->ServerStatusData);
+        		
+        //validate 1: PMA_getHtmlForTabLinks
+        $this->assertContains(
+            '<div class="tabLinks">',
+            $html
+        );
+        $this->assertContains(
+            'Start Monitor',
+            $html
+        );	
+        //validate 2: PMA_getHtmlForSettingsDialog
+        $this->assertContains(
+            '<a href="#settingsPopup" class="popupLink">',
+            $html
+        );        		
+        //validate 3: PMA_getHtmlForInstructionsDialog
+        $this->assertContains(
+            'Instructions/Setup',
+            $html
+        ); 
+        $this->assertContains(
+            'Settings</a><a href="#monitorInstructionsDialog">',
+            $html
+        );        	
+        //validate 4: PMA_getHtmlForAddChartDialog
+        $this->assertContains(
+            'a href="#addNewChart">',
+            $html
+        );
+        $this->assertContains(
+            'Done dragging (rearranging) charts',
+            $html
+        );
+        $this->assertContains(
+            'Enable charts dragging',
+            $html
+        );
+        $this->assertContains(
+            '<option>3</option>',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForClientSideDataAndLinks
+     *
+     * @return void
+     */
+    public function testPMA_getHtmlForClientSideDataAndLinks()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForClientSideDataAndLinks($this->ServerStatusData);
+        		
+        //validate 1: PMA_getHtmlForClientSideDataAndLinks
+        $this->assertContains(
+            '<form id="js_data" class="hide"><input type="hidden" name="server_time"',
+            $html
+        );
+        //validate 2: inputs
+        $this->assertContains(
+            '<input type="hidden" name="is_superuser"',
+            $html
+        );
+        $this->assertContains(
+            '<input type="hidden" name="server_db_isLocal"',
+            $html
+        );
+        $this->assertContains(
+            '<div id="explain_docu" class="hide">',
+            $html
+        );
+    }
+}
+

From 6e49cd481ace5330e6f76d7f974bdf8f2fe5930c Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Mon, 8 Jul 2013 20:00:53 +0800
Subject: [PATCH 3/5] fix the code style

---
 .../PMA_server_status_monitor_test.php        | 91 +++++++++++++------
 .../PMA_server_status_variables_test.php      | 64 +++++++------
 2 files changed, 100 insertions(+), 55 deletions(-)

diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
index 5e960e43aa..716c33af36 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -28,8 +28,13 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-	public $ServerStatusData;
-	
+    public $ServerStatusData;
+
+    /**
+     * Test for setUp
+     *
+     * @return void
+     */
     public function setUp()
     {
         //$_REQUEST
@@ -63,35 +68,37 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
 
         //Mock DBI
         $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
-        ->disableOriginalConstructor()
-        ->getMock();
+            ->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",
+            "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",
+            "auto_increment_increment" => "1",
+            "auto_increment_offset" => "1",
+            "automatic_sp_privileges" => "ON",
+            "back_log" => "50",
+            "big_tables" => "OFF",
         );
         
         $dbi->expects($this->at(0))->method('fetchResult')
-        ->with('SHOW GLOBAL STATUS', 0, 1)
-        ->will($this->returnValue($server_status));
+            ->with('SHOW GLOBAL STATUS', 0, 1)
+            ->will($this->returnValue($server_status));
         
         $server_variables = array();
         $dbi->expects($this->at(1))->method('fetchResult')
-        ->with('SHOW GLOBAL VARIABLES', 0, 1)
-        ->will($this->returnValue($server_variables));
+            ->with('SHOW GLOBAL VARIABLES', 0, 1)
+            ->will($this->returnValue($server_variables));
          
         $GLOBALS['dbi'] = $dbi;
+        
         $this->ServerStatusData = new PMA_ServerStatusData();
     }
 
@@ -100,26 +107,50 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_getHtmlForMonitor()
+    public function testPMAGetHtmlForMonitor()
     {
         //Call the test function          
         $html = PMA_getHtmlForMonitor($this->ServerStatusData);
-        		
+
         //validate 1: PMA_getHtmlForTabLinks
         $this->assertContains(
             '<div class="tabLinks">',
             $html
         );
         $this->assertContains(
-            'Start Monitor',
+            __('Start Monitor'),
+            $html
+        );	
+        $this->assertContains(
+            __('Settings'),
+            $html
+        );		
+        $this->assertContains(
+            __('Done dragging (rearranging) charts'),
             $html
         );	
         //validate 2: PMA_getHtmlForSettingsDialog
+        $this->assertContains(
+            '<div class="popupContent settingsPopup">',
+            $html
+        );  
         $this->assertContains(
             '<a href="#settingsPopup" class="popupLink">',
             $html
-        );        		
+        );   
+        $this->assertContains(
+            __('Enable charts dragging'),
+            $html
+        );   
+        $this->assertContains(
+            '<option>3</option>',
+            $html
+        );      		
         //validate 3: PMA_getHtmlForInstructionsDialog
+        $this->assertContains(
+            __('Monitor Instructions'),
+            $html
+        ); 
         $this->assertContains(
             'Instructions/Setup',
             $html
@@ -130,19 +161,19 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
         );        	
         //validate 4: PMA_getHtmlForAddChartDialog
         $this->assertContains(
-            'a href="#addNewChart">',
+            '<div id="addChartDialog"',
             $html
         );
         $this->assertContains(
-            'Done dragging (rearranging) charts',
+            '<div id="chartVariableSettings">',
             $html
         );
         $this->assertContains(
-            'Enable charts dragging',
+            '<option>Processes</option>',
             $html
         );
         $this->assertContains(
-            '<option>3</option>',
+            '<option>Connections</option>',
             $html
         );
     }
@@ -152,14 +183,16 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_getHtmlForClientSideDataAndLinks()
+    public function testPMAGetHtmlForClientSideDataAndLinks()
     {
         //Call the test function          
         $html = PMA_getHtmlForClientSideDataAndLinks($this->ServerStatusData);
-        		
+
         //validate 1: PMA_getHtmlForClientSideDataAndLinks
+        $from = '<form id="js_data" class="hide">' 
+            . '<input type="hidden" name="server_time"';
         $this->assertContains(
-            '<form id="js_data" class="hide"><input type="hidden" name="server_time"',
+            $from,
             $html
         );
         //validate 2: inputs
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index 733155e59a..64f0be796d 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -28,8 +28,13 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-	public $ServerStatusData;
-	
+    public $ServerStatusData;
+
+    /**
+     * Test for setUp
+     *
+     * @return void
+     */
     public function setUp()
     {
         //$_REQUEST
@@ -62,33 +67,34 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
 
         //Mock DBI
         $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
-        ->disableOriginalConstructor()
-        ->getMock();
-        
+            ->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",
+            "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",
+            "auto_increment_increment" => "1",
+            "auto_increment_offset" => "1",
+            "automatic_sp_privileges" => "ON",
+            "back_log" => "50",
+            "big_tables" => "OFF",
         );
         
         $dbi->expects($this->at(0))->method('fetchResult')
-        ->with('SHOW GLOBAL STATUS', 0, 1)
-        ->will($this->returnValue($server_status));
+            ->with('SHOW GLOBAL STATUS', 0, 1)
+            ->will($this->returnValue($server_status));
         
         $server_variables = array();
         $dbi->expects($this->at(1))->method('fetchResult')
-        ->with('SHOW GLOBAL VARIABLES', 0, 1)
-        ->will($this->returnValue($server_variables));
+            ->with('SHOW GLOBAL VARIABLES', 0, 1)
+            ->will($this->returnValue($server_variables));
          
         $GLOBALS['dbi'] = $dbi;
         $this->ServerStatusData = new PMA_ServerStatusData();
@@ -99,12 +105,16 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_getHtmlForFilter()
+    public function testPMAGetHtmlForFilter()
     {
         //Call the test function          
         $html = PMA_getHtmlForFilter($this->ServerStatusData);
-        		
+
         //validate 1: PMA_getHtmlForFilter
+        $this->assertContains(
+            '<fieldset id="tableFilter">',
+            $html
+        );
         $this->assertContains(
             'server_status_variables.php',
             $html
@@ -134,11 +144,11 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_getHtmlForLinkSuggestions()
+    public function testPMAGetHtmlForLinkSuggestions()
     {
         //Call the test function          
         $html = PMA_getHtmlForLinkSuggestions($this->ServerStatusData);
-        		
+
         //validate 1: PMA_getHtmlForLinkSuggestions
         $this->assertContains(
             '<div id="linkSuggestions" class="defaultLinks"',
@@ -164,14 +174,16 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_getHtmlForVariablesList()
+    public function testPMAGetHtmlForVariablesList()
     {
         //Call the test function          
         $html = PMA_getHtmlForVariablesList($this->ServerStatusData);
-        		
+
         //validate 1: PMA_getHtmlForVariablesList
+        $table = '<table class="data sortable noclick" ' 
+            . 'id="serverstatusvariables">';
         $this->assertContains(
-            '<table class="data sortable noclick" id="serverstatusvariables">',
+            $table,
             $html
         );
         $this->assertContains(

From 40fb7773c8ce0e6c60123828e4d2577575a5ff65 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Mon, 8 Jul 2013 22:08:36 +0800
Subject: [PATCH 4/5] fix assertion

---
 test/libraries/PMA_server_status_variables_test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index 64f0be796d..8a5eec7f9f 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -200,7 +200,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
         );
         //validate 3:Items
         $this->assertContains(
-            '<th class="name">Aborted clients</th>',
+            '<th class="name">Aborted clients',
             $html
         );
         $this->assertContains(
@@ -208,19 +208,19 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            '<th class="name">Aborted connects</th>',
+            '<th class="name">Aborted connects',
             $html
         );
         $this->assertContains(
-            '<th class="name">Com delete multi</th>',
+            '<th class="name">Com delete multi',
             $html
         );
         $this->assertContains(
-            '<th class="name">Com create function</th>',
+            '<th class="name">Com create function',
             $html
         );
         $this->assertContains(
-            '<th class="name">Com empty query</th>',
+            '<th class="name">Com empty query',
             $html
         );
     }

From 781b4ef722e7d1d61dcb7867eee348b3bac07a60 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Tue, 9 Jul 2013 10:17:46 +0800
Subject: [PATCH 5/5] add class Doc for UT files (server view files)

---
 test/libraries/PMA_server_binlog_test.php           | 7 +++++++
 test/libraries/PMA_server_collations_test.php       | 7 +++++++
 test/libraries/PMA_server_common_test.php           | 7 +++++++
 test/libraries/PMA_server_engines_test.php          | 7 +++++++
 test/libraries/PMA_server_plugins_test.php          | 7 +++++++
 test/libraries/PMA_server_status_monitor_test.php   | 7 +++++++
 test/libraries/PMA_server_status_variables_test.php | 7 +++++++
 7 files changed, 49 insertions(+)

diff --git a/test/libraries/PMA_server_binlog_test.php b/test/libraries/PMA_server_binlog_test.php
index 478fef3bbd..568c8ce600 100644
--- a/test/libraries/PMA_server_binlog_test.php
+++ b/test/libraries/PMA_server_binlog_test.php
@@ -20,6 +20,13 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ * PMA_ServerBinlog_Test class
+ *
+ * this class is for testing server_bin_log.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerBinlog_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_collations_test.php b/test/libraries/PMA_server_collations_test.php
index aad4eccb39..8c94411cb8 100644
--- a/test/libraries/PMA_server_collations_test.php
+++ b/test/libraries/PMA_server_collations_test.php
@@ -39,6 +39,13 @@ require_once 'libraries/server_common.inc.php';
 require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/server_collations.lib.php';
 
+/**
+ * PMA_ServerBinlog_Test class
+ *
+ * this class is for testing server_collations.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerCollations_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_common_test.php b/test/libraries/PMA_server_common_test.php
index ce2c20788a..1c39b31dca 100644
--- a/test/libraries/PMA_server_common_test.php
+++ b/test/libraries/PMA_server_common_test.php
@@ -15,6 +15,13 @@ require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/server_common.lib.php';
 require_once 'libraries/Theme.class.php';
 
+/**
+ * PMA_ServerCommon_Test class
+ *
+ * this class is for testing server_common.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerCommon_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_engines_test.php b/test/libraries/PMA_server_engines_test.php
index 50702d585f..9943969962 100644
--- a/test/libraries/PMA_server_engines_test.php
+++ b/test/libraries/PMA_server_engines_test.php
@@ -22,6 +22,13 @@ require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/StorageEngine.class.php';
 
+/**
+ * PMA_ServerEngines_Test class
+ *
+ * this class is for testing server_engines.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerEngines_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_plugins_test.php b/test/libraries/PMA_server_plugins_test.php
index 2a35513118..195af93624 100644
--- a/test/libraries/PMA_server_plugins_test.php
+++ b/test/libraries/PMA_server_plugins_test.php
@@ -20,6 +20,13 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ * PMA_ServerPlugins_Test class
+ *
+ * this class is for testing server_plugins.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerPlugins_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
index 716c33af36..1edd2f9d3a 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -21,6 +21,13 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ * class PMA_ServerStatusMonitor_Test
+ *
+ * this class is for testing PMA_server_status_monitor.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index 8a5eec7f9f..64f09a5cd9 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -21,6 +21,13 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ * class PMA_ServerStatusVariables_Test
+ *
+ * this class is for testing server_status_variables.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
 {
     /**