diff --git a/test/classes/PMA_Error_Handler_test.php b/test/classes/PMA_Error_Handler_test.php index 84083cfa6b..9a271c7737 100644 --- a/test/classes/PMA_Error_Handler_test.php +++ b/test/classes/PMA_Error_Handler_test.php @@ -12,6 +12,7 @@ require_once 'libraries/Error_Handler.class.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Util.class.php'; +require_once 'libraries/Theme.class.php'; /** * Test for PMA_Error_Handler class. @@ -36,6 +37,9 @@ class PMA_Error_Handler_Test extends PHPUnit_Framework_TestCase { $this->object = new PMA_Error_Handler(); + $GLOBALS['pmaThemeImage'] = 'image'; + $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $_SESSION['PMA_Theme'] = new PMA_Theme(); } /** @@ -273,6 +277,7 @@ class PMA_Error_Handler_Test extends PHPUnit_Framework_TestCase */ public function testHasDisplayErrors() { + $GLOBALS['cfg']['Error_Handler']['display'] = false; $this->assertFalse($this->object->hasDisplayErrors()); } } diff --git a/test/classes/PMA_Error_test.php b/test/classes/PMA_Error_test.php index 728d1e859c..a789706348 100644 --- a/test/classes/PMA_Error_test.php +++ b/test/classes/PMA_Error_test.php @@ -14,6 +14,7 @@ require_once 'libraries/Error.class.php'; require_once 'libraries/Message.class.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Util.class.php'; +require_once 'libraries/Theme.class.php'; /** * Erorr class testing. @@ -37,6 +38,10 @@ class PMA_Error_Test extends PHPUnit_Framework_TestCase protected function setUp() { $this->object = new PMA_Error('2', 'Compile Error', 'error.txt', 15); + + $GLOBALS['pmaThemeImage'] = 'image'; + $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $_SESSION['PMA_Theme'] = new PMA_Theme(); } /** diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php index 70fd93fdea..59364e7f66 100644 --- a/test/classes/PMA_Footer_test.php +++ b/test/classes/PMA_Footer_test.php @@ -55,6 +55,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase $GLOBALS['db'] = ''; $GLOBALS['table'] = ''; $GLOBALS['text_dir'] = 'ltr'; + $GLOBALS['pmaThemeImage'] = 'image'; $GLOBALS['PMA_Config'] = new PMA_Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['collation_connection'] = 'utf8_general_ci'; @@ -70,6 +71,9 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase unset($GLOBALS['sql_query']); $GLOBALS['error_handler'] = new PMA_Error_Handler(); unset($_POST); + + $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $_SESSION['PMA_Theme'] = new PMA_Theme(); } /** diff --git a/test/classes/PMA_Menu_test.php b/test/classes/PMA_Menu_test.php index b98c475df4..ab48f9f1b9 100644 --- a/test/classes/PMA_Menu_test.php +++ b/test/classes/PMA_Menu_test.php @@ -51,6 +51,8 @@ class PMA_Menu_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['DefaultTabTable'] = 'sql.php'; $GLOBALS['cfg']['OBGzip'] = false; $GLOBALS['cfg']['NaturalOrder'] = true; + $GLOBALS['cfg']['TabsMode'] = 'both'; + $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF'); $GLOBALS['server'] = 'server'; $GLOBALS['db'] = 'pma_test'; diff --git a/test/classes/PMA_TableReplaceSearch_test.php b/test/classes/PMA_TableReplaceSearch_test.php index 45fbbf7fdb..05e772b891 100644 --- a/test/classes/PMA_TableReplaceSearch_test.php +++ b/test/classes/PMA_TableReplaceSearch_test.php @@ -13,6 +13,7 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/TableSearch.class.php'; require_once 'libraries/DatabaseInterface.class.php'; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'libraries/url_generating.lib.php'; /** * Tests for libraries/TableSearch.class.php with search type replace diff --git a/test/classes/PMA_TableSearch_test.php b/test/classes/PMA_TableSearch_test.php index 4b43f4e789..0058491d75 100644 --- a/test/classes/PMA_TableSearch_test.php +++ b/test/classes/PMA_TableSearch_test.php @@ -21,6 +21,7 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/Tracker.class.php'; require_once 'libraries/Types.class.php'; require_once 'libraries/relation.lib.php'; +require_once 'libraries/url_generating.lib.php'; /** * Tests for PMA_TableSearch diff --git a/test/classes/PMA_Util_test.php b/test/classes/PMA_Util_test.php index 91290ecb2c..10dc3d489e 100644 --- a/test/classes/PMA_Util_test.php +++ b/test/classes/PMA_Util_test.php @@ -107,6 +107,7 @@ class PMA_Util_Test extends PHPUnit_Framework_TestCase */ public function testGetLatestVersion() { + $GLOBALS['cfg']['ProxyUrl'] = ''; $GLOBALS['cfg']['VersionCheckProxyUrl'] = ''; $version = PMA_Util::getLatestVersion(); $this->assertNotEmpty($version->version); diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/PMA_Node_Database_test.php index 328f47d58b..5cb6d955b5 100644 --- a/test/classes/navigation/PMA_Node_Database_test.php +++ b/test/classes/navigation/PMA_Node_Database_test.php @@ -27,6 +27,8 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase { $GLOBALS['server'] = 0; $GLOBALS['token'] = 'token'; + $GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php'; + $GLOBALS['cfg']['MaxNavigationItems'] = 250; $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); } diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/PMA_Node_Table_Container_test.php index 01472d043c..04d7568358 100644 --- a/test/classes/navigation/PMA_Node_Table_Container_test.php +++ b/test/classes/navigation/PMA_Node_Table_Container_test.php @@ -27,6 +27,10 @@ class Node_Table_Container_Test extends PHPUnit_Framework_TestCase { $GLOBALS['server'] = 0; $GLOBALS['token'] = 'token'; + $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true; + $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_'; + $GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__'; + $GLOBALS['cfg']['NavigationTreeTableLevel'] = 1; $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); } diff --git a/test/classes/navigation/PMA_Node_Table_test.php b/test/classes/navigation/PMA_Node_Table_test.php index 798bf40182..3b5e8313d6 100644 --- a/test/classes/navigation/PMA_Node_Table_test.php +++ b/test/classes/navigation/PMA_Node_Table_test.php @@ -27,6 +27,13 @@ class Node_Table_Test extends PHPUnit_Framework_TestCase { $GLOBALS['server'] = 0; $GLOBALS['token'] = 'token'; + $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'b_browse'; + $GLOBALS['cfg']['DefaultTabTable'] = 'sql.php'; + $GLOBALS['cfg']['MaxNavigationItems'] = 250; + $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true; + $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_'; + $GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__'; + $GLOBALS['cfg']['NavigationTreeTableLevel'] = 1; $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); } diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/PMA_Node_View_Container_test.php index 43245dae68..cfd0e47f00 100644 --- a/test/classes/navigation/PMA_Node_View_Container_test.php +++ b/test/classes/navigation/PMA_Node_View_Container_test.php @@ -27,6 +27,10 @@ class Node_View_Container_Test extends PHPUnit_Framework_TestCase { $GLOBALS['server'] = 0; $GLOBALS['token'] = 'token'; + $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true; + $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_'; + $GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__'; + $GLOBALS['cfg']['NavigationTreeTableLevel'] = 1; $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); } diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 69dcb74454..beaa7744f0 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -18,6 +18,7 @@ require_once 'libraries/config.default.php'; require_once 'libraries/Error_Handler.class.php'; require_once 'libraries/Response.class.php'; require_once 'libraries/js_escape.lib.php'; +require_once 'libraries/sanitizing.lib.php'; /** * tests for AuthenticationCookie class @@ -38,6 +39,9 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['server'] = 0; $this->object = new AuthenticationCookie(null); + + $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $_SESSION['PMA_Theme'] = new PMA_Theme(); } /** diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php index bec375e793..3b79c8c990 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php @@ -15,6 +15,7 @@ require_once 'libraries/Config.class.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'libraries/Error_Handler.class.php'; +require_once 'libraries/sanitizing.lib.php'; /** * tests for AuthenticationHttp class @@ -38,6 +39,11 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase $GLOBALS['PMA_Config'] = new PMA_Config; $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['server'] = 0; + $GLOBALS['lang'] = "en"; + $GLOBALS['available_languages'] = array( + "en" => array("English", "US-ENGLISH"), + "ch" => array("Chinese", "TW-Chinese") + ); $this->object = new AuthenticationHttp(null); } diff --git a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php b/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php index 5c2ad66891..3a5e34f8a8 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php @@ -14,6 +14,7 @@ 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/sanitizing.lib.php'; require_once 'libraries/Error_Handler.class.php'; /** diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index 8c91982431..4d25ee62b4 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -15,6 +15,8 @@ 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/Table.class.php'; +require_once 'libraries/sqlparser.lib.php'; require_once 'export.php'; /** * tests for ExportSql class diff --git a/test/libraries/PMA_ConfigGenerator_test.php b/test/libraries/PMA_ConfigGenerator_test.php index c525b30c42..408f6a3056 100644 --- a/test/libraries/PMA_ConfigGenerator_test.php +++ b/test/libraries/PMA_ConfigGenerator_test.php @@ -13,6 +13,7 @@ require_once 'setup/lib/ConfigGenerator.class.php'; require_once 'libraries/config/ConfigFile.class.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/Util.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * tests for methods under Config file generator diff --git a/test/libraries/PMA_SetupIndex_test.php b/test/libraries/PMA_SetupIndex_test.php index b11540d28b..15b066258f 100644 --- a/test/libraries/PMA_SetupIndex_test.php +++ b/test/libraries/PMA_SetupIndex_test.php @@ -27,6 +27,16 @@ require_once 'libraries/sanitizing.lib.php'; */ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase { + /** + * SetUp for test cases + * + * @return void + */ + public function setup() + { + $GLOBALS['cfg']['ProxyUrl'] = ''; + } + /** * Test for PMA_messagesBegin() * diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php index cc3f61caa9..7690c4fcb5 100644 --- a/test/libraries/PMA_display_export_test.php +++ b/test/libraries/PMA_display_export_test.php @@ -44,6 +44,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase { //$GLOBALS $GLOBALS['cfg']['MaxRows'] = 10; + $GLOBALS['cfg']['ExecTimeLimit'] = 300; $GLOBALS['cfg']['ServerDefault'] = "PMA_server"; $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; $GLOBALS['cfg']['LimitChars'] = 100; diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index 1a3d3b4304..0c820c66ef 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -45,6 +45,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase //$GLOBALS $GLOBALS['cfg']['MaxRows'] = 10; + $GLOBALS['cfg']['SendErrorReports'] = "never"; $GLOBALS['cfg']['ServerDefault'] = "server"; $GLOBALS['cfg']['RememberSorting'] = true; $GLOBALS['cfg']['SQP'] = array(); diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php index aac165c3e4..d811971882 100644 --- a/test/libraries/PMA_server_user_groups_test.php +++ b/test/libraries/PMA_server_user_groups_test.php @@ -28,6 +28,8 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase */ public function setUp() { + $GLOBALS['cfg']['ServerDefault'] = 1; + $GLOBALS['cfg']['ActionLinksMode'] = 'both'; $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb'; $GLOBALS['cfg']['Server']['users'] = 'users'; $GLOBALS['cfg']['Server']['usergroups'] = 'usergroups'; diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php index 6aa90e0994..bfb6a8eca1 100644 --- a/test/libraries/PMA_tbl_columns_definition_form_test.php +++ b/test/libraries/PMA_tbl_columns_definition_form_test.php @@ -14,9 +14,11 @@ require_once 'libraries/tbl_columns_definition_form.lib.php'; require_once 'libraries/DatabaseInterface.class.php'; require_once 'libraries/Partition.class.php'; 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/StorageEngine.class.php'; /** * Tests for libraries/tbl_columns_definition_form.lib.php @@ -36,6 +38,10 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['DBG'] = null; $GLOBALS['cfg']['TextareaCols'] = 10; $GLOBALS['cfg']['TextareaRows'] = 15; + $GLOBALS['pmaThemeImage'] = 'image'; + + $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $_SESSION['PMA_Theme'] = new PMA_Theme(); } /** diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php index 3e97ed04a7..3b47c07306 100644 --- a/test/libraries/PMA_user_preferences_test.php +++ b/test/libraries/PMA_user_preferences_test.php @@ -17,6 +17,8 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/sanitizing.lib.php'; +require_once 'libraries/Message.class.php'; /** * tests for methods under user_preferences libarary