Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2
This commit is contained in:
xmujay
commit
3103a207fc
@ -110,7 +110,7 @@ Basic settings
|
||||
column names match with words which are MySQL reserved.
|
||||
|
||||
If you want to turn off this warning, you can set it to ``true`` and
|
||||
warning will not longer be displayed
|
||||
warning will no longer be displayed.
|
||||
|
||||
.. config:option:: $cfg['TranslationWarningThreshold']
|
||||
|
||||
|
||||
@ -271,10 +271,19 @@ class PMA_SysInfoLinux extends PMA_SysInfo
|
||||
);
|
||||
|
||||
$mem = array_combine($matches[1], $matches[2]);
|
||||
|
||||
$memTotal = isset($mem['MemTotal']) ? $mem['MemTotal'] : 0;
|
||||
$memFree = isset($mem['MemFree']) ? $mem['MemFree'] : 0;
|
||||
$cached = isset($mem['Cached']) ? $mem['Cached'] : 0;
|
||||
$buffers = isset($mem['Buffers']) ? $mem['Buffers'] : 0;
|
||||
$swapTotal = isset($mem['SwapTotal']) ? $mem['SwapTotal'] : 0;
|
||||
$swapFree = isset($mem['SwapFree']) ? $mem['SwapFree'] : 0;
|
||||
$swapCached = isset($mem['SwapCached']) ? $mem['SwapCached'] : 0;
|
||||
|
||||
$mem['MemUsed']
|
||||
= $mem['MemTotal'] - $mem['MemFree'] - $mem['Cached'] - $mem['Buffers'];
|
||||
= $memTotal - $memFree - $cached - $buffers;
|
||||
$mem['SwapUsed']
|
||||
= $mem['SwapTotal'] - $mem['SwapFree'] - $mem['SwapCached'];
|
||||
= $swapTotal - $swapFree - $swapCached;
|
||||
|
||||
foreach ($mem as $idx => $value) {
|
||||
$mem[$idx] = intval($value);
|
||||
|
||||
187
test/libraries/PMA_server_status_advisor_test.php
Normal file
187
test/libraries/PMA_server_status_advisor_test.php
Normal file
@ -0,0 +1,187 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* tests for server_status_advisor.lib.php
|
||||
*
|
||||
* @package PhpMyAdmin-test
|
||||
*/
|
||||
|
||||
/*
|
||||
* Include to test.
|
||||
*/
|
||||
require_once 'libraries/Util.class.php';
|
||||
require_once 'libraries/Advisor.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_advisor.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_ServerStatusAdvisor_Test
|
||||
*
|
||||
* this class is for testing server_status_advisor.lib.php functions
|
||||
*
|
||||
* @package PhpMyAdmin-test
|
||||
*/
|
||||
class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* Prepares environment for the test.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public $ServerStatusData;
|
||||
|
||||
/**
|
||||
* Test for setUp
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
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['cfg']['ActionLinksMode'] = 'icons';
|
||||
$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();
|
||||
|
||||
//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_getHTMLForAdvisor
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testPMAGetHTMLForAdvisor()
|
||||
{
|
||||
//Call the test function
|
||||
$html = PMA_getHTMLForAdvisor();
|
||||
|
||||
//validate 1: Advisor Instructions
|
||||
$this->assertContains(
|
||||
'<a href="#openAdvisorInstructions">',
|
||||
$html
|
||||
);
|
||||
$this->assertContains(
|
||||
'<div id="advisorInstructionsDialog"',
|
||||
$html
|
||||
);
|
||||
//notice
|
||||
$this->assertContains(
|
||||
'The Advisor system can provide recommendations',
|
||||
$html
|
||||
);
|
||||
$this->assertContains(
|
||||
'Do note however that this system provides recommendations',
|
||||
$html
|
||||
);
|
||||
|
||||
//Advisor datas, we just validate that the Advisor Array is right
|
||||
//Advisor logic related with OS should be validate on class Advisor
|
||||
$this->assertContains(
|
||||
'<div id="advisorData" style="display:none;">',
|
||||
$html
|
||||
);
|
||||
|
||||
//Advisor data Json encode Items
|
||||
$this->assertContains(
|
||||
htmlspecialchars(json_encode("parse")),
|
||||
$html
|
||||
);
|
||||
$this->assertContains(
|
||||
htmlspecialchars(json_encode("errors")),
|
||||
$html
|
||||
);
|
||||
$this->assertContains(
|
||||
htmlspecialchars(json_encode("run")),
|
||||
$html
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
