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

Merge pull request #1046 from jeffchan/fix-tests

Browse Source 
Import config to make unit tests friendlier to running independently
This commit is contained in:
Michal Čihař 2014-03-12 12:24:42 +01:00
commit 25b58235b3
17 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
View File

@ -7,12 +7,15 @@
*/
require_once 'libraries/plugins/auth/AuthenticationConfig.class.php';
require_once 'libraries/DatabaseInterface.class.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/Config.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/config.default.php';
require_once 'libraries/js_escape.lib.php';
require_once 'libraries/Error_Handler.class.php';
require_once 'libraries/Response.class.php';
/**
* tests for AuthenticationConfig class
*
@ -102,6 +105,11 @@ class PMA_AuthenticationConfig_Test extends PHPUnit_Framework_TestCase
}
}
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
->disableOriginalConstructor()
->getMock();
$GLOBALS['dbi'] = $dbi;
ob_start();
$result = $this->object->authFails();
$html = ob_get_clean();

5
test/classes/plugin/export/PMA_ExportHtmlword_test.php
View File

@ -14,6 +14,7 @@ require_once 'libraries/Config.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/config.default.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
/**
* tests for ExportHtmlword class
@ -31,6 +32,10 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase
*/
function setup()
{
if (!defined("PMA_DRIZZLE")) {
define("PMA_DRIZZLE", false);
}
$GLOBALS['server'] = 0;
$this->object = new ExportHtmlword();
$GLOBALS['output_kanji_conversion'] = false;

5
test/classes/plugin/export/PMA_ExportLatex_test.php
View File

@ -14,6 +14,7 @@ require_once 'libraries/DatabaseInterface.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/config.default.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
/**
* tests for ExportLatex class
@ -31,6 +32,10 @@ class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase
*/
function setup()
{
if (!defined("PMA_DRIZZLE")) {
define("PMA_DRIZZLE", false);
}
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['output_charset_conversion'] = false;

5
test/classes/plugin/export/PMA_ExportOdt_test.php
View File

@ -14,6 +14,7 @@ require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/config.default.php';
require_once 'libraries/DatabaseInterface.class.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
/**
@ -32,6 +33,10 @@ class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase
*/
function setup()
{
if (!defined("PMA_DRIZZLE")) {
define("PMA_DRIZZLE", false);
}
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['output_charset_conversion'] = false;

6
test/classes/plugin/export/PMA_ExportSql_test.php
View File

@ -15,8 +15,10 @@ require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/config.default.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/sqlparser.lib.php';
require_once 'libraries/charset_conversion.lib.php';
require_once 'export.php';
/**
* tests for ExportSql class
@ -34,6 +36,10 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
*/
function setup()
{
if (!defined("PMA_DRIZZLE")) {
define("PMA_DRIZZLE", false);
}
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['buffer_needed'] = false;

5
test/classes/plugin/export/PMA_ExportTexytext_test.php
View File

@ -15,6 +15,7 @@ require_once 'libraries/config.default.php';
require_once 'libraries/DatabaseInterface.class.php';
require_once 'libraries/relation.lib.php';
require_once 'libraries/sqlparser.lib.php';
require_once 'libraries/transformations.lib.php';
require_once 'export.php';
/**
* tests for ExportTexytext class
@ -32,6 +33,10 @@ class PMA_ExportTexytext_Test extends PHPUnit_Framework_TestCase
*/
function setup()
{
if (!defined("PMA_DRIZZLE")) {
define("PMA_DRIZZLE", false);
}
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['buffer_needed'] = false;

6
test/classes/plugin/export/PMA_ExportXml_test.php
View File

@ -7,7 +7,9 @@
*/
$GLOBALS['db'] = 'db';
require_once 'libraries/plugins/export/ExportXml.class.php';
require_once 'libraries/DatabaseInterface.class.php';
require_once 'libraries/Util.class.php';
require_once 'libraries/export.lib.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/Config.class.php';
require_once 'libraries/php-gettext/gettext.inc';
@ -29,6 +31,10 @@ class PMA_ExportXml_Test extends PHPUnit_Framework_TestCase
*/
function setup()
{
if (!defined("PMA_DRIZZLE")) {
define("PMA_DRIZZLE", false);
}
$GLOBALS['server'] = 0;
$GLOBALS['output_kanji_conversion'] = false;
$GLOBALS['buffer_needed'] = false;

4
test/classes/plugin/transformations/Image_JPEG_Inline_test.php
View File

@ -13,6 +13,8 @@
require_once 'libraries/plugins/PluginManager.class.php';
require_once 'libraries/plugins/transformations/Image_JPEG_Inline.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/Config.class.php';
require_once 'libraries/config.default.php';
/**
* Tests for Image_JPEG_Inline class
@ -35,6 +37,8 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$this->object = new Image_JPEG_Inline(new PluginManager());
}

4
test/classes/plugin/transformations/Image_PNG_Inline_test.php
View File

@ -13,6 +13,8 @@
require_once 'libraries/plugins/PluginManager.class.php';
require_once 'libraries/plugins/transformations/Image_PNG_Inline.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/Config.class.php';
require_once 'libraries/config.default.php';
/**
* Tests for Image_PNG_Inline class
@ -35,6 +37,8 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$this->object = new Image_PNG_Inline(new PluginManager());
}

1
test/classes/plugin/transformations/Text_Plain_Substring_test.php
View File

@ -13,6 +13,7 @@
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/plugins/PluginManager.class.php';
require_once 'libraries/plugins/transformations/Text_Plain_Substring.class.php';
require_once 'libraries/string.inc.php';
/**
* Tests for Text_Plain_Substring class

2
test/libraries/PMA_ConfigGenerator_test.php
View File

@ -33,6 +33,8 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['AvailableCharsets'] = array();
unset($_SESSION['eol']);
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['server'] = 0;
$cf = new ConfigFile();
$_SESSION['ConfigFile0'] = array('a', 'b', 'c');

4
test/libraries/PMA_display_change_password_test.php
View File

@ -17,6 +17,8 @@ require_once 'libraries/Theme.class.php';
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/sanitizing.lib.php';
require_once 'libraries/js_escape.lib.php';
require_once 'libraries/Config.class.php';
require_once 'libraries/config.default.php';
/**
* class PMA_DisplayChangePassword_Test
@ -35,6 +37,8 @@ class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase
public function setUp()
{
//$GLOBALS
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['MaxRows'] = 10;
$GLOBALS['cfg']['ServerDefault'] = "PMA_server";
$GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';

2
test/libraries/PMA_mysql_charsets_test.php
View File

@ -9,7 +9,7 @@
/*
* Include to test.
*/
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/php-gettext/gettext.inc';
/**

4
test/libraries/PMA_server_databases_test.php
View File

@ -21,6 +21,8 @@ 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';
require_once 'libraries/Config.class.php';
require_once 'libraries/config.default.php';
/**
* PMA_ServerDatabases_Test class
@ -44,6 +46,8 @@ class PMA_ServerDatabases_Test extends PHPUnit_Framework_TestCase
$_REQUEST['pos'] = 3;
//$GLOBALS
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['MaxRows'] = 10;
$GLOBALS['cfg']['MaxDbList'] = 100;
$GLOBALS['cfg']['ServerDefault'] = "server";

5
test/libraries/PMA_server_privileges_test.php
View File

@ -39,6 +39,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
*/
public function setUp()
{
//Constants
if (!defined("PMA_USR_BROWSER_AGENT")) {
define("PMA_USR_BROWSER_AGENT", "other");
}
//$_REQUEST
$_REQUEST['log'] = "index1";
$_REQUEST['pos'] = 3;

2
test/libraries/PMA_sql_query_form_test.php
View File

@ -24,7 +24,7 @@ require_once 'libraries/js_escape.lib.php';
require_once 'libraries/database_interface.inc.php';
require_once 'libraries/sql_query_form.lib.php';
require_once 'libraries/kanji-encoding.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
/**
* class PMA_SqlQueryForm_Test

2
test/libraries/PMA_tbl_columns_definition_form_test.php
View File

@ -17,7 +17,7 @@ require_once 'libraries/Types.class.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/transformations.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/StorageEngine.class.php';
/**