gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-11 14:33:12 +02:00
commit e63a34fcab
38 changed files with 73 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/dbi/DBIDummy.class.php
View File

@ -255,7 +255,10 @@ $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' => "SHOW TABLES FROM `phpmyadmin`",
'result' => array(),
),
);
/**
* Current database.
@ -646,4 +649,4 @@ class PMA_DBI_Dummy implements PMA_DBI_Extension
return '';
}
}
?>
?>

2
phpunit.xml.dist
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="test/bootstrap-dist.php"
backupGlobals="false"
backupGlobals="true"
backupStaticAttributes="false"
strict="true"
colors="true"

2
phpunit.xml.nocoverage
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="test/bootstrap-dist.php"
backupGlobals="false"
backupGlobals="true"
backupStaticAttributes="false"
strict="true"
colors="true"

5
test/bootstrap-dist.php
View File

@ -26,4 +26,9 @@ session_start();
// You can put some additional code that should run before tests here
// Standard environment for tests
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['is_ajax_request'] = false;
?>

2
test/classes/PMA_Advisor_test.php
View File

@ -19,8 +19,6 @@ class Advisor_Test extends PHPUnit_Framework_TestCase
{
public function setup()
{
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['ServerDefault'] = '';

8
test/classes/PMA_Config_test.php
View File

@ -15,6 +15,8 @@ require_once 'libraries/Config.class.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/vendor_config.php';
require_once 'libraries/url_generating.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
class PMA_ConfigTest extends PHPUnit_Framework_TestCase
{
@ -96,7 +98,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
'<option value="4pt"',
PMA_Config::getFontsizeForm()
);
//test getFontsizeOptions for "px" unit
$_COOKIE['pma_fontsize'] = "10px";
$this->assertContains(
@ -117,7 +119,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
$this->assertContains(
'<option value="8abc"',
PMA_Config::getFontsizeForm()
);
);
unset($_COOKIE['pma_fontsize']);
//rollback the fontsize setting
$GLOBALS['PMA_Config']->set('fontsize', $fontsize);
@ -905,6 +907,8 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
/**
* Test for Check HTTP
*
* @group medium
*
* @return void
*/
public function testCheckHTTP()

13
test/classes/PMA_DBQbe_test.php
View File

@ -232,6 +232,7 @@ class PMA_DBQbe_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInsDelAndOrCriteriaRows()
{
$GLOBALS['cell_align_right'] = 'cellAlign';
$this->assertEquals(
'<tr class="odd noclick"><td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[0]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="and" /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[0]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="or" checked="checked" /></td></tr></table></td><td class="center"><input type="text" name="Or0[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[2]" value="" class="textfield" style="width: 12ex" size="20" /></td></tr>',
$this->_callProtectedFunction(
@ -387,6 +388,12 @@ class PMA_DBQbe_Test extends PHPUnit_Framework_TestCase
*/
public function testGetFromClause()
{
$_POST['criteriaColumn'] = array(
'table1.id',
'table1.value',
'table1.name',
'table1.deleted'
);
$this->assertEquals(
'table1',
$this->_callProtectedFunction(
@ -403,6 +410,12 @@ class PMA_DBQbe_Test extends PHPUnit_Framework_TestCase
*/
public function testGetSQLQuery()
{
$_POST['criteriaColumn'] = array(
'table1.id',
'table1.value',
'table1.name',
'table1.deleted'
);
$this->assertEquals(
'FROM table1
',

7
test/classes/PMA_DbSearch_test.php
View File

@ -42,10 +42,10 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
$this->object = new PMA_DbSearch('pma_test');
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['ServerDefault'] = 1;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['cfg']['MySQLManualType'] = 'viewable';
$GLOBALS['cfg']['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
$GLOBALS['cfg']['ShowHint'] = true;
$GLOBALS['db'] = 'pma';
}
/**
@ -83,8 +83,6 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
*/
public function testGetSearchSqls()
{
$GLOBALS['db'] = 'pma';
$this->assertEquals(
array (
'select_columns' => 'SELECT * FROM `pma`.`table1` WHERE FALSE',
@ -166,7 +164,6 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
*/
public function testGetSelectionForm()
{
$_SESSION[' PMA_token '] = 'token';
$_SESSION['PMA_Theme'] = new PMA_Theme();
$GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
$url_params = array('param1', 'param2');

3
test/classes/PMA_DisplayResults_test.php
View File

@ -40,8 +40,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
$this->object = new PMA_DisplayResults('as', '', '', '');
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = 0;
$GLOBALS['text_dir'] = 'ltr';
include_once 'libraries/Response.class.php';
@ -354,7 +352,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
$caption, $title, $pos, $html_sql_query, $output
) {
$GLOBALS['cfg']['NavigationBarIconic'] = true;
$_SESSION[' PMA_token '] = 'token';
$this->assertEquals(
$output,

17
test/classes/PMA_Footer_test.php
View File

@ -16,7 +16,9 @@ require_once 'libraries/core.lib.php';
require_once 'libraries/url_generating.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/Util.class.php';
require_once 'libraries/Config.class.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/Error_Handler.class.php';
require_once 'libraries/vendor_config.php';
@ -48,15 +50,18 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
protected function setUp()
{
$_SERVER['SCRIPT_NAME'] = 'index.php';
$GLOBALS['db'] = 'mysql';
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
$GLOBALS['db'] = '';
$GLOBALS['table'] = '';
$GLOBALS['lang'] = 'en';
$GLOBALS['text_dir'] = 'ltr';
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['collation_connection'] = 'utf8_general_ci';
$GLOBALS['cfg']['Error_Handler']['gather'] = false;
$GLOBALS['cfg']['Error_Handler']['display'] = false;
$GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
$GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php';
$GLOBALS['server'] = '1';
$_SESSION[' PMA_token '] = 'token';
$_GET['reload_left_frame'] = '1';
$GLOBALS['focus_querywindow'] = 'main_pane_left';
$this->object = new PMA_Footer();
@ -138,7 +143,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['ServerDefault'] = 1;
$this->assertEquals(
'<div id="selflink" class="print_ignore"><a href="index.php?db=mysql&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank">Open new phpMyAdmin window</a></div>',
'<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank">Open new phpMyAdmin window</a></div>',
$this->_callPrivateFunction(
'_getSelfLink',
array(
@ -162,7 +167,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
$GLOBALS['pmaThemeImage'] = 'image';
$this->assertEquals(
'<div id="selflink" class="print_ignore"><a href="index.php?db=mysql&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank"><img src="imagewindow-new.png" title="Open new phpMyAdmin window" alt="Open new phpMyAdmin window" /></a></div>',
'<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank"><img src="imagewindow-new.png" title="Open new phpMyAdmin window" alt="Open new phpMyAdmin window" /></a></div>',
$this->_callPrivateFunction(
'_getSelfLink',
array(
@ -201,7 +206,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
$footer->getDisplay()
);
}
/**
* Test for footer get Scripts
*

2
test/classes/PMA_Header_test.php
View File

@ -42,8 +42,6 @@ class PMA_Header_Test extends PHPUnit_Framework_TestCase
define('PMA_IS_WINDOWS', false);
}
$GLOBALS['server'] = 0;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['message'] = 'phpmyadminmessage';
$GLOBALS['is_ajax_request'] = false;
$_SESSION['PMA_Theme'] = new PMA_Theme();

1
test/classes/PMA_Menu_test.php
View File

@ -42,7 +42,6 @@ class PMA_Menu_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['ServerDefault'] = 1;
$GLOBALS['lang'] = 'en';
$GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
$GLOBALS['cfg']['NavigationBarIconic'] = 'both';
$_SESSION['PMA_Theme'] = new PMA_Theme();

5
test/classes/PMA_Message_test.php
View File

@ -14,6 +14,7 @@ require_once 'libraries/core.lib.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/Message.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/Theme.class.php';
class PMA_Message_Test extends PHPUnit_Framework_TestCase
{
@ -33,6 +34,8 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
protected function setUp()
{
$this->object = new PMA_Message;
$_SESSION['PMA_Theme'] = new PMA_Theme();
$GLOBALS['pmaThemeImage'] = 'theme/';
}
/**
@ -367,8 +370,6 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
public function testDecodeBB($actual, $expected)
{
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
unset($GLOBALS['server']);
unset($GLOBALS['collation_connection']);
$this->assertEquals($expected, PMA_Message::decodeBB($actual));

2
test/classes/PMA_Table_test.php
View File

@ -36,8 +36,6 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['cfg']['ServerDefault'] = 1;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['cfg']['MySQLManualType'] = 'viewable';
$GLOBALS['cfg']['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
$GLOBALS['cfg']['PropertiesIconic'] = 'both';

2
test/classes/PMA_Theme_Manager_test.php
View File

@ -26,8 +26,6 @@ class PMA_Theme_Manager_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['ThemeDefault'] = 'pmahomme';
$GLOBALS['cfg']['ServerDefault'] = 0;
$GLOBALS['server'] = 99;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['collation_connection'] = 'utf8_general_ci';
}

2
test/classes/PMA_Theme_test.php
View File

@ -37,8 +37,6 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['SQP']['fmtColor'] = array('fake' => 'red');
$GLOBALS['text_dir'] = 'ltr';
include 'themes/pmahomme/layout.inc.php';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = '99';
}

1
test/classes/config/PMA_Form_test.php
View File

@ -9,6 +9,7 @@
require_once 'libraries/config/ConfigFile.class.php';
require_once 'libraries/config/Form.class.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/php-gettext/gettext.inc';
class PMA_Form_Test extends PHPUnit_Framework_TestCase

13
test/libraries/PMA_SQL_parser_test.php
View File

@ -10,6 +10,11 @@
* Include to test.
*/
require_once 'libraries/sqlparser.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/Message.class.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/sanitizing.lib.php';
class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
{
@ -23,6 +28,8 @@ class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
if (function_exists('mb_internal_encoding')) {
mb_internal_encoding('utf-8');
}
$_SESSION['PMA_Theme'] = new PMA_Theme();
$GLOBALS['pmaThemeImage'] = 'theme/';
}
/**
@ -40,8 +47,9 @@ class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
public function testParser($sql, $expected, $error = '')
{
PMA_SQP_resetError();
$this->expectOutputString($error);
$parsed_sql = PMA_SQP_parse($sql);
$this->assertEquals($error, PMA_SQP_getErrorString());
$this->assertEquals('', PMA_SQP_getErrorString());
$this->assertEquals($expected, $parsed_sql);
}
@ -177,7 +185,8 @@ class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
'pos' => 0,
),
'len' => 5,
)
),
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" /> Automatically appended backtick to the end of query!</div>'
),
array(
'SELECT * FROM `a_table` tbla INNER JOIN b_table` tblb ON tblb.id = tbla.id WHERE tblb.field1 != tbla.field1`;',

3
test/libraries/PMA_build_html_for_db_test.php
View File

@ -35,8 +35,6 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
$GLOBALS['server'] = 0;
$cfg['ServerDefault'] = 1;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$cfg['MySQLManualType'] = 'viewable';
$cfg['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
@ -47,7 +45,6 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemeImage'] = 'theme/';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php';
}

36
test/libraries/PMA_generateCommonUrl_test.php
View File

@ -22,16 +22,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
public function testOldStyle()
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'lang=en' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
. 'token=token'
;
$expected = 'db=db'
@ -44,16 +42,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
public function testOldStyleDbOnly()
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'lang=en' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
. 'token=token'
;
$expected = 'db=db'
@ -65,16 +61,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
public function testNewStyle()
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'lang=en' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
. 'token=token'
;
$expected = '?db=db'
@ -87,16 +81,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
public function testOldStyleWithAlternateSeparator()
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
$separator = PMA_get_arg_separator();
$expected = 'server=x' . $separator
. 'lang=x' . $separator
. 'lang=en' . $separator
. 'collation_connection=x' . $separator
. 'token=x'
. 'token=token'
;
$expected = 'db=db' . $separator . 'table=table' . $separator . $expected;
@ -106,16 +98,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
public function testOldStyleWithAlternateSeparatorDbOnly()
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
$separator = PMA_get_arg_separator();
$expected = 'server=x' . $separator
. 'lang=x' . $separator
. 'lang=en' . $separator
. 'collation_connection=x' . $separator
. 'token=x'
. 'token=token'
;
$expected = 'db=db' . $separator . $expected;
@ -125,16 +115,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
public function testDefault()
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'lang=en' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
. 'token=token'
;
$this->assertEquals($expected, PMA_generate_common_url());
}

1
test/libraries/PMA_operations_test.php
View File

@ -38,7 +38,6 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
$GLOBALS['table'] = 'table';
$GLOBALS['db'] = 'db';
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['cfg'] = array(
'MySQLManualType' => 'none',
'ServerDefault' => 1,

1
test/libraries/PMA_sanitize_test.php
View File

@ -23,7 +23,6 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
*/
function setUp()
{
$_SESSION[' PMA_token '] = 'token';
}
/**

1
test/libraries/PMA_transformation_test.php
View File

@ -34,7 +34,6 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
$GLOBALS['table'] = 'table';
$GLOBALS['db'] = 'db';
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['cfg'] = array(
'MySQLManualType' => 'none',
'ServerDefault' => 1,

1
test/libraries/common/PMA_checkParameters_test.php
View File

@ -24,7 +24,6 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
$_SESSION['PMA_Theme'] = new PMA_Theme();
$GLOBALS['cfg'] = array('ServerDefault' => 1);
$GLOBALS['pmaThemeImage'] = 'theme/';
$GLOBALS['lang'] = 'en';
$GLOBALS['text_dir'] = 'ltr';
}

2
test/libraries/common/PMA_getDbLink_test.php
View File

@ -22,8 +22,6 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
global $cfg;
include_once 'libraries/vendor_config.php';
include 'libraries/config.default.php';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = 99;
}

2
test/libraries/common/PMA_showDocu_test.php
View File

@ -19,8 +19,6 @@ class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
function setup()
{
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = '99';
$GLOBALS['cfg']['ServerDefault'] = 1;
}

1
test/libraries/common/PMA_showMessage_test_disabled.php
View File

@ -37,7 +37,6 @@ class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
$GLOBALS['table'] = 'tbl';
$GLOBALS['db'] = 'db';
$_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
$GLOBALS['sql_query'] = "SELECT * FROM tblPatient ";

2
test/libraries/common/PMA_showPHPDocu_test.php
View File

@ -20,8 +20,6 @@ class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
function setup()
{
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = 99;
$GLOBALS['cfg']['ServerDefault'] = 0;
}

1
test/libraries/core/PMA_fatalError_test.php
View File

@ -37,7 +37,6 @@ class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
);
$GLOBALS['cfg']['OBGzip'] = false;
$_SESSION['PMA_Theme'] = new PMA_Theme();
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['pmaThemeImage'] = 'theme/';
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['server'] = 1;

2
test/libraries/core/PMA_getLinks_test.php
View File

@ -17,8 +17,6 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
{
function setUp()
{
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = 99;
$GLOBALS['cfg']['ServerDefault'] = 0;
}

1
test/libraries/core/PMA_getTableCount_test_dis.php
View File

@ -43,7 +43,6 @@ class PMA_GetTableCount_Test extends PHPUnit_Framework_TestCase
// );
$GLOBALS['cfg']['OBGzip'] = false;
$_SESSION['PMA_Theme'] = new PMA_Theme();
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['pmaThemeImage'] = 'theme/';
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['server'] = 1;

2
test/libraries/core/PMA_headerLocation_test.php
View File

@ -177,8 +177,6 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
}
}
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$GLOBALS['server'] = 0;
$GLOBALS['PMA_Config'] = new PMA_Config();

2
test/libraries/core/PMA_warnMissingExtension_test.php
View File

@ -23,7 +23,6 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
$GLOBALS['lang'] = 'en';
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['Server'] = array(
@ -32,7 +31,6 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
);
$GLOBALS['cfg']['OBGzip'] = false;
$_SESSION['PMA_Theme'] = new PMA_Theme();
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['pmaThemeImage'] = 'theme/';
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['server'] = 1;

3
test/libraries/database_interface_test.php
View File

@ -51,7 +51,8 @@ class PMA_DBI_Test extends PHPUnit_Framework_TestCase
*/
function testFetch()
{
$this->assertEquals(array('1'), $GLOBALS['dbi']->fetchArray(0));
$result = $GLOBALS['dbi']->tryQuery('SELECT 1');
$this->assertEquals(array('1'), $GLOBALS['dbi']->fetchArray($result));
}
/**

8
test/libraries/rte/PMA_EVN_getEditorForm_test.php
View File

@ -17,12 +17,7 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
$GLOBALS['tear_down']['token'] = false;
$GLOBALS['tear_down']['server'] = false;
if (! isset($_SESSION[' PMA_token '])) {
$_SESSION[' PMA_token '] = '';
$GLOBALS['tear_down']['token'] = true;
}
if (! isset($GLOBALS['cfg']['ServerDefault'])) {
$GLOBALS['cfg']['ServerDefault'] = '';
$GLOBALS['tear_down']['server'] = true;
@ -31,9 +26,6 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
public function tearDown()
{
if ($GLOBALS['tear_down']['token']) {
unset($_SESSION[' PMA_token ']);
}
if ($GLOBALS['tear_down']['server']) {
unset($GLOBALS['cfg']['ServerDefault']);
}

3
test/libraries/rte/PMA_RTN_getEditorForm_test.php
View File

@ -28,8 +28,6 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
$GLOBALS['server'] = 0;
$cfg['ServerDefault'] = 1;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$cfg['MySQLManualType'] = 'viewable';
$cfg['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
@ -38,7 +36,6 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemeImage'] = 'theme/';
$_SESSION[' PMA_token '] = 'token';
}
public function testgetParameterRow_empty()

2
test/libraries/rte/PMA_RTN_getExecuteForm_test.php
View File

@ -26,8 +26,6 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
$GLOBALS['PMA_Types'] = new PMA_Types_MySQL();
$GLOBALS['server'] = 0;
$cfg['ServerDefault'] = 1;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['cfg']['ServerDefault'] = '';
$cfg['ShowFunctionFields'] = true;
$cfg['DefaultFunctions']['FUNC_NUMBER'] = '';

1
test/libraries/rte/PMA_TRI_getEditorForm_test.php
View File

@ -19,7 +19,6 @@ class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['cfg']['ServerDefault'] = '';
$GLOBALS['db'] = 'pma_test';
}