Merge pull request #764 from ptarjan/master

Make unit tests friendlier to running independently

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

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.

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.

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.

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

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';
 
 /**

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

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';

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

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

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

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

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

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

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

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

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

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

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

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
  *

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

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

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';

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

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

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

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

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

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';
 

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

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

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

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

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

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';
 
 /**

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

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
 {

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