From 840f7b12150aedca8f8d6d57c0da15dab9f99a07 Mon Sep 17 00:00:00 2001 From: ptarjan Date: Wed, 20 Nov 2013 14:36:49 -0800 Subject: [PATCH] Make unit tests friendlier to running independently --- test/classes/PMA_Advisor_test.php | 1 + test/classes/PMA_DisplayResults_test.php | 1 + test/classes/PMA_Error_Handler_test.php | 1 + test/classes/PMA_Error_test.php | 1 + test/classes/PMA_Footer_test.php | 1 + test/classes/PMA_Index_test.php | 1 + test/classes/PMA_TableReplaceSearch_test.php | 1 + test/classes/config/PMA_FormDisplay_test.php | 1 + test/classes/navigation/PMA_Node_Column_Container_test.php | 1 + test/classes/navigation/PMA_Node_Event_Container_test.php | 1 + test/classes/navigation/PMA_Node_Function_Container_test.php | 1 + test/classes/navigation/PMA_Node_Index_Container_test.php | 1 + test/classes/navigation/PMA_Node_Procedure_Container_test.php | 1 + test/classes/navigation/PMA_Node_Table_Container_test.php | 1 + test/classes/navigation/PMA_Node_Trigger_Container_test.php | 1 + test/classes/navigation/PMA_Node_View_Container_test.php | 1 + test/classes/plugin/auth/PMA_AuthenticationCookie_test.php | 2 ++ test/classes/plugin/export/PMA_ExportCsv_test.php | 1 + test/classes/plugin/export/PMA_ExportHtmlword_test.php | 1 + test/classes/plugin/export/PMA_ExportOdt_test.php | 3 +++ test/classes/plugin/export/PMA_ExportTexytext_test.php | 3 +++ test/classes/plugin/export/PMA_ExportYaml_test.php | 1 + test/classes/plugin/export/PMA_TableProperty_test.php | 1 + test/classes/plugin/transformations/Image_JPEG_Inline_test.php | 1 + test/classes/plugin/transformations/Image_Link_test.php | 1 + test/classes/plugin/transformations/Image_PNG_Inline_test.php | 1 + .../plugin/transformations/Text_Plain_Formatted_test.php | 1 + .../plugin/transformations/Text_Plain_Imagelink_test.php | 1 + test/classes/plugin/transformations/Text_Plain_Link_test.php | 1 + test/classes/plugin/transformations/Text_Plain_Sql_test.php | 2 ++ test/libraries/PMA_FormDisplay_tpl_test.php | 3 +++ test/libraries/PMA_SetupIndex_test.php | 2 ++ test/libraries/PMA_Tracker_test.php | 1 + test/libraries/PMA_config_functions_test.php | 1 + test/libraries/PMA_kanji-encoding_test.php | 1 + test/libraries/PMA_tbl_columns_definition_form_test.php | 2 ++ test/libraries/common/PMA_checkParameters_test.php | 1 + test/libraries/database_interface_test.php | 1 + 38 files changed, 48 insertions(+) diff --git a/test/classes/PMA_Advisor_test.php b/test/classes/PMA_Advisor_test.php index 2c82ba35df..30f8e93139 100644 --- a/test/classes/PMA_Advisor_test.php +++ b/test/classes/PMA_Advisor_test.php @@ -14,6 +14,7 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/core.lib.php'; +require_once 'libraries/Util.class.php'; /** * Tests behaviour of PMA_Advisor class diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index eed3bf2978..3aa9f188f2 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -15,6 +15,7 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/Config.class.php'; +require_once 'libraries/relation.lib.php'; /** * Test cases for displaying results. diff --git a/test/classes/PMA_Error_Handler_test.php b/test/classes/PMA_Error_Handler_test.php index 760c6cc7de..84083cfa6b 100644 --- a/test/classes/PMA_Error_Handler_test.php +++ b/test/classes/PMA_Error_Handler_test.php @@ -11,6 +11,7 @@ require_once 'libraries/Error_Handler.class.php'; require_once 'libraries/sanitizing.lib.php'; +require_once 'libraries/Util.class.php'; /** * Test for PMA_Error_Handler class. diff --git a/test/classes/PMA_Error_test.php b/test/classes/PMA_Error_test.php index bca2014048..728d1e859c 100644 --- a/test/classes/PMA_Error_test.php +++ b/test/classes/PMA_Error_test.php @@ -13,6 +13,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'; /** * Erorr class testing. diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php index 3a1f8689c7..70fd93fdea 100644 --- a/test/classes/PMA_Footer_test.php +++ b/test/classes/PMA_Footer_test.php @@ -21,6 +21,7 @@ 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'; +require_once 'libraries/relation.lib.php'; /** * Tests for Footer class diff --git a/test/classes/PMA_Index_test.php b/test/classes/PMA_Index_test.php index 2e6af2acac..22218c522b 100644 --- a/test/classes/PMA_Index_test.php +++ b/test/classes/PMA_Index_test.php @@ -9,6 +9,7 @@ /* * Include to test. */ +require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/Index.class.php'; /** diff --git a/test/classes/PMA_TableReplaceSearch_test.php b/test/classes/PMA_TableReplaceSearch_test.php index 2cb5edcf17..c9e1fcabe8 100644 --- a/test/classes/PMA_TableReplaceSearch_test.php +++ b/test/classes/PMA_TableReplaceSearch_test.php @@ -11,6 +11,7 @@ require_once 'libraries/Util.class.php'; * Include to test. */ require_once 'libraries/TableSearch.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for libraries/TableSearch.class.php with search type replace diff --git a/test/classes/config/PMA_FormDisplay_test.php b/test/classes/config/PMA_FormDisplay_test.php index 67b2d967ce..e1c012f6c3 100644 --- a/test/classes/config/PMA_FormDisplay_test.php +++ b/test/classes/config/PMA_FormDisplay_test.php @@ -9,6 +9,7 @@ require_once 'libraries/config/ConfigFile.class.php'; require_once 'libraries/config/Form.class.php'; require_once 'libraries/config/FormDisplay.class.php'; +require_once 'libraries/config/Form.class.php'; require_once 'libraries/config/config_functions.lib.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; diff --git a/test/classes/navigation/PMA_Node_Column_Container_test.php b/test/classes/navigation/PMA_Node_Column_Container_test.php index 372c9d2c05..3659c09567 100644 --- a/test/classes/navigation/PMA_Node_Column_Container_test.php +++ b/test/classes/navigation/PMA_Node_Column_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_Column_Container class diff --git a/test/classes/navigation/PMA_Node_Event_Container_test.php b/test/classes/navigation/PMA_Node_Event_Container_test.php index 818daa6047..815f602788 100644 --- a/test/classes/navigation/PMA_Node_Event_Container_test.php +++ b/test/classes/navigation/PMA_Node_Event_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_Event_Container class diff --git a/test/classes/navigation/PMA_Node_Function_Container_test.php b/test/classes/navigation/PMA_Node_Function_Container_test.php index a2b5444597..82bc407fc1 100644 --- a/test/classes/navigation/PMA_Node_Function_Container_test.php +++ b/test/classes/navigation/PMA_Node_Function_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_Function_Container class diff --git a/test/classes/navigation/PMA_Node_Index_Container_test.php b/test/classes/navigation/PMA_Node_Index_Container_test.php index a1bbf57c6b..f7df8cc438 100644 --- a/test/classes/navigation/PMA_Node_Index_Container_test.php +++ b/test/classes/navigation/PMA_Node_Index_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_Index_Container class diff --git a/test/classes/navigation/PMA_Node_Procedure_Container_test.php b/test/classes/navigation/PMA_Node_Procedure_Container_test.php index 49278b6fb8..7bf15552b2 100644 --- a/test/classes/navigation/PMA_Node_Procedure_Container_test.php +++ b/test/classes/navigation/PMA_Node_Procedure_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_Procedure_Container class diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/PMA_Node_Table_Container_test.php index 2eee4c743c..01472d043c 100644 --- a/test/classes/navigation/PMA_Node_Table_Container_test.php +++ b/test/classes/navigation/PMA_Node_Table_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_Table_Container class diff --git a/test/classes/navigation/PMA_Node_Trigger_Container_test.php b/test/classes/navigation/PMA_Node_Trigger_Container_test.php index 281f93f177..6806551e8c 100644 --- a/test/classes/navigation/PMA_Node_Trigger_Container_test.php +++ b/test/classes/navigation/PMA_Node_Trigger_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_Trigger class diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/PMA_Node_View_Container_test.php index 2c7f515836..43245dae68 100644 --- a/test/classes/navigation/PMA_Node_View_Container_test.php +++ b/test/classes/navigation/PMA_Node_View_Container_test.php @@ -9,6 +9,7 @@ require_once 'libraries/navigation/NodeFactory.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Node_View_Container class diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 8d9b2669e1..087b6b6152 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -16,6 +16,8 @@ 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/Response.class.php'; +require_once 'libraries/js_escape.lib.php'; /** * tests for AuthenticationCookie class diff --git a/test/classes/plugin/export/PMA_ExportCsv_test.php b/test/classes/plugin/export/PMA_ExportCsv_test.php index a01aed9f66..0955d9114e 100644 --- a/test/classes/plugin/export/PMA_ExportCsv_test.php +++ b/test/classes/plugin/export/PMA_ExportCsv_test.php @@ -11,6 +11,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/php-gettext/gettext.inc'; require_once 'export.php'; /** * tests for ExportCsv class diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/PMA_ExportHtmlword_test.php index 7491fd6db2..2e8e2b0e86 100644 --- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php +++ b/test/classes/plugin/export/PMA_ExportHtmlword_test.php @@ -12,6 +12,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/relation.lib.php'; require_once 'export.php'; /** * tests for ExportHtmlword class diff --git a/test/classes/plugin/export/PMA_ExportOdt_test.php b/test/classes/plugin/export/PMA_ExportOdt_test.php index 39977cf672..ef8d89e706 100644 --- a/test/classes/plugin/export/PMA_ExportOdt_test.php +++ b/test/classes/plugin/export/PMA_ExportOdt_test.php @@ -11,7 +11,10 @@ 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/DatabaseInterface.class.php'; +require_once 'libraries/relation.lib.php'; require_once 'export.php'; + /** * tests for ExportOdt class * diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/PMA_ExportTexytext_test.php index b07ffe9123..4f9ede6467 100644 --- a/test/classes/plugin/export/PMA_ExportTexytext_test.php +++ b/test/classes/plugin/export/PMA_ExportTexytext_test.php @@ -11,6 +11,9 @@ 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/DatabaseInterface.class.php'; +require_once 'libraries/relation.lib.php'; +require_once 'libraries/sqlparser.lib.php'; require_once 'export.php'; /** * tests for ExportTexytext class diff --git a/test/classes/plugin/export/PMA_ExportYaml_test.php b/test/classes/plugin/export/PMA_ExportYaml_test.php index 95f8ad2912..60e8113c3a 100644 --- a/test/classes/plugin/export/PMA_ExportYaml_test.php +++ b/test/classes/plugin/export/PMA_ExportYaml_test.php @@ -11,6 +11,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/database_interface.inc.php'; require_once 'export.php'; /** * tests for ExportYaml class diff --git a/test/classes/plugin/export/PMA_TableProperty_test.php b/test/classes/plugin/export/PMA_TableProperty_test.php index 847be701ca..8f686f1e1e 100644 --- a/test/classes/plugin/export/PMA_TableProperty_test.php +++ b/test/classes/plugin/export/PMA_TableProperty_test.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-test */ require_once 'libraries/plugins/export/TableProperty.class.php'; +require_once 'libraries/plugins/export/ExportCodegen.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; require_once 'libraries/Config.class.php'; diff --git a/test/classes/plugin/transformations/Image_JPEG_Inline_test.php b/test/classes/plugin/transformations/Image_JPEG_Inline_test.php index 5f491dcb23..4172f1770d 100644 --- a/test/classes/plugin/transformations/Image_JPEG_Inline_test.php +++ b/test/classes/plugin/transformations/Image_JPEG_Inline_test.php @@ -12,6 +12,7 @@ /* Each PluginObserver instance contains a PluginManager instance */ require_once 'libraries/plugins/PluginManager.class.php'; require_once 'libraries/plugins/transformations/Image_JPEG_Inline.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Image_JPEG_Inline class diff --git a/test/classes/plugin/transformations/Image_Link_test.php b/test/classes/plugin/transformations/Image_Link_test.php index d5c72e062d..5e4ee755b2 100644 --- a/test/classes/plugin/transformations/Image_Link_test.php +++ b/test/classes/plugin/transformations/Image_Link_test.php @@ -12,6 +12,7 @@ /* Each PluginObserver instance contains a PluginManager instance */ require_once 'libraries/plugins/PluginManager.class.php'; require_once 'libraries/plugins/transformations/Image_JPEG_Link.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Image_JPEG_Link class diff --git a/test/classes/plugin/transformations/Image_PNG_Inline_test.php b/test/classes/plugin/transformations/Image_PNG_Inline_test.php index 01762e7783..7029c06e7b 100644 --- a/test/classes/plugin/transformations/Image_PNG_Inline_test.php +++ b/test/classes/plugin/transformations/Image_PNG_Inline_test.php @@ -12,6 +12,7 @@ /* Each PluginObserver instance contains a PluginManager instance */ require_once 'libraries/plugins/PluginManager.class.php'; require_once 'libraries/plugins/transformations/Image_PNG_Inline.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Image_PNG_Inline class diff --git a/test/classes/plugin/transformations/Text_Plain_Formatted_test.php b/test/classes/plugin/transformations/Text_Plain_Formatted_test.php index 3d95c1c0e8..a5e93e5106 100644 --- a/test/classes/plugin/transformations/Text_Plain_Formatted_test.php +++ b/test/classes/plugin/transformations/Text_Plain_Formatted_test.php @@ -12,6 +12,7 @@ /* Each PluginObserver instance contains a PluginManager instance */ require_once 'libraries/plugins/PluginManager.class.php'; require_once 'libraries/plugins/transformations/Text_Plain_Formatted.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Text_Plain_Formatted class diff --git a/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php b/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php index 19c48a6c37..9c87cd35d9 100644 --- a/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php +++ b/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php @@ -12,6 +12,7 @@ /* Each PluginObserver instance contains a PluginManager instance */ require_once 'libraries/plugins/PluginManager.class.php'; require_once 'libraries/plugins/transformations/Text_Plain_Imagelink.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for Text_Plain_Imagelink class diff --git a/test/classes/plugin/transformations/Text_Plain_Link_test.php b/test/classes/plugin/transformations/Text_Plain_Link_test.php index 60991f4f90..575a84ca5f 100644 --- a/test/classes/plugin/transformations/Text_Plain_Link_test.php +++ b/test/classes/plugin/transformations/Text_Plain_Link_test.php @@ -10,6 +10,7 @@ */ /* Each PluginObserver instance contains a PluginManager instance */ +require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/plugins/PluginManager.class.php'; require_once 'libraries/plugins/transformations/Text_Plain_Link.class.php'; diff --git a/test/classes/plugin/transformations/Text_Plain_Sql_test.php b/test/classes/plugin/transformations/Text_Plain_Sql_test.php index 30b7d62e3a..04270791c8 100644 --- a/test/classes/plugin/transformations/Text_Plain_Sql_test.php +++ b/test/classes/plugin/transformations/Text_Plain_Sql_test.php @@ -12,6 +12,8 @@ /* Each PluginObserver instance contains a PluginManager instance */ require_once 'libraries/plugins/PluginManager.class.php'; require_once 'libraries/plugins/transformations/Text_Plain_Sql.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; +require_once 'libraries/sqlparser.lib.php'; /** * Tests for Text_Plain_Sql class diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php index d4f2cce695..2cc0df7192 100644 --- a/test/libraries/PMA_FormDisplay_tpl_test.php +++ b/test/libraries/PMA_FormDisplay_tpl_test.php @@ -13,6 +13,9 @@ require_once 'libraries/Theme.class.php'; require_once 'libraries/Config.class.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/user_preferences.lib.php'; +require_once 'libraries/php-gettext/gettext.inc'; +require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/js_escape.lib.php'; /** * Tests for FromDisplay.tpl.php diff --git a/test/libraries/PMA_SetupIndex_test.php b/test/libraries/PMA_SetupIndex_test.php index 675b5a57c9..2a6e59ab66 100644 --- a/test/libraries/PMA_SetupIndex_test.php +++ b/test/libraries/PMA_SetupIndex_test.php @@ -16,6 +16,8 @@ require_once 'libraries/config/ConfigFile.class.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/Util.class.php'; require_once 'setup/lib/index.lib.php'; +require_once 'libraries/php-gettext/gettext.inc'; +require_once 'libraries/sanitizing.lib.php'; /** * tests for methods under setup/lib/index.lib.php diff --git a/test/libraries/PMA_Tracker_test.php b/test/libraries/PMA_Tracker_test.php index 425cd6d950..0b6d3d415d 100644 --- a/test/libraries/PMA_Tracker_test.php +++ b/test/libraries/PMA_Tracker_test.php @@ -12,6 +12,7 @@ require_once 'libraries/Tracker.class.php'; require_once 'libraries/Util.class.php'; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'libraries/relation.lib.php'; /** * Tests for Tracking changes on databases, tables and views diff --git a/test/libraries/PMA_config_functions_test.php b/test/libraries/PMA_config_functions_test.php index 69e988278d..2b55ed3af8 100644 --- a/test/libraries/PMA_config_functions_test.php +++ b/test/libraries/PMA_config_functions_test.php @@ -10,6 +10,7 @@ * Include to test. */ require_once 'libraries/config/config_functions.lib.php'; +require_once 'libraries/sanitizing.lib.php'; /** * Tests for Config Functions diff --git a/test/libraries/PMA_kanji-encoding_test.php b/test/libraries/PMA_kanji-encoding_test.php index fcbdec9401..3a29861e6b 100644 --- a/test/libraries/PMA_kanji-encoding_test.php +++ b/test/libraries/PMA_kanji-encoding_test.php @@ -9,6 +9,7 @@ /* * Include to test. */ +require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/kanji-encoding.lib.php'; /** diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php index 58195ec5ae..1726b5c88b 100644 --- a/test/libraries/PMA_tbl_columns_definition_form_test.php +++ b/test/libraries/PMA_tbl_columns_definition_form_test.php @@ -9,9 +9,11 @@ /* * Include to test. */ +require_once 'libraries/Util.class.php'; require_once 'libraries/tbl_columns_definition_form.lib.php'; require_once 'libraries/Partition.class.php'; require_once 'libraries/Types.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; /** * Tests for libraries/tbl_columns_definition_form.lib.php diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index e9c612e49b..24df9fe632 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -15,6 +15,7 @@ require_once 'libraries/Util.class.php'; require_once 'libraries/Theme.class.php'; require_once 'libraries/Config.class.php'; require_once 'libraries/select_lang.lib.php'; +require_once 'libraries/sanitizing.lib.php'; class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase { diff --git a/test/libraries/database_interface_test.php b/test/libraries/database_interface_test.php index 92638027b8..e26d9164fa 100644 --- a/test/libraries/database_interface_test.php +++ b/test/libraries/database_interface_test.php @@ -12,6 +12,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/Tracker.class.php'; +require_once 'libraries/charset_conversion.lib.php'; /** * Tests basic functionality of dummy dbi driver