From ab4927385669422087e646a58c3095d4cea628d4 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 15 Oct 2015 20:57:27 +1100 Subject: [PATCH 1/6] Rename test classes Signed-off-by: Madhura Jayaratne --- test/classes/{PMA_Advisor_test.php => AdvisorTest.php} | 2 +- test/classes/{PMA_Config_test.php => ConfigTest.php} | 2 +- ...A_DatabaseInterface_test.php => DatabaseInterfaceTest.php} | 2 +- test/classes/{PMA_DbQbe_test.php => DbQbeTest.php} | 2 +- test/classes/{PMA_DbSearch_test.php => DbSearchTest.php} | 2 +- .../{PMA_DisplayResults_test.php => DisplayResultsTest.php} | 2 +- .../{PMA_ErrorHandler_test.php => ErrorHandlerTest.php} | 2 +- test/classes/{PMA_Error_test.php => ErrorTest.php} | 2 +- test/classes/{PMA_File_test.php => FileTest.php} | 2 +- test/classes/{PMA_Font_test.php => FontTest.php} | 2 +- test/classes/{PMA_Footer_test.php => FooterTest.php} | 2 +- test/classes/{PMA_Header_test.php => HeaderTest.php} | 2 +- test/classes/{PMA_Index_test.php => IndexTest.php} | 2 +- .../{PMA_List_Database_test.php => ListDatabaseTest.php} | 2 +- test/classes/{PMA_Menu_test.php => MenuTest.php} | 2 +- test/classes/{PMA_Message_test.php => MessageTest.php} | 2 +- test/classes/{PMA_PDF_test.php => PDFTest.php} | 2 +- test/classes/{PMA_Scripts_test.php => ScriptsTest.php} | 2 +- ...PMA_ServerStatusData_test.php => ServerStatusDataTest.php} | 2 +- .../{PMA_StorageEngine_test.php => StorageEngineTest.php} | 2 +- .../{PMA_SystemDatabase_test.php => SystemDatabaseTest.php} | 2 +- test/classes/{PMA_Table_test.php => TableTest.php} | 2 +- test/classes/{PMA_Template_test.php => TemplateTest.php} | 2 +- .../{PMA_Theme_Manager_test.php => ThemeManagerTest.php} | 2 +- test/classes/{PMA_Theme_test.php => ThemeTest.php} | 2 +- test/classes/{PMA_Types_MySQL_test.php => TypesMySQLTest.php} | 2 +- test/classes/{PMA_Types_test.php => TypesTest.php} | 2 +- test/classes/{PMA_Util_test.php => UtilTest.php} | 2 +- ...VersionInformation_test.php => VersionInformationTest.php} | 0 .../config/{PMA_FormDisplay_test.php => FormDisplayTest.php} | 2 +- test/classes/config/{PMA_Form_test.php => FormTest.php} | 2 +- ...ontroller_test.php => DatabaseStructureControllerTest.php} | 2 +- ...exesController_test.php => TableIndexesControllerTest.php} | 2 +- ...ionController_test.php => TableRelationControllerTest.php} | 2 +- ...earchController_test.php => TableSearchControllerTest.php} | 2 +- ...reController_test.php => TableStructureControllerTest.php} | 2 +- test/classes/dbi/{DBIMysql_test.php => DBIMysqlTest.php} | 2 +- test/classes/dbi/{DBIMysqli_test.php => DBIMysqliTest.php} | 2 +- .../gis/{PMA_GIS_Factory_test.php => GISFactoryTest.php} | 2 +- test/classes/gis/{PMA_GIS_Geom_test.php => GISGeomTest.php} | 4 ++-- .../gis/{PMA_GIS_Geometry_test.php => GISGeometryTest.php} | 2 +- ...metrycollection_test.php => GISGeometrycollectionTest.php} | 2 +- .../{PMA_GIS_Linestring_test.php => GISLinestringTest.php} | 2 +- ...IS_Multilinestring_test.php => GISMultilinestringTest.php} | 2 +- .../{PMA_GIS_Multipoint_test.php => GISMultipointTest.php} | 2 +- ...{PMA_GIS_Multipolygon_test.php => GISMultipolygonTest.php} | 2 +- test/classes/gis/{PMA_GIS_Point_test.php => GISPointTest.php} | 2 +- .../gis/{PMA_GIS_Polygon_test.php => GISPolygonTest.php} | 2 +- .../{PMA_Navigation_test.php => NavigationTest.php} | 2 +- .../{PMA_NavigationTree_test.php => NavigationTreeTest.php} | 2 +- ..._Column_Container_test.php => NodeColumnContainerTest.php} | 2 +- .../{PMA_Node_Column_test.php => NodeColumnTest.php} | 2 +- ..._Node_DatabaseChild_test.php => NodeDatabaseChildTest.php} | 2 +- .../{PMA_Node_Database_test.php => NodeDatabaseTest.php} | 2 +- ...de_Event_Container_test.php => NodeEventContainerTest.php} | 2 +- .../navigation/{PMA_Node_Event_test.php => NodeEventTest.php} | 2 +- .../{PMA_NodeFactory_test.php => NodeFactoryTest.php} | 2 +- ...ction_Container_test.php => NodeFunctionContainerTest.php} | 2 +- .../{PMA_Node_Function_test.php => NodeFunctionTest.php} | 2 +- ...de_Index_Container_test.php => NodeIndexContainerTest.php} | 2 +- .../navigation/{PMA_Node_Index_test.php => NodeIndexTest.php} | 2 +- ...dure_Container_test.php => NodeProcedureContainerTest.php} | 2 +- .../{PMA_Node_Procedure_test.php => NodeProcedureTest.php} | 2 +- ...de_Table_Container_test.php => NodeTableContainerTest.php} | 2 +- .../navigation/{PMA_Node_Table_test.php => NodeTableTest.php} | 2 +- test/classes/navigation/{PMA_Node_test.php => NodeTest.php} | 2 +- ...rigger_Container_test.php => NodeTriggerContainerTest.php} | 2 +- .../{PMA_Node_Trigger_test.php => NodeTriggerTest.php} | 2 +- ...Node_View_Container_test.php => NodeViewContainerTest.php} | 2 +- .../navigation/{PMA_Node_View_test.php => NodeViewTest.php} | 2 +- ...enticationConfig_test.php => AuthenticationConfigTest.php} | 2 +- ...enticationCookie_test.php => AuthenticationCookieTest.php} | 2 +- ...AuthenticationHttp_test.php => AuthenticationHttpTest.php} | 2 +- ...enticationSignon_test.php => AuthenticationSignonTest.php} | 2 +- .../{PMA_ExportCodegen_test.php => ExportCodegenTest.php} | 2 +- .../export/{PMA_ExportCsv_test.php => ExportCsvTest.php} | 2 +- .../export/{PMA_ExportExcel_test.php => ExportExcelTest.php} | 2 +- .../{PMA_ExportHtmlword_test.php => ExportHtmlwordTest.php} | 2 +- .../export/{PMA_ExportJson_test.php => ExportJsonTest.php} | 2 +- .../export/{PMA_ExportLatex_test.php => ExportLatexTest.php} | 2 +- .../{PMA_ExportMediawiki_test.php => ExportMediawikiTest.php} | 2 +- .../export/{PMA_ExportOds_test.php => ExportOdsTest.php} | 2 +- .../export/{PMA_ExportOdt_test.php => ExportOdtTest.php} | 2 +- .../export/{PMA_ExportPdf_test.php => ExportPdfTest.php} | 2 +- .../{PMA_ExportPhparray_test.php => ExportPhparrayTest.php} | 2 +- .../export/{PMA_ExportSql_test.php => ExportSqlTest.php} | 2 +- .../{PMA_ExportTexytext_test.php => ExportTexytextTest.php} | 2 +- .../export/{PMA_ExportXml_test.php => ExportXmlTest.php} | 2 +- .../export/{PMA_ExportYaml_test.php => ExportYamlTest.php} | 2 +- .../{PMA_TableProperty_test.php => TablePropertyTest.php} | 2 +- .../plugin/import/{ImportCsv_test.php => ImportCsvTest.php} | 2 +- .../plugin/import/{ImportLdi_test.php => ImportLdiTest.php} | 2 +- .../{ImportMediawiki_test.php => ImportMediawikiTest.php} | 2 +- .../plugin/import/{ImportOds_test.php => ImportOdsTest.php} | 2 +- .../plugin/import/{ImportShp_test.php => ImportShpTest.php} | 2 +- .../plugin/import/{ImportSql_test.php => ImportSqlTest.php} | 2 +- .../plugin/import/{ImportXml_test.php => ImportXmlTest.php} | 2 +- ...rmation_Plugins_test.php => TransformationPluginsTest.php} | 2 +- .../{PMA_PropertyItem_test.php => PropertyItemTest.php} | 2 +- ...onsPropertyGroup_test.php => OptionsPropertyGroupTest.php} | 2 +- ...tionsPropertyItem_test.php => OptionsPropertyItemTest.php} | 2 +- ...ropertyOneItem_test.php => OptionsPropertyOneItemTest.php} | 2 +- ...rtyMainGroup_test.php => OptionsPropertyMainGroupTest.php} | 2 +- ...rtyRootGroup_test.php => OptionsPropertyRootGroupTest.php} | 2 +- ...pertySubgroup_test.php => OptionsPropertySubgroupTest.php} | 2 +- .../{PMA_PropertyItems_test.php => PropertyItemsTest.php} | 2 +- ...uginProperties_test.php => ExportPluginPropertiesTest.php} | 2 +- ...uginProperties_test.php => ImportPluginPropertiesTest.php} | 2 +- ...PluginPropertyItem_test.php => PluginPropertyItemTest.php} | 2 +- ...Dia_Relation_Schema_test.php => DiaRelationSchemaTest.php} | 2 +- ...Eps_Relation_Schema_test.php => EpsRelationSchemaTest.php} | 2 +- ..._Relation_Schema_test.php => ExportRelationSchemaTest.php} | 2 +- ...Pdf_Relation_Schema_test.php => PdfRelationSchemaTest.php} | 2 +- ...Svg_Relation_Schema_test.php => SvgRelationSchemaTest.php} | 2 +- 114 files changed, 114 insertions(+), 114 deletions(-) rename test/classes/{PMA_Advisor_test.php => AdvisorTest.php} (99%) rename test/classes/{PMA_Config_test.php => ConfigTest.php} (99%) rename test/classes/{PMA_DatabaseInterface_test.php => DatabaseInterfaceTest.php} (97%) rename test/classes/{PMA_DbQbe_test.php => DbQbeTest.php} (99%) rename test/classes/{PMA_DbSearch_test.php => DbSearchTest.php} (99%) rename test/classes/{PMA_DisplayResults_test.php => DisplayResultsTest.php} (99%) rename test/classes/{PMA_ErrorHandler_test.php => ErrorHandlerTest.php} (99%) rename test/classes/{PMA_Error_test.php => ErrorTest.php} (98%) rename test/classes/{PMA_File_test.php => FileTest.php} (96%) rename test/classes/{PMA_Font_test.php => FontTest.php} (99%) rename test/classes/{PMA_Footer_test.php => FooterTest.php} (99%) rename test/classes/{PMA_Header_test.php => HeaderTest.php} (98%) rename test/classes/{PMA_Index_test.php => IndexTest.php} (98%) rename test/classes/{PMA_List_Database_test.php => ListDatabaseTest.php} (97%) rename test/classes/{PMA_Menu_test.php => MenuTest.php} (98%) rename test/classes/{PMA_Message_test.php => MessageTest.php} (99%) rename test/classes/{PMA_PDF_test.php => PDFTest.php} (96%) rename test/classes/{PMA_Scripts_test.php => ScriptsTest.php} (99%) rename test/classes/{PMA_ServerStatusData_test.php => ServerStatusDataTest.php} (98%) rename test/classes/{PMA_StorageEngine_test.php => StorageEngineTest.php} (98%) rename test/classes/{PMA_SystemDatabase_test.php => SystemDatabaseTest.php} (98%) rename test/classes/{PMA_Table_test.php => TableTest.php} (99%) rename test/classes/{PMA_Template_test.php => TemplateTest.php} (95%) rename test/classes/{PMA_Theme_Manager_test.php => ThemeManagerTest.php} (98%) rename test/classes/{PMA_Theme_test.php => ThemeTest.php} (99%) rename test/classes/{PMA_Types_MySQL_test.php => TypesMySQLTest.php} (99%) rename test/classes/{PMA_Types_test.php => TypesTest.php} (99%) rename test/classes/{PMA_Util_test.php => UtilTest.php} (97%) rename test/classes/{VersionInformation_test.php => VersionInformationTest.php} (100%) rename test/classes/config/{PMA_FormDisplay_test.php => FormDisplayTest.php} (99%) rename test/classes/config/{PMA_Form_test.php => FormTest.php} (99%) rename test/classes/controllers/{DatabaseStructureController_test.php => DatabaseStructureControllerTest.php} (99%) rename test/classes/controllers/{TableIndexesController_test.php => TableIndexesControllerTest.php} (98%) rename test/classes/controllers/{TableRelationController_test.php => TableRelationControllerTest.php} (99%) rename test/classes/controllers/{TableSearchController_test.php => TableSearchControllerTest.php} (99%) rename test/classes/controllers/{TableStructureController_test.php => TableStructureControllerTest.php} (99%) rename test/classes/dbi/{DBIMysql_test.php => DBIMysqlTest.php} (99%) rename test/classes/dbi/{DBIMysqli_test.php => DBIMysqliTest.php} (99%) rename test/classes/gis/{PMA_GIS_Factory_test.php => GISFactoryTest.php} (96%) rename test/classes/gis/{PMA_GIS_Geom_test.php => GISGeomTest.php} (91%) rename test/classes/gis/{PMA_GIS_Geometry_test.php => GISGeometryTest.php} (99%) rename test/classes/gis/{PMA_GIS_Geometrycollection_test.php => GISGeometrycollectionTest.php} (99%) rename test/classes/gis/{PMA_GIS_Linestring_test.php => GISLinestringTest.php} (99%) rename test/classes/gis/{PMA_GIS_Multilinestring_test.php => GISMultilinestringTest.php} (99%) rename test/classes/gis/{PMA_GIS_Multipoint_test.php => GISMultipointTest.php} (99%) rename test/classes/gis/{PMA_GIS_Multipolygon_test.php => GISMultipolygonTest.php} (99%) rename test/classes/gis/{PMA_GIS_Point_test.php => GISPointTest.php} (99%) rename test/classes/gis/{PMA_GIS_Polygon_test.php => GISPolygonTest.php} (99%) rename test/classes/navigation/{PMA_Navigation_test.php => NavigationTest.php} (98%) rename test/classes/navigation/{PMA_NavigationTree_test.php => NavigationTreeTest.php} (97%) rename test/classes/navigation/{PMA_Node_Column_Container_test.php => NodeColumnContainerTest.php} (94%) rename test/classes/navigation/{PMA_Node_Column_test.php => NodeColumnTest.php} (94%) rename test/classes/navigation/{PMA_Node_DatabaseChild_test.php => NodeDatabaseChildTest.php} (97%) rename test/classes/navigation/{PMA_Node_Database_test.php => NodeDatabaseTest.php} (98%) rename test/classes/navigation/{PMA_Node_Event_Container_test.php => NodeEventContainerTest.php} (94%) rename test/classes/navigation/{PMA_Node_Event_test.php => NodeEventTest.php} (94%) rename test/classes/navigation/{PMA_NodeFactory_test.php => NodeFactoryTest.php} (97%) rename test/classes/navigation/{PMA_Node_Function_Container_test.php => NodeFunctionContainerTest.php} (94%) rename test/classes/navigation/{PMA_Node_Function_test.php => NodeFunctionTest.php} (94%) rename test/classes/navigation/{PMA_Node_Index_Container_test.php => NodeIndexContainerTest.php} (94%) rename test/classes/navigation/{PMA_Node_Index_test.php => NodeIndexTest.php} (94%) rename test/classes/navigation/{PMA_Node_Procedure_Container_test.php => NodeProcedureContainerTest.php} (94%) rename test/classes/navigation/{PMA_Node_Procedure_test.php => NodeProcedureTest.php} (94%) rename test/classes/navigation/{PMA_Node_Table_Container_test.php => NodeTableContainerTest.php} (95%) rename test/classes/navigation/{PMA_Node_Table_test.php => NodeTableTest.php} (97%) rename test/classes/navigation/{PMA_Node_test.php => NodeTest.php} (99%) rename test/classes/navigation/{PMA_Node_Trigger_Container_test.php => NodeTriggerContainerTest.php} (94%) rename test/classes/navigation/{PMA_Node_Trigger_test.php => NodeTriggerTest.php} (94%) rename test/classes/navigation/{PMA_Node_View_Container_test.php => NodeViewContainerTest.php} (95%) rename test/classes/navigation/{PMA_Node_View_test.php => NodeViewTest.php} (95%) rename test/classes/plugin/auth/{PMA_AuthenticationConfig_test.php => AuthenticationConfigTest.php} (98%) rename test/classes/plugin/auth/{PMA_AuthenticationCookie_test.php => AuthenticationCookieTest.php} (99%) rename test/classes/plugin/auth/{PMA_AuthenticationHttp_test.php => AuthenticationHttpTest.php} (99%) rename test/classes/plugin/auth/{PMA_AuthenticationSignon_test.php => AuthenticationSignonTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportCodegen_test.php => ExportCodegenTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportCsv_test.php => ExportCsvTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportExcel_test.php => ExportExcelTest.php} (98%) rename test/classes/plugin/export/{PMA_ExportHtmlword_test.php => ExportHtmlwordTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportJson_test.php => ExportJsonTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportLatex_test.php => ExportLatexTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportMediawiki_test.php => ExportMediawikiTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportOds_test.php => ExportOdsTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportOdt_test.php => ExportOdtTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportPdf_test.php => ExportPdfTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportPhparray_test.php => ExportPhparrayTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportSql_test.php => ExportSqlTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportTexytext_test.php => ExportTexytextTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportXml_test.php => ExportXmlTest.php} (99%) rename test/classes/plugin/export/{PMA_ExportYaml_test.php => ExportYamlTest.php} (99%) rename test/classes/plugin/export/{PMA_TableProperty_test.php => TablePropertyTest.php} (99%) rename test/classes/plugin/import/{ImportCsv_test.php => ImportCsvTest.php} (98%) rename test/classes/plugin/import/{ImportLdi_test.php => ImportLdiTest.php} (99%) rename test/classes/plugin/import/{ImportMediawiki_test.php => ImportMediawikiTest.php} (98%) rename test/classes/plugin/import/{ImportOds_test.php => ImportOdsTest.php} (98%) rename test/classes/plugin/import/{ImportShp_test.php => ImportShpTest.php} (98%) rename test/classes/plugin/import/{ImportSql_test.php => ImportSqlTest.php} (98%) rename test/classes/plugin/import/{ImportXml_test.php => ImportXmlTest.php} (98%) rename test/classes/plugin/transformations/{Transformation_Plugins_test.php => TransformationPluginsTest.php} (99%) rename test/classes/properties/{PMA_PropertyItem_test.php => PropertyItemTest.php} (93%) rename test/classes/properties/options/{PMA_OptionsPropertyGroup_test.php => OptionsPropertyGroupTest.php} (97%) rename test/classes/properties/options/{PMA_OptionsPropertyItem_test.php => OptionsPropertyItemTest.php} (97%) rename test/classes/properties/options/{PMA_OptionsPropertyOneItem_test.php => OptionsPropertyOneItemTest.php} (97%) rename test/classes/properties/options/groups/{PMA_OptionsPropertyMainGroup_test.php => OptionsPropertyMainGroupTest.php} (93%) rename test/classes/properties/options/groups/{PMA_OptionsPropertyRootGroup_test.php => OptionsPropertyRootGroupTest.php} (93%) rename test/classes/properties/options/groups/{PMA_OptionsPropertySubgroup_test.php => OptionsPropertySubgroupTest.php} (95%) rename test/classes/properties/options/items/{PMA_PropertyItems_test.php => PropertyItemsTest.php} (97%) rename test/classes/properties/plugins/{PMA_ExportPluginProperties_test.php => ExportPluginPropertiesTest.php} (95%) rename test/classes/properties/plugins/{PMA_ImportPluginProperties_test.php => ImportPluginPropertiesTest.php} (96%) rename test/classes/properties/plugins/{PMA_PluginPropertyItem_test.php => PluginPropertyItemTest.php} (94%) rename test/classes/schema/{Dia_Relation_Schema_test.php => DiaRelationSchemaTest.php} (98%) rename test/classes/schema/{Eps_Relation_Schema_test.php => EpsRelationSchemaTest.php} (98%) rename test/classes/schema/{Export_Relation_Schema_test.php => ExportRelationSchemaTest.php} (98%) rename test/classes/schema/{Pdf_Relation_Schema_test.php => PdfRelationSchemaTest.php} (99%) rename test/classes/schema/{Svg_Relation_Schema_test.php => SvgRelationSchemaTest.php} (98%) diff --git a/test/classes/PMA_Advisor_test.php b/test/classes/AdvisorTest.php similarity index 99% rename from test/classes/PMA_Advisor_test.php rename to test/classes/AdvisorTest.php index 8c618371d3..ab7ce04578 100644 --- a/test/classes/PMA_Advisor_test.php +++ b/test/classes/AdvisorTest.php @@ -21,7 +21,7 @@ use PMA\libraries\Theme; * * @package PhpMyAdmin-test */ -class Advisor_Test extends PHPUnit_Framework_TestCase +class AdvisorTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/classes/PMA_Config_test.php b/test/classes/ConfigTest.php similarity index 99% rename from test/classes/PMA_Config_test.php rename to test/classes/ConfigTest.php index 9cee5b6caa..57026bac14 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/ConfigTest.php @@ -23,7 +23,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class PMA_ConfigTest extends PHPUnit_Framework_TestCase +class ConfigTest extends PHPUnit_Framework_TestCase { /** * Turn off backup globals diff --git a/test/classes/PMA_DatabaseInterface_test.php b/test/classes/DatabaseInterfaceTest.php similarity index 97% rename from test/classes/PMA_DatabaseInterface_test.php rename to test/classes/DatabaseInterfaceTest.php index e4f0b48672..d640867b73 100644 --- a/test/classes/PMA_DatabaseInterface_test.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -16,7 +16,7 @@ require_once 'libraries/dbi/DBIDummy.php'; * * @package PhpMyAdmin-test */ -class PMA_DatabaseInterface_Test extends PHPUnit_Framework_TestCase +class DatabaseInterfaceTest extends PHPUnit_Framework_TestCase { private $_dbi; diff --git a/test/classes/PMA_DbQbe_test.php b/test/classes/DbQbeTest.php similarity index 99% rename from test/classes/PMA_DbQbe_test.php rename to test/classes/DbQbeTest.php index c5d5753515..f96ff4771b 100644 --- a/test/classes/PMA_DbQbe_test.php +++ b/test/classes/DbQbeTest.php @@ -21,7 +21,7 @@ use PMA\libraries\DbQbe; * * @package PhpMyAdmin-test */ -class PMA_DbQbe_Test extends PHPUnit_Framework_TestCase +class DbQbeTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/DbSearchTest.php similarity index 99% rename from test/classes/PMA_DbSearch_test.php rename to test/classes/DbSearchTest.php index e533d30841..547a3b6124 100644 --- a/test/classes/PMA_DbSearch_test.php +++ b/test/classes/DbSearchTest.php @@ -22,7 +22,7 @@ use PMA\libraries\Theme; * * @package PhpMyAdmin-test */ -class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase +class DbSearchTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/DisplayResultsTest.php similarity index 99% rename from test/classes/PMA_DisplayResults_test.php rename to test/classes/DisplayResultsTest.php index 850e402b1c..9c8532fbcf 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/DisplayResultsTest.php @@ -22,7 +22,7 @@ require_once 'libraries/string.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase +class DisplayResultsTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_ErrorHandler_test.php b/test/classes/ErrorHandlerTest.php similarity index 99% rename from test/classes/PMA_ErrorHandler_test.php rename to test/classes/ErrorHandlerTest.php index 4ffd60da4f..ccdadd6423 100644 --- a/test/classes/PMA_ErrorHandler_test.php +++ b/test/classes/ErrorHandlerTest.php @@ -18,7 +18,7 @@ require_once 'libraries/sanitizing.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_ErrorHandler_Test extends PHPUnit_Framework_TestCase +class ErrorHandlerTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_Error_test.php b/test/classes/ErrorTest.php similarity index 98% rename from test/classes/PMA_Error_test.php rename to test/classes/ErrorTest.php index 9203391c48..117158c2e2 100644 --- a/test/classes/PMA_Error_test.php +++ b/test/classes/ErrorTest.php @@ -19,7 +19,7 @@ require_once 'libraries/sanitizing.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_Error_Test extends PHPUnit_Framework_TestCase +class ErrorTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_File_test.php b/test/classes/FileTest.php similarity index 96% rename from test/classes/PMA_File_test.php rename to test/classes/FileTest.php index 5263567288..e2e3cf1709 100644 --- a/test/classes/PMA_File_test.php +++ b/test/classes/FileTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_File_Test extends PHPUnit_Framework_TestCase +class FileTest extends PHPUnit_Framework_TestCase { /** * Setup function for test cases diff --git a/test/classes/PMA_Font_test.php b/test/classes/FontTest.php similarity index 99% rename from test/classes/PMA_Font_test.php rename to test/classes/FontTest.php index f9178b3c44..20e9a2ff64 100644 --- a/test/classes/PMA_Font_test.php +++ b/test/classes/FontTest.php @@ -10,7 +10,7 @@ * * @package PhpMyAdmin-test */ -class PMA_Font_Test extends PHPUnit_Framework_TestCase +class FontTest extends PHPUnit_Framework_TestCase { /** * Test getStringWidth with different characters. diff --git a/test/classes/PMA_Footer_test.php b/test/classes/FooterTest.php similarity index 99% rename from test/classes/PMA_Footer_test.php rename to test/classes/FooterTest.php index bc3728a836..ae39766d4f 100644 --- a/test/classes/PMA_Footer_test.php +++ b/test/classes/FooterTest.php @@ -23,7 +23,7 @@ require_once 'libraries/relation.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_Footer_Test extends PHPUnit_Framework_TestCase +class FooterTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/classes/PMA_Header_test.php b/test/classes/HeaderTest.php similarity index 98% rename from test/classes/PMA_Header_test.php rename to test/classes/HeaderTest.php index 316b2b0b52..3d32fa5a5a 100644 --- a/test/classes/PMA_Header_test.php +++ b/test/classes/HeaderTest.php @@ -26,7 +26,7 @@ require_once 'libraries/js_escape.lib.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_Header_Test extends PHPUnit_Framework_TestCase +class HeaderTest extends PHPUnit_Framework_TestCase { /** * Configures global environment. diff --git a/test/classes/PMA_Index_test.php b/test/classes/IndexTest.php similarity index 98% rename from test/classes/PMA_Index_test.php rename to test/classes/IndexTest.php index 3de7fd779d..689f78aec0 100644 --- a/test/classes/PMA_Index_test.php +++ b/test/classes/IndexTest.php @@ -16,7 +16,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class PMA_Index_Test extends PHPUnit_Framework_TestCase +class IndexTest extends PHPUnit_Framework_TestCase { private $_params = array(); diff --git a/test/classes/PMA_List_Database_test.php b/test/classes/ListDatabaseTest.php similarity index 97% rename from test/classes/PMA_List_Database_test.php rename to test/classes/ListDatabaseTest.php index f3f17b7f57..6910f155dd 100644 --- a/test/classes/PMA_List_Database_test.php +++ b/test/classes/ListDatabaseTest.php @@ -20,7 +20,7 @@ require_once 'libraries/relation.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_List_Database_Test extends PHPUnit_Framework_TestCase +class ListDatabaseTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/PMA_Menu_test.php b/test/classes/MenuTest.php similarity index 98% rename from test/classes/PMA_Menu_test.php rename to test/classes/MenuTest.php index d25f6daf04..b96130052e 100644 --- a/test/classes/PMA_Menu_test.php +++ b/test/classes/MenuTest.php @@ -25,7 +25,7 @@ require_once 'libraries/relation.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_Menu_Test extends PHPUnit_Framework_TestCase +class MenuTest extends PHPUnit_Framework_TestCase { /** * Configures global environment. diff --git a/test/classes/PMA_Message_test.php b/test/classes/MessageTest.php similarity index 99% rename from test/classes/PMA_Message_test.php rename to test/classes/MessageTest.php index 110ccfda25..9dfb51931a 100644 --- a/test/classes/PMA_Message_test.php +++ b/test/classes/MessageTest.php @@ -20,7 +20,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class PMA_Message_Test extends PHPUnit_Framework_TestCase +class MessageTest extends PHPUnit_Framework_TestCase { /** * @var PMA\libraries\Message diff --git a/test/classes/PMA_PDF_test.php b/test/classes/PDFTest.php similarity index 96% rename from test/classes/PMA_PDF_test.php rename to test/classes/PDFTest.php index 6673742b8d..f51dee881f 100644 --- a/test/classes/PMA_PDF_test.php +++ b/test/classes/PDFTest.php @@ -19,7 +19,7 @@ require_once 'libraries/core.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_PDF_Test extends PHPUnit_Framework_TestCase +class PDFTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/PMA_Scripts_test.php b/test/classes/ScriptsTest.php similarity index 99% rename from test/classes/PMA_Scripts_test.php rename to test/classes/ScriptsTest.php index c5f7b780e9..f88d0b5242 100644 --- a/test/classes/PMA_Scripts_test.php +++ b/test/classes/ScriptsTest.php @@ -20,7 +20,7 @@ require_once 'libraries/url_generating.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_Scripts_Test extends PHPUnit_Framework_TestCase +class ScriptsTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_ServerStatusData_test.php b/test/classes/ServerStatusDataTest.php similarity index 98% rename from test/classes/PMA_ServerStatusData_test.php rename to test/classes/ServerStatusDataTest.php index f218afe574..1b09500e31 100644 --- a/test/classes/PMA_ServerStatusData_test.php +++ b/test/classes/ServerStatusDataTest.php @@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_ServerStatusData_Test extends PHPUnit_Framework_TestCase +class ServerStatusDataTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_StorageEngine_test.php b/test/classes/StorageEngineTest.php similarity index 98% rename from test/classes/PMA_StorageEngine_test.php rename to test/classes/StorageEngineTest.php index 349b078ec8..e7dc814401 100644 --- a/test/classes/PMA_StorageEngine_test.php +++ b/test/classes/StorageEngineTest.php @@ -18,7 +18,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_StorageEngineTest extends PHPUnit_Framework_TestCase +class StorageEngineTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/PMA_SystemDatabase_test.php b/test/classes/SystemDatabaseTest.php similarity index 98% rename from test/classes/PMA_SystemDatabase_test.php rename to test/classes/SystemDatabaseTest.php index ffc4611130..eb4d896501 100644 --- a/test/classes/PMA_SystemDatabase_test.php +++ b/test/classes/SystemDatabaseTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_SystemDatabaseTest extends PHPUnit_Framework_TestCase +class SystemDatabaseTest extends PHPUnit_Framework_TestCase { /** * Setup function for test cases diff --git a/test/classes/PMA_Table_test.php b/test/classes/TableTest.php similarity index 99% rename from test/classes/PMA_Table_test.php rename to test/classes/TableTest.php index 87144b4690..08d5e2c324 100644 --- a/test/classes/PMA_Table_test.php +++ b/test/classes/TableTest.php @@ -24,7 +24,7 @@ require_once 'libraries/relation.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_Table_Test extends PHPUnit_Framework_TestCase +class TableTest extends PHPUnit_Framework_TestCase { /** * Configures environment diff --git a/test/classes/PMA_Template_test.php b/test/classes/TemplateTest.php similarity index 95% rename from test/classes/PMA_Template_test.php rename to test/classes/TemplateTest.php index 722723546d..b3913f9b1f 100644 --- a/test/classes/PMA_Template_test.php +++ b/test/classes/TemplateTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_Template_Test extends PHPUnit_Framework_TestCase +class TemplateTest extends PHPUnit_Framework_TestCase { /** * Test for render diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/ThemeManagerTest.php similarity index 98% rename from test/classes/PMA_Theme_Manager_test.php rename to test/classes/ThemeManagerTest.php index 30c083ddb5..731d0a8838 100644 --- a/test/classes/PMA_Theme_Manager_test.php +++ b/test/classes/ThemeManagerTest.php @@ -20,7 +20,7 @@ require_once 'libraries/core.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_Theme_Manager_Test extends PHPUnit_Framework_TestCase +class ThemeManagerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/PMA_Theme_test.php b/test/classes/ThemeTest.php similarity index 99% rename from test/classes/PMA_Theme_test.php rename to test/classes/ThemeTest.php index d5e45fd12c..ad43e93fe0 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/ThemeTest.php @@ -16,7 +16,7 @@ require_once 'libraries/url_generating.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_ThemeTest extends PHPUnit_Framework_TestCase +class ThemeTest extends PHPUnit_Framework_TestCase { /** * @var Theme diff --git a/test/classes/PMA_Types_MySQL_test.php b/test/classes/TypesMySQLTest.php similarity index 99% rename from test/classes/PMA_Types_MySQL_test.php rename to test/classes/TypesMySQLTest.php index d58b5c244e..210660c1a5 100644 --- a/test/classes/PMA_Types_MySQL_test.php +++ b/test/classes/TypesMySQLTest.php @@ -18,7 +18,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class PMA_Types_MySQL_Test extends PHPUnit_Framework_TestCase +class TypesMySQLTest extends PHPUnit_Framework_TestCase { /** * @var PMA\libraries\Types diff --git a/test/classes/PMA_Types_test.php b/test/classes/TypesTest.php similarity index 99% rename from test/classes/PMA_Types_test.php rename to test/classes/TypesTest.php index f900c045c7..eb1f51dd3b 100644 --- a/test/classes/PMA_Types_test.php +++ b/test/classes/TypesTest.php @@ -11,7 +11,7 @@ use PMA\libraries\Types; * * @package PhpMyAdmin-test */ -class PMA_TypesTest extends PHPUnit_Framework_TestCase +class TypesTest extends PHPUnit_Framework_TestCase { /** * @var Types diff --git a/test/classes/PMA_Util_test.php b/test/classes/UtilTest.php similarity index 97% rename from test/classes/PMA_Util_test.php rename to test/classes/UtilTest.php index a60d84a35e..3df90b82b4 100644 --- a/test/classes/PMA_Util_test.php +++ b/test/classes/UtilTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_Util_Test extends PHPUnit_Framework_TestCase +class UtilTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/classes/VersionInformation_test.php b/test/classes/VersionInformationTest.php similarity index 100% rename from test/classes/VersionInformation_test.php rename to test/classes/VersionInformationTest.php diff --git a/test/classes/config/PMA_FormDisplay_test.php b/test/classes/config/FormDisplayTest.php similarity index 99% rename from test/classes/config/PMA_FormDisplay_test.php rename to test/classes/config/FormDisplayTest.php index 8664e0e83f..83ed963c1e 100644 --- a/test/classes/config/PMA_FormDisplay_test.php +++ b/test/classes/config/FormDisplayTest.php @@ -20,7 +20,7 @@ require_once 'libraries/user_preferences.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase +class FormDisplayTest extends PHPUnit_Framework_TestCase { /** * @var FormDisplay diff --git a/test/classes/config/PMA_Form_test.php b/test/classes/config/FormTest.php similarity index 99% rename from test/classes/config/PMA_Form_test.php rename to test/classes/config/FormTest.php index 3de7743d73..a736ae2789 100644 --- a/test/classes/config/PMA_Form_test.php +++ b/test/classes/config/FormTest.php @@ -18,7 +18,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class PMA_Form_Test extends PHPUnit_Framework_TestCase +class FormTest extends PHPUnit_Framework_TestCase { /** * @var Form diff --git a/test/classes/controllers/DatabaseStructureController_test.php b/test/classes/controllers/DatabaseStructureControllerTest.php similarity index 99% rename from test/classes/controllers/DatabaseStructureController_test.php rename to test/classes/controllers/DatabaseStructureControllerTest.php index 658905782c..48f7b76c99 100644 --- a/test/classes/controllers/DatabaseStructureController_test.php +++ b/test/classes/controllers/DatabaseStructureControllerTest.php @@ -26,7 +26,7 @@ require_once 'test/libraries/stubs/ResponseStub.php'; * * @package PhpMyAdmin-test */ -class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase +class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase { /** * @var \PMA\Test\Stubs\Response diff --git a/test/classes/controllers/TableIndexesController_test.php b/test/classes/controllers/TableIndexesControllerTest.php similarity index 98% rename from test/classes/controllers/TableIndexesController_test.php rename to test/classes/controllers/TableIndexesControllerTest.php index 5ad6069d7f..77d1756a29 100644 --- a/test/classes/controllers/TableIndexesController_test.php +++ b/test/classes/controllers/TableIndexesControllerTest.php @@ -31,7 +31,7 @@ require_once 'test/libraries/stubs/ResponseStub.php'; * * @package PhpMyAdmin-test */ -class PMA_TableIndexesControllerTest extends PHPUnit_Framework_TestCase +class TableIndexesControllerTest extends PHPUnit_Framework_TestCase { /** * Setup function for test cases diff --git a/test/classes/controllers/TableRelationController_test.php b/test/classes/controllers/TableRelationControllerTest.php similarity index 99% rename from test/classes/controllers/TableRelationController_test.php rename to test/classes/controllers/TableRelationControllerTest.php index 5d8c8b008f..4932024261 100644 --- a/test/classes/controllers/TableRelationController_test.php +++ b/test/classes/controllers/TableRelationControllerTest.php @@ -23,7 +23,7 @@ require_once 'test/libraries/stubs/ResponseStub.php'; * * @package PhpMyAdmin-test */ -class TableRelationController_Test extends PHPUnit_Framework_TestCase +class TableRelationControllerTest extends PHPUnit_Framework_TestCase { /** * @var \PMA\Test\Stubs\Response diff --git a/test/classes/controllers/TableSearchController_test.php b/test/classes/controllers/TableSearchControllerTest.php similarity index 99% rename from test/classes/controllers/TableSearchController_test.php rename to test/classes/controllers/TableSearchControllerTest.php index 82651b6617..1bf87c0969 100644 --- a/test/classes/controllers/TableSearchController_test.php +++ b/test/classes/controllers/TableSearchControllerTest.php @@ -21,7 +21,7 @@ require_once 'test/libraries/stubs/ResponseStub.php'; * * @package PhpMyAdmin-test */ -class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase +class TableSearchControllerTest extends PHPUnit_Framework_TestCase { /** * @var PMA\Test\Stubs\Response diff --git a/test/classes/controllers/TableStructureController_test.php b/test/classes/controllers/TableStructureControllerTest.php similarity index 99% rename from test/classes/controllers/TableStructureController_test.php rename to test/classes/controllers/TableStructureControllerTest.php index 689557b025..80a96efb07 100644 --- a/test/classes/controllers/TableStructureController_test.php +++ b/test/classes/controllers/TableStructureControllerTest.php @@ -24,7 +24,7 @@ require_once 'test/libraries/stubs/ResponseStub.php'; * * @package PhpMyAdmin-test */ -class TableStructureController_Test extends PHPUnit_Framework_TestCase +class TableStructureControllerTest extends PHPUnit_Framework_TestCase { /** * @var \PMA\Test\Stubs\Response diff --git a/test/classes/dbi/DBIMysql_test.php b/test/classes/dbi/DBIMysqlTest.php similarity index 99% rename from test/classes/dbi/DBIMysql_test.php rename to test/classes/dbi/DBIMysqlTest.php index b5edc27dbb..134f1e2bac 100644 --- a/test/classes/dbi/DBIMysql_test.php +++ b/test/classes/dbi/DBIMysqlTest.php @@ -22,7 +22,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_DBI_Mysql_Test extends PHPUnit_Framework_TestCase +class DBIMysqlTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/dbi/DBIMysqli_test.php b/test/classes/dbi/DBIMysqliTest.php similarity index 99% rename from test/classes/dbi/DBIMysqli_test.php rename to test/classes/dbi/DBIMysqliTest.php index cc391066ed..fe1c185af4 100644 --- a/test/classes/dbi/DBIMysqli_test.php +++ b/test/classes/dbi/DBIMysqliTest.php @@ -21,7 +21,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_DBI_Mysqli_Test extends PHPUnit_Framework_TestCase +class DBIMysqliTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/GISFactoryTest.php similarity index 96% rename from test/classes/gis/PMA_GIS_Factory_test.php rename to test/classes/gis/GISFactoryTest.php index d1fc44c6b1..5a1a924d0f 100644 --- a/test/classes/gis/PMA_GIS_Factory_test.php +++ b/test/classes/gis/GISFactoryTest.php @@ -12,7 +12,7 @@ use PMA\libraries\gis\GISFactory; * * @package PhpMyAdmin-test */ -class PMA_GIS_FactoryTest extends PHPUnit_Framework_TestCase +class GISFactoryTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/GISGeomTest.php similarity index 91% rename from test/classes/gis/PMA_GIS_Geom_test.php rename to test/classes/gis/GISGeomTest.php index 88ffc91722..e303bd8137 100644 --- a/test/classes/gis/PMA_GIS_Geom_test.php +++ b/test/classes/gis/GISGeomTest.php @@ -7,11 +7,11 @@ */ /** - * Abstract parent class for all PMA_GIS_ test classes + * Abstract parent class for all GIS test classes * * @package PhpMyAdmin-test */ -abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase +abstract class GISGeomTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/GISGeometryTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Geometry_test.php rename to test/classes/gis/GISGeometryTest.php index f427eb7b1d..d21b5596f8 100644 --- a/test/classes/gis/PMA_GIS_Geometry_test.php +++ b/test/classes/gis/GISGeometryTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase +class GISGeometryTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/gis/PMA_GIS_Geometrycollection_test.php b/test/classes/gis/GISGeometrycollectionTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Geometrycollection_test.php rename to test/classes/gis/GISGeometrycollectionTest.php index c6c647d498..9a49cd203a 100644 --- a/test/classes/gis/PMA_GIS_Geometrycollection_test.php +++ b/test/classes/gis/GISGeometrycollectionTest.php @@ -15,7 +15,7 @@ require_once 'libraries/tcpdf/tcpdf.php'; * * @package PhpMyAdmin-test */ -class PMA_GIS_GeometryCollectionTest extends PHPUnit_Framework_TestCase +class GISGeometryCollectionTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/GISLinestringTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Linestring_test.php rename to test/classes/gis/GISLinestringTest.php index 5c6d05d3a7..26cff4a5e8 100644 --- a/test/classes/gis/PMA_GIS_Linestring_test.php +++ b/test/classes/gis/GISLinestringTest.php @@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php'; * * @package PhpMyAdmin-test */ -class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest +class GISLinestringTest extends GISGeomTest { /** * @var GISLinestring diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/GISMultilinestringTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Multilinestring_test.php rename to test/classes/gis/GISMultilinestringTest.php index cfd3c23ea2..8f3db77d12 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/GISMultilinestringTest.php @@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php'; * * @package PhpMyAdmin-test */ -class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest +class GISMultilinestringTest extends GISGeomTest { /** * @var GISMultilinestring diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/GISMultipointTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Multipoint_test.php rename to test/classes/gis/GISMultipointTest.php index 1094e42a50..c43fb87de1 100644 --- a/test/classes/gis/PMA_GIS_Multipoint_test.php +++ b/test/classes/gis/GISMultipointTest.php @@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php'; * * @package PhpMyAdmin-test */ -class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest +class GISMultipointTest extends GISGeomTest { /** * @var GISMultipoint diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/GISMultipolygonTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Multipolygon_test.php rename to test/classes/gis/GISMultipolygonTest.php index c69908ee0c..1c0304073b 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/GISMultipolygonTest.php @@ -17,7 +17,7 @@ require_once 'libraries/tcpdf/tcpdf.php'; * * @package PhpMyAdmin-test */ -class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest +class GISMultipolygonTest extends GISGeomTest { /** * @var GISMultipolygon diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/GISPointTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Point_test.php rename to test/classes/gis/GISPointTest.php index 19153ecca9..b37ed6ac92 100644 --- a/test/classes/gis/PMA_GIS_Point_test.php +++ b/test/classes/gis/GISPointTest.php @@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php'; * * @package PhpMyAdmin-test */ -class PMA_GIS_PointTest extends PMA_GIS_GeomTest +class GISPointTest extends GISGeomTest { /** * @var GISPoint diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/GISPolygonTest.php similarity index 99% rename from test/classes/gis/PMA_GIS_Polygon_test.php rename to test/classes/gis/GISPolygonTest.php index a45a379128..65ee3acce8 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/test/classes/gis/GISPolygonTest.php @@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php'; * * @package PhpMyAdmin-test */ -class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest +class GISPolygonTest extends GISGeomTest { /** * @var GISPolygon diff --git a/test/classes/navigation/PMA_Navigation_test.php b/test/classes/navigation/NavigationTest.php similarity index 98% rename from test/classes/navigation/PMA_Navigation_test.php rename to test/classes/navigation/NavigationTest.php index 5cc5d6a087..529d666d50 100644 --- a/test/classes/navigation/PMA_Navigation_test.php +++ b/test/classes/navigation/NavigationTest.php @@ -18,7 +18,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class PMA_NavigationTest extends PHPUnit_Framework_TestCase +class NavigationTest extends PHPUnit_Framework_TestCase { /** * @var PMA\libraries\navigation\Navigation diff --git a/test/classes/navigation/PMA_NavigationTree_test.php b/test/classes/navigation/NavigationTreeTest.php similarity index 97% rename from test/classes/navigation/PMA_NavigationTree_test.php rename to test/classes/navigation/NavigationTreeTest.php index 8d7a74b1ef..45d37b6763 100644 --- a/test/classes/navigation/PMA_NavigationTree_test.php +++ b/test/classes/navigation/NavigationTreeTest.php @@ -27,7 +27,7 @@ require_once 'libraries/check_user_privileges.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_NavigationTreeTest extends PHPUnit_Framework_TestCase +class NavigationTreeTest extends PHPUnit_Framework_TestCase { /** * @var NavigationTree diff --git a/test/classes/navigation/PMA_Node_Column_Container_test.php b/test/classes/navigation/NodeColumnContainerTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Column_Container_test.php rename to test/classes/navigation/NodeColumnContainerTest.php index afba75464c..dde0d35876 100644 --- a/test/classes/navigation/PMA_Node_Column_Container_test.php +++ b/test/classes/navigation/NodeColumnContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Column_Container_Test extends PHPUnit_Framework_TestCase +class NodeColumnContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Column_test.php b/test/classes/navigation/NodeColumnTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Column_test.php rename to test/classes/navigation/NodeColumnTest.php index 64b5d79adc..b1315324c0 100644 --- a/test/classes/navigation/PMA_Node_Column_test.php +++ b/test/classes/navigation/NodeColumnTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Column_Test extends PHPUnit_Framework_TestCase +class NodeColumnTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_DatabaseChild_test.php b/test/classes/navigation/NodeDatabaseChildTest.php similarity index 97% rename from test/classes/navigation/PMA_Node_DatabaseChild_test.php rename to test/classes/navigation/NodeDatabaseChildTest.php index b1bf3dd725..35dc1c2f36 100644 --- a/test/classes/navigation/PMA_Node_DatabaseChild_test.php +++ b/test/classes/navigation/NodeDatabaseChildTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_DatabaseChildTest extends PHPUnit_Framework_TestCase +class NodeDatabaseChildTest extends PHPUnit_Framework_TestCase { /** * @var NodeDatabaseChild diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/NodeDatabaseTest.php similarity index 98% rename from test/classes/navigation/PMA_Node_Database_test.php rename to test/classes/navigation/NodeDatabaseTest.php index 47c8384fd6..561043969e 100644 --- a/test/classes/navigation/PMA_Node_Database_test.php +++ b/test/classes/navigation/NodeDatabaseTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Database_Test extends PHPUnit_Framework_TestCase +class NodeDatabaseTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Event_Container_test.php b/test/classes/navigation/NodeEventContainerTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Event_Container_test.php rename to test/classes/navigation/NodeEventContainerTest.php index 690c56c6ff..e5e552229b 100644 --- a/test/classes/navigation/PMA_Node_Event_Container_test.php +++ b/test/classes/navigation/NodeEventContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Event_Container_Test extends PHPUnit_Framework_TestCase +class NodeEventContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Event_test.php b/test/classes/navigation/NodeEventTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Event_test.php rename to test/classes/navigation/NodeEventTest.php index 8729fc6ab5..987e4c923c 100644 --- a/test/classes/navigation/PMA_Node_Event_test.php +++ b/test/classes/navigation/NodeEventTest.php @@ -18,7 +18,7 @@ require_once 'libraries/navigation/NodeFactory.php'; * * @package PhpMyAdmin-test */ -class Node_Event_Test extends PHPUnit_Framework_TestCase +class NodeEventTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_NodeFactory_test.php b/test/classes/navigation/NodeFactoryTest.php similarity index 97% rename from test/classes/navigation/PMA_NodeFactory_test.php rename to test/classes/navigation/NodeFactoryTest.php index 5f672ba84f..9cbf67c135 100644 --- a/test/classes/navigation/PMA_NodeFactory_test.php +++ b/test/classes/navigation/NodeFactoryTest.php @@ -20,7 +20,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class NodeFactory_Test extends PHPUnit_Framework_TestCase +class NodeFactoryTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Function_Container_test.php b/test/classes/navigation/NodeFunctionContainerTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Function_Container_test.php rename to test/classes/navigation/NodeFunctionContainerTest.php index 5d3e5e584d..69186efd44 100644 --- a/test/classes/navigation/PMA_Node_Function_Container_test.php +++ b/test/classes/navigation/NodeFunctionContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Function_Container_Test extends PHPUnit_Framework_TestCase +class NodeFunctionContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Function_test.php b/test/classes/navigation/NodeFunctionTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Function_test.php rename to test/classes/navigation/NodeFunctionTest.php index c33c06627e..c2c3f9fc94 100644 --- a/test/classes/navigation/PMA_Node_Function_test.php +++ b/test/classes/navigation/NodeFunctionTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Function_Test extends PHPUnit_Framework_TestCase +class NodeFunctionTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Index_Container_test.php b/test/classes/navigation/NodeIndexContainerTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Index_Container_test.php rename to test/classes/navigation/NodeIndexContainerTest.php index 0556c3b3a0..7e29e0d789 100644 --- a/test/classes/navigation/PMA_Node_Index_Container_test.php +++ b/test/classes/navigation/NodeIndexContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Index_Container_Test extends PHPUnit_Framework_TestCase +class NodeIndexContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Index_test.php b/test/classes/navigation/NodeIndexTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Index_test.php rename to test/classes/navigation/NodeIndexTest.php index 1ff0c46a46..f93953045a 100644 --- a/test/classes/navigation/PMA_Node_Index_test.php +++ b/test/classes/navigation/NodeIndexTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Index_Test extends PHPUnit_Framework_TestCase +class NodeIndexTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Procedure_Container_test.php b/test/classes/navigation/NodeProcedureContainerTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Procedure_Container_test.php rename to test/classes/navigation/NodeProcedureContainerTest.php index 1e2f320f28..0b47158686 100644 --- a/test/classes/navigation/PMA_Node_Procedure_Container_test.php +++ b/test/classes/navigation/NodeProcedureContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Procedure_Container_Test extends PHPUnit_Framework_TestCase +class NodeProcedureContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Procedure_test.php b/test/classes/navigation/NodeProcedureTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Procedure_test.php rename to test/classes/navigation/NodeProcedureTest.php index c43e956598..b6ccaf2319 100644 --- a/test/classes/navigation/PMA_Node_Procedure_test.php +++ b/test/classes/navigation/NodeProcedureTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Procedure_Test extends PHPUnit_Framework_TestCase +class NodeProcedureTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/NodeTableContainerTest.php similarity index 95% rename from test/classes/navigation/PMA_Node_Table_Container_test.php rename to test/classes/navigation/NodeTableContainerTest.php index 2f3ef52450..270acc31e2 100644 --- a/test/classes/navigation/PMA_Node_Table_Container_test.php +++ b/test/classes/navigation/NodeTableContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Table_Container_Test extends PHPUnit_Framework_TestCase +class NodeTableContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Table_test.php b/test/classes/navigation/NodeTableTest.php similarity index 97% rename from test/classes/navigation/PMA_Node_Table_test.php rename to test/classes/navigation/NodeTableTest.php index 0a0e6dc326..a606916065 100644 --- a/test/classes/navigation/PMA_Node_Table_test.php +++ b/test/classes/navigation/NodeTableTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Table_Test extends PHPUnit_Framework_TestCase +class NodeTableTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/NodeTest.php similarity index 99% rename from test/classes/navigation/PMA_Node_test.php rename to test/classes/navigation/NodeTest.php index ab272585cf..d12b62fb95 100644 --- a/test/classes/navigation/PMA_Node_test.php +++ b/test/classes/navigation/NodeTest.php @@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class Node_Test extends PHPUnit_Framework_TestCase +class NodeTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Trigger_Container_test.php b/test/classes/navigation/NodeTriggerContainerTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Trigger_Container_test.php rename to test/classes/navigation/NodeTriggerContainerTest.php index 8fd0da91ac..e66b2d73d1 100644 --- a/test/classes/navigation/PMA_Node_Trigger_Container_test.php +++ b/test/classes/navigation/NodeTriggerContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase +class NodeTriggerContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_Trigger_test.php b/test/classes/navigation/NodeTriggerTest.php similarity index 94% rename from test/classes/navigation/PMA_Node_Trigger_test.php rename to test/classes/navigation/NodeTriggerTest.php index d43e4748ae..ab0a454572 100644 --- a/test/classes/navigation/PMA_Node_Trigger_test.php +++ b/test/classes/navigation/NodeTriggerTest.php @@ -18,7 +18,7 @@ require_once 'libraries/navigation/NodeFactory.php'; * * @package PhpMyAdmin-test */ -class Node_Trigger_Test extends PHPUnit_Framework_TestCase +class NodeTriggerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/NodeViewContainerTest.php similarity index 95% rename from test/classes/navigation/PMA_Node_View_Container_test.php rename to test/classes/navigation/NodeViewContainerTest.php index 66796bb412..560a67736e 100644 --- a/test/classes/navigation/PMA_Node_View_Container_test.php +++ b/test/classes/navigation/NodeViewContainerTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_View_Container_Test extends PHPUnit_Framework_TestCase +class NodeViewContainerTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/PMA_Node_View_test.php b/test/classes/navigation/NodeViewTest.php similarity index 95% rename from test/classes/navigation/PMA_Node_View_test.php rename to test/classes/navigation/NodeViewTest.php index 099b0b4f38..f01edcb4bc 100644 --- a/test/classes/navigation/PMA_Node_View_test.php +++ b/test/classes/navigation/NodeViewTest.php @@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class Node_View_Test extends PHPUnit_Framework_TestCase +class NodeViewTest extends PHPUnit_Framework_TestCase { /** * SetUp for test cases diff --git a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php b/test/classes/plugin/auth/AuthenticationConfigTest.php similarity index 98% rename from test/classes/plugin/auth/PMA_AuthenticationConfig_test.php rename to test/classes/plugin/auth/AuthenticationConfigTest.php index 1db0e94e99..8732c027e9 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php +++ b/test/classes/plugin/auth/AuthenticationConfigTest.php @@ -17,7 +17,7 @@ require_once 'libraries/js_escape.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_AuthenticationConfig_Test extends PHPUnit_Framework_TestCase +class AuthenticationConfigTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/AuthenticationCookieTest.php similarity index 99% rename from test/classes/plugin/auth/PMA_AuthenticationCookie_test.php rename to test/classes/plugin/auth/AuthenticationCookieTest.php index 050012b579..14eb83dc55 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/AuthenticationCookieTest.php @@ -24,7 +24,7 @@ require_once 'libraries/plugins/auth/AuthenticationCookie.php'; * * @package PhpMyAdmin-test */ -class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase +class AuthenticationCookieTest extends PHPUnit_Framework_TestCase { /** * @var AuthenticationCookie diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/AuthenticationHttpTest.php similarity index 99% rename from test/classes/plugin/auth/PMA_AuthenticationHttp_test.php rename to test/classes/plugin/auth/AuthenticationHttpTest.php index 59a2f263ff..17fabdde71 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php +++ b/test/classes/plugin/auth/AuthenticationHttpTest.php @@ -17,7 +17,7 @@ require_once 'libraries/sanitizing.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase +class AuthenticationHttpTest extends PHPUnit_Framework_TestCase { /** * @var AuthenticationHttp diff --git a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php b/test/classes/plugin/auth/AuthenticationSignonTest.php similarity index 99% rename from test/classes/plugin/auth/PMA_AuthenticationSignon_test.php rename to test/classes/plugin/auth/AuthenticationSignonTest.php index 10ad2dce0d..3b634d844d 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php +++ b/test/classes/plugin/auth/AuthenticationSignonTest.php @@ -17,7 +17,7 @@ require_once 'libraries/sanitizing.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_AuthenticationSignon_Test extends PHPUnit_Framework_TestCase +class AuthenticationSignonTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportCodegen_test.php b/test/classes/plugin/export/ExportCodegenTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportCodegen_test.php rename to test/classes/plugin/export/ExportCodegenTest.php index 2ab6136024..ca6f30001f 100644 --- a/test/classes/plugin/export/PMA_ExportCodegen_test.php +++ b/test/classes/plugin/export/ExportCodegenTest.php @@ -17,7 +17,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportCodegen_Test extends PHPUnit_Framework_TestCase +class ExportCodegenTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportCsv_test.php b/test/classes/plugin/export/ExportCsvTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportCsv_test.php rename to test/classes/plugin/export/ExportCsvTest.php index 8c02422a52..e748713234 100644 --- a/test/classes/plugin/export/PMA_ExportCsv_test.php +++ b/test/classes/plugin/export/ExportCsvTest.php @@ -17,7 +17,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportCsv_Test extends PHPUnit_Framework_TestCase +class ExportCsvTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportExcel_test.php b/test/classes/plugin/export/ExportExcelTest.php similarity index 98% rename from test/classes/plugin/export/PMA_ExportExcel_test.php rename to test/classes/plugin/export/ExportExcelTest.php index cfcafbc6b5..cd3d247e0b 100644 --- a/test/classes/plugin/export/PMA_ExportExcel_test.php +++ b/test/classes/plugin/export/ExportExcelTest.php @@ -17,7 +17,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportExcel_Test extends PHPUnit_Framework_TestCase +class ExportExcelTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/ExportHtmlwordTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportHtmlword_test.php rename to test/classes/plugin/export/ExportHtmlwordTest.php index 80397f95fc..17b6d92992 100644 --- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php +++ b/test/classes/plugin/export/ExportHtmlwordTest.php @@ -19,7 +19,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase +class ExportHtmlwordTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportJson_test.php b/test/classes/plugin/export/ExportJsonTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportJson_test.php rename to test/classes/plugin/export/ExportJsonTest.php index 10e4ad806e..13c27f54e1 100644 --- a/test/classes/plugin/export/PMA_ExportJson_test.php +++ b/test/classes/plugin/export/ExportJsonTest.php @@ -17,7 +17,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportJson_Test extends PHPUnit_Framework_TestCase +class ExportJsonTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportLatex_test.php b/test/classes/plugin/export/ExportLatexTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportLatex_test.php rename to test/classes/plugin/export/ExportLatexTest.php index f0b2b5d1bd..034602fe6b 100644 --- a/test/classes/plugin/export/PMA_ExportLatex_test.php +++ b/test/classes/plugin/export/ExportLatexTest.php @@ -19,7 +19,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase +class ExportLatexTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportMediawiki_test.php b/test/classes/plugin/export/ExportMediawikiTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportMediawiki_test.php rename to test/classes/plugin/export/ExportMediawikiTest.php index 12caee1548..d66db87d02 100644 --- a/test/classes/plugin/export/PMA_ExportMediawiki_test.php +++ b/test/classes/plugin/export/ExportMediawikiTest.php @@ -18,7 +18,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportMediawiki_Test extends PHPUnit_Framework_TestCase +class ExportMediawikiTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportOds_test.php b/test/classes/plugin/export/ExportOdsTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportOds_test.php rename to test/classes/plugin/export/ExportOdsTest.php index 1843a77ceb..655dc305ea 100644 --- a/test/classes/plugin/export/PMA_ExportOds_test.php +++ b/test/classes/plugin/export/ExportOdsTest.php @@ -21,7 +21,7 @@ require_once 'libraries/opendocument.lib.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportOds_Test extends PHPUnit_Framework_TestCase +class ExportOdsTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportOdt_test.php b/test/classes/plugin/export/ExportOdtTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportOdt_test.php rename to test/classes/plugin/export/ExportOdtTest.php index 0a09e8409a..3f51872c67 100644 --- a/test/classes/plugin/export/PMA_ExportOdt_test.php +++ b/test/classes/plugin/export/ExportOdtTest.php @@ -22,7 +22,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase +class ExportOdtTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportPdf_test.php b/test/classes/plugin/export/ExportPdfTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportPdf_test.php rename to test/classes/plugin/export/ExportPdfTest.php index 66a1a22d8c..13cb0938e0 100644 --- a/test/classes/plugin/export/PMA_ExportPdf_test.php +++ b/test/classes/plugin/export/ExportPdfTest.php @@ -19,7 +19,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportPdf_Test extends PHPUnit_Framework_TestCase +class ExportPdfTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportPhparray_test.php b/test/classes/plugin/export/ExportPhparrayTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportPhparray_test.php rename to test/classes/plugin/export/ExportPhparrayTest.php index 4a8292db3e..6c5bd4c934 100644 --- a/test/classes/plugin/export/PMA_ExportPhparray_test.php +++ b/test/classes/plugin/export/ExportPhparrayTest.php @@ -18,7 +18,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportPhparray_Test extends PHPUnit_Framework_TestCase +class ExportPhparrayTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/ExportSqlTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportSql_test.php rename to test/classes/plugin/export/ExportSqlTest.php index 4065d6cce4..5128b0928b 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/ExportSqlTest.php @@ -23,7 +23,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase +class ExportSqlTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/ExportTexytextTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportTexytext_test.php rename to test/classes/plugin/export/ExportTexytextTest.php index b60768e7d3..04b0874d0f 100644 --- a/test/classes/plugin/export/PMA_ExportTexytext_test.php +++ b/test/classes/plugin/export/ExportTexytextTest.php @@ -20,7 +20,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportTexytext_Test extends PHPUnit_Framework_TestCase +class ExportTexytextTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportXml_test.php b/test/classes/plugin/export/ExportXmlTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportXml_test.php rename to test/classes/plugin/export/ExportXmlTest.php index 3b6cea0cb7..d85b097f23 100644 --- a/test/classes/plugin/export/PMA_ExportXml_test.php +++ b/test/classes/plugin/export/ExportXmlTest.php @@ -21,7 +21,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportXml_Test extends PHPUnit_Framework_TestCase +class ExportXmlTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_ExportYaml_test.php b/test/classes/plugin/export/ExportYamlTest.php similarity index 99% rename from test/classes/plugin/export/PMA_ExportYaml_test.php rename to test/classes/plugin/export/ExportYamlTest.php index d1049905d9..2793417ca9 100644 --- a/test/classes/plugin/export/PMA_ExportYaml_test.php +++ b/test/classes/plugin/export/ExportYamlTest.php @@ -19,7 +19,7 @@ require_once 'export.php'; * @package PhpMyAdmin-test * @group medium */ -class PMA_ExportYaml_Test extends PHPUnit_Framework_TestCase +class ExportYamlTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/export/PMA_TableProperty_test.php b/test/classes/plugin/export/TablePropertyTest.php similarity index 99% rename from test/classes/plugin/export/PMA_TableProperty_test.php rename to test/classes/plugin/export/TablePropertyTest.php index 52331c8948..0041dcc796 100644 --- a/test/classes/plugin/export/PMA_TableProperty_test.php +++ b/test/classes/plugin/export/TablePropertyTest.php @@ -15,7 +15,7 @@ require_once 'libraries/config.default.php'; * * @package PhpMyAdmin-test */ -class PMA_TableProperty_Test extends PHPUnit_Framework_TestCase +class TablePropertyTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/plugin/import/ImportCsv_test.php b/test/classes/plugin/import/ImportCsvTest.php similarity index 98% rename from test/classes/plugin/import/ImportCsv_test.php rename to test/classes/plugin/import/ImportCsvTest.php index 053745a2d0..e4704cee50 100644 --- a/test/classes/plugin/import/ImportCsv_test.php +++ b/test/classes/plugin/import/ImportCsvTest.php @@ -28,7 +28,7 @@ require_once 'libraries/sanitizing.lib.php'; * * @package PhpMyAdmin-test */ -class ImportCsv_Test extends PHPUnit_Framework_TestCase +class ImportCsvTest extends PHPUnit_Framework_TestCase { /** * @var ImportCsv diff --git a/test/classes/plugin/import/ImportLdi_test.php b/test/classes/plugin/import/ImportLdiTest.php similarity index 99% rename from test/classes/plugin/import/ImportLdi_test.php rename to test/classes/plugin/import/ImportLdiTest.php index 05c4120fcc..e08529916c 100644 --- a/test/classes/plugin/import/ImportLdi_test.php +++ b/test/classes/plugin/import/ImportLdiTest.php @@ -28,7 +28,7 @@ require_once 'libraries/import.lib.php'; * * @package PhpMyAdmin-test */ -class ImportLdi_Test extends PHPUnit_Framework_TestCase +class ImportLdiTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/plugin/import/ImportMediawiki_test.php b/test/classes/plugin/import/ImportMediawikiTest.php similarity index 98% rename from test/classes/plugin/import/ImportMediawiki_test.php rename to test/classes/plugin/import/ImportMediawikiTest.php index af85d5268d..3207c873e3 100644 --- a/test/classes/plugin/import/ImportMediawiki_test.php +++ b/test/classes/plugin/import/ImportMediawikiTest.php @@ -25,7 +25,7 @@ require_once 'libraries/import.lib.php'; * * @package PhpMyAdmin-test */ -class ImportMediawiki_Test extends PHPUnit_Framework_TestCase +class ImportMediawikiTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/plugin/import/ImportOds_test.php b/test/classes/plugin/import/ImportOdsTest.php similarity index 98% rename from test/classes/plugin/import/ImportOds_test.php rename to test/classes/plugin/import/ImportOdsTest.php index aa44c11220..735a9d9d2e 100644 --- a/test/classes/plugin/import/ImportOds_test.php +++ b/test/classes/plugin/import/ImportOdsTest.php @@ -28,7 +28,7 @@ require_once 'libraries/plugins/import/ImportOds.php'; * * @package PhpMyAdmin-test */ -class ImportOds_Test extends PHPUnit_Framework_TestCase +class ImportOdsTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/plugin/import/ImportShp_test.php b/test/classes/plugin/import/ImportShpTest.php similarity index 98% rename from test/classes/plugin/import/ImportShp_test.php rename to test/classes/plugin/import/ImportShpTest.php index 1b384e632e..36cafc29b6 100644 --- a/test/classes/plugin/import/ImportShp_test.php +++ b/test/classes/plugin/import/ImportShpTest.php @@ -23,7 +23,7 @@ require_once 'libraries/import.lib.php'; * * @package PhpMyAdmin-test */ -class ImportShp_Test extends PHPUnit_Framework_TestCase +class ImportShpTest extends PHPUnit_Framework_TestCase { /** * @var ImportShp diff --git a/test/classes/plugin/import/ImportSql_test.php b/test/classes/plugin/import/ImportSqlTest.php similarity index 98% rename from test/classes/plugin/import/ImportSql_test.php rename to test/classes/plugin/import/ImportSqlTest.php index f1d9cf81aa..1ac0417449 100644 --- a/test/classes/plugin/import/ImportSql_test.php +++ b/test/classes/plugin/import/ImportSqlTest.php @@ -26,7 +26,7 @@ require_once 'libraries/import.lib.php'; * * @package PhpMyAdmin-test */ -class ImportSql_Test extends PHPUnit_Framework_TestCase +class ImportSqlTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/plugin/import/ImportXml_test.php b/test/classes/plugin/import/ImportXmlTest.php similarity index 98% rename from test/classes/plugin/import/ImportXml_test.php rename to test/classes/plugin/import/ImportXmlTest.php index b48a3d70f2..143301ec2d 100644 --- a/test/classes/plugin/import/ImportXml_test.php +++ b/test/classes/plugin/import/ImportXmlTest.php @@ -26,7 +26,7 @@ require_once 'libraries/import.lib.php'; * * @package PhpMyAdmin-test */ -class ImportXml_Test extends PHPUnit_Framework_TestCase +class ImportXmlTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/plugin/transformations/Transformation_Plugins_test.php b/test/classes/plugin/transformations/TransformationPluginsTest.php similarity index 99% rename from test/classes/plugin/transformations/Transformation_Plugins_test.php rename to test/classes/plugin/transformations/TransformationPluginsTest.php index f41c895c1f..6d952696a4 100644 --- a/test/classes/plugin/transformations/Transformation_Plugins_test.php +++ b/test/classes/plugin/transformations/TransformationPluginsTest.php @@ -34,7 +34,7 @@ require_once 'libraries/config.default.php'; * * @package PhpMyAdmin-test */ -class Transformation_Plugins_Test extends PHPUnit_Framework_TestCase +class TransformationPluginsTest extends PHPUnit_Framework_TestCase { /** * Sets up the fixture, for example, opens a network connection. diff --git a/test/classes/properties/PMA_PropertyItem_test.php b/test/classes/properties/PropertyItemTest.php similarity index 93% rename from test/classes/properties/PMA_PropertyItem_test.php rename to test/classes/properties/PropertyItemTest.php index 024a8515b4..08e5606be0 100644 --- a/test/classes/properties/PMA_PropertyItem_test.php +++ b/test/classes/properties/PropertyItemTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_PropertyItem_Test extends PHPUnit_Framework_TestCase +class PropertyItemTest extends PHPUnit_Framework_TestCase { protected $stub; diff --git a/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php b/test/classes/properties/options/OptionsPropertyGroupTest.php similarity index 97% rename from test/classes/properties/options/PMA_OptionsPropertyGroup_test.php rename to test/classes/properties/options/OptionsPropertyGroupTest.php index e657117130..5bfcc3616e 100644 --- a/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php +++ b/test/classes/properties/options/OptionsPropertyGroupTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_OptionsPropertyGroup_Test extends PHPUnit_Framework_TestCase +class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase { protected $stub; diff --git a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php b/test/classes/properties/options/OptionsPropertyItemTest.php similarity index 97% rename from test/classes/properties/options/PMA_OptionsPropertyItem_test.php rename to test/classes/properties/options/OptionsPropertyItemTest.php index 96c4823786..9811d8d644 100644 --- a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php +++ b/test/classes/properties/options/OptionsPropertyItemTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_OptionsPropertyItem_Test extends PHPUnit_Framework_TestCase +class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase { protected $stub; diff --git a/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php b/test/classes/properties/options/OptionsPropertyOneItemTest.php similarity index 97% rename from test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php rename to test/classes/properties/options/OptionsPropertyOneItemTest.php index e27486feb3..e312442198 100644 --- a/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php +++ b/test/classes/properties/options/OptionsPropertyOneItemTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_OptionsPropertyOneItem_Test extends PHPUnit_Framework_TestCase +class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase { protected $stub; diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php b/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php similarity index 93% rename from test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php rename to test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php index e817003be7..5474c4d72c 100644 --- a/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php +++ b/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php @@ -13,7 +13,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup; * * @package PhpMyAdmin-test */ -class PMA_OptionsPropertyMainGroup_Test extends PHPUnit_Framework_TestCase +class OptionsPropertyMainGroupTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php b/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php similarity index 93% rename from test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php rename to test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php index 1756c799fb..b52eb4e1ae 100644 --- a/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php +++ b/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php @@ -13,7 +13,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup; * * @package PhpMyAdmin-test */ -class PMA_OptionsPropertyRootGroup_Test extends PHPUnit_Framework_TestCase +class OptionsPropertyRootGroupTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php b/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php similarity index 95% rename from test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php rename to test/classes/properties/options/groups/OptionsPropertySubgroupTest.php index b0603ec6aa..b12f6257f4 100644 --- a/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php +++ b/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php @@ -13,7 +13,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertySubgroup; * * @package PhpMyAdmin-test */ -class PMA_OptionsPropertySubgroup_Test extends PHPUnit_Framework_TestCase +class OptionsPropertySubgroupTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/properties/options/items/PMA_PropertyItems_test.php b/test/classes/properties/options/items/PropertyItemsTest.php similarity index 97% rename from test/classes/properties/options/items/PMA_PropertyItems_test.php rename to test/classes/properties/options/items/PropertyItemsTest.php index 1afc237836..b2aeb8f205 100644 --- a/test/classes/properties/options/items/PMA_PropertyItems_test.php +++ b/test/classes/properties/options/items/PropertyItemsTest.php @@ -19,7 +19,7 @@ use PMA\libraries\properties\options\items\TextPropertyItem; * * @package PhpMyAdmin-test */ -class PMA_PropertyItems_Test extends PHPUnit_Framework_TestCase +class PropertyItemsTest extends PHPUnit_Framework_TestCase { /** * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getItemType diff --git a/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php b/test/classes/properties/plugins/ExportPluginPropertiesTest.php similarity index 95% rename from test/classes/properties/plugins/PMA_ExportPluginProperties_test.php rename to test/classes/properties/plugins/ExportPluginPropertiesTest.php index 17eefdcad8..ed93f9654e 100644 --- a/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php +++ b/test/classes/properties/plugins/ExportPluginPropertiesTest.php @@ -16,7 +16,7 @@ require_once 'test/classes/properties/plugins/PMA_ImportPluginProperties_test.ph * * @package PhpMyAdmin-test */ -class PMA_ExportPluginProperties_Test extends PMA_ImportPluginProperties_Test +class ExportPluginPropertiesTest extends PMA_ImportPluginProperties_Test { protected $object; diff --git a/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php b/test/classes/properties/plugins/ImportPluginPropertiesTest.php similarity index 96% rename from test/classes/properties/plugins/PMA_ImportPluginProperties_test.php rename to test/classes/properties/plugins/ImportPluginPropertiesTest.php index 872a6f9729..53eb0455ff 100644 --- a/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php +++ b/test/classes/properties/plugins/ImportPluginPropertiesTest.php @@ -13,7 +13,7 @@ use PMA\libraries\properties\plugins\ImportPluginProperties; * * @package PhpMyAdmin-test */ -class PMA_ImportPluginProperties_Test extends PHPUnit_Framework_TestCase +class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase { protected $object; diff --git a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php b/test/classes/properties/plugins/PluginPropertyItemTest.php similarity index 94% rename from test/classes/properties/plugins/PMA_PluginPropertyItem_test.php rename to test/classes/properties/plugins/PluginPropertyItemTest.php index e11b9d6903..4e578b64c5 100644 --- a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php +++ b/test/classes/properties/plugins/PluginPropertyItemTest.php @@ -11,7 +11,7 @@ * * @package PhpMyAdmin-test */ -class PMA_PluginPropertyItem_Test extends PHPUnit_Framework_TestCase +class PluginPropertyItemTest extends PHPUnit_Framework_TestCase { protected $stub; diff --git a/test/classes/schema/Dia_Relation_Schema_test.php b/test/classes/schema/DiaRelationSchemaTest.php similarity index 98% rename from test/classes/schema/Dia_Relation_Schema_test.php rename to test/classes/schema/DiaRelationSchemaTest.php index 71b7cbd1e1..5fec91e182 100644 --- a/test/classes/schema/Dia_Relation_Schema_test.php +++ b/test/classes/schema/DiaRelationSchemaTest.php @@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_Dia_Relation_Schema_Test extends PHPUnit_Framework_TestCase +class DiaRelationSchemaTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/schema/Eps_Relation_Schema_test.php b/test/classes/schema/EpsRelationSchemaTest.php similarity index 98% rename from test/classes/schema/Eps_Relation_Schema_test.php rename to test/classes/schema/EpsRelationSchemaTest.php index 8151c80ba3..273bbf42b5 100644 --- a/test/classes/schema/Eps_Relation_Schema_test.php +++ b/test/classes/schema/EpsRelationSchemaTest.php @@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_Eps_Relation_Schema_Test extends PHPUnit_Framework_TestCase +class EpsRelationSchemaTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/schema/Export_Relation_Schema_test.php b/test/classes/schema/ExportRelationSchemaTest.php similarity index 98% rename from test/classes/schema/Export_Relation_Schema_test.php rename to test/classes/schema/ExportRelationSchemaTest.php index 0de74b6406..4050ba5488 100644 --- a/test/classes/schema/Export_Relation_Schema_test.php +++ b/test/classes/schema/ExportRelationSchemaTest.php @@ -21,7 +21,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_Export_Relation_Schema_Test extends PHPUnit_Framework_TestCase +class ExportRelationSchemaTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/schema/Pdf_Relation_Schema_test.php b/test/classes/schema/PdfRelationSchemaTest.php similarity index 99% rename from test/classes/schema/Pdf_Relation_Schema_test.php rename to test/classes/schema/PdfRelationSchemaTest.php index e21c8773f3..bc9c051d4b 100644 --- a/test/classes/schema/Pdf_Relation_Schema_test.php +++ b/test/classes/schema/PdfRelationSchemaTest.php @@ -21,7 +21,7 @@ require_once 'libraries/transformations.lib.php'; * * @package PhpMyAdmin-test */ -class PMA_Pdf_Relation_Schema_Test extends PHPUnit_Framework_TestCase +class PdfRelationSchemaTest extends PHPUnit_Framework_TestCase { /** * @access protected diff --git a/test/classes/schema/Svg_Relation_Schema_test.php b/test/classes/schema/SvgRelationSchemaTest.php similarity index 98% rename from test/classes/schema/Svg_Relation_Schema_test.php rename to test/classes/schema/SvgRelationSchemaTest.php index 74c16a279a..1c2efbea58 100644 --- a/test/classes/schema/Svg_Relation_Schema_test.php +++ b/test/classes/schema/SvgRelationSchemaTest.php @@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_Svg_Relation_Schema_Test extends PHPUnit_Framework_TestCase +class SvgRelationSchemaTest extends PHPUnit_Framework_TestCase { /** * @access protected From 1043a36f8ffeb1c7d7e1c75298ee367bf28d0f1d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 16 Oct 2015 16:09:49 +1100 Subject: [PATCH 2/6] More tests for classes Signed-off-by: Madhura Jayaratne --- .../ConfigGeneratorTest.php} | 4 ++-- .../config/ConfigFileTest.php} | 2 +- .../config/PageSettingsTest.php} | 5 +++-- .../engines/BdbTest.php} | 4 +++- .../engines/BinlogTest.php} | 6 ++++-- .../engines/InnodbTest.php} | 6 ++++-- .../engines/MemoryTest.php} | 6 ++++-- .../engines/Mrg_MyisamTest.php} | 4 +++- .../engines/MyisamTest.php} | 6 ++++-- .../engines/NdbclusterTest.php} | 6 ++++-- .../engines/PbxtTest.php} | 6 ++++-- 11 files changed, 36 insertions(+), 19 deletions(-) rename test/{libraries/PMA_ConfigGenerator_test.php => classes/ConfigGeneratorTest.php} (97%) rename test/{libraries/PMA_ConfigFile_test.php => classes/config/ConfigFileTest.php} (99%) rename test/{libraries/PMA_page_settings_test.php => classes/config/PageSettingsTest.php} (93%) rename test/{engines/PMA_StorageEngine_bdb_test.php => classes/engines/BdbTest.php} (95%) rename test/{engines/PMA_StorageEngine_binlog_test.php => classes/engines/BinlogTest.php} (86%) rename test/{engines/PMA_StorageEngine_innodb_test.php => classes/engines/InnodbTest.php} (98%) rename test/{engines/PMA_StorageEngine_memory_test.php => classes/engines/MemoryTest.php} (88%) rename test/{engines/PMA_StorageEngine_mrg_myisam_test.php => classes/engines/Mrg_MyisamTest.php} (90%) rename test/{engines/PMA_StorageEngine_myisam_test.php => classes/engines/MyisamTest.php} (95%) rename test/{engines/PMA_StorageEngine_ndbcluster_test.php => classes/engines/NdbclusterTest.php} (90%) rename test/{engines/PMA_StorageEngine_pbxt_test.php => classes/engines/PbxtTest.php} (98%) diff --git a/test/libraries/PMA_ConfigGenerator_test.php b/test/classes/ConfigGeneratorTest.php similarity index 97% rename from test/libraries/PMA_ConfigGenerator_test.php rename to test/classes/ConfigGeneratorTest.php index fd3f1d7ad1..bbe1b5ad25 100644 --- a/test/libraries/PMA_ConfigGenerator_test.php +++ b/test/classes/ConfigGeneratorTest.php @@ -18,11 +18,11 @@ require_once 'libraries/core.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; /** - * tests for methods under Config file generator + * Tests for PMA\setup\lib\ConfigGenerator * * @package PhpMyAdmin-test */ -class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase +class ConfigGeneratorTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/libraries/PMA_ConfigFile_test.php b/test/classes/config/ConfigFileTest.php similarity index 99% rename from test/libraries/PMA_ConfigFile_test.php rename to test/classes/config/ConfigFileTest.php index 2a9bed0221..eab2cf2d3e 100644 --- a/test/libraries/PMA_ConfigFile_test.php +++ b/test/classes/config/ConfigFileTest.php @@ -18,7 +18,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class PMA_ConfigFile_Test extends PHPUnit_Framework_TestCase +class ConfigFileTest extends PHPUnit_Framework_TestCase { /** * Any valid key that exists in config.default.php and isn't empty diff --git a/test/libraries/PMA_page_settings_test.php b/test/classes/config/PageSettingsTest.php similarity index 93% rename from test/libraries/PMA_page_settings_test.php rename to test/classes/config/PageSettingsTest.php index b21d760209..51d05c8874 100644 --- a/test/libraries/PMA_page_settings_test.php +++ b/test/classes/config/PageSettingsTest.php @@ -11,11 +11,11 @@ require_once 'libraries/config/user_preferences.forms.php'; require_once 'libraries/config/page_settings.forms.php'; /** - * Tests for Page-related settings + * Tests for PMA\libraries\config\PageSettings * * @package PhpMyAdmin-test */ -class PMA_PageSettings_Test extends PHPUnit_Framework_TestCase +class PageSettingsTest extends PHPUnit_Framework_TestCase { /** * Setup tests @@ -24,6 +24,7 @@ class PMA_PageSettings_Test extends PHPUnit_Framework_TestCase */ public function setUp() { + $GLOBALS['cfg']['ServerDefault'] = 1; $GLOBALS['server'] = 1; } diff --git a/test/engines/PMA_StorageEngine_bdb_test.php b/test/classes/engines/BdbTest.php similarity index 95% rename from test/engines/PMA_StorageEngine_bdb_test.php rename to test/classes/engines/BdbTest.php index 497f7ce08f..bd70b3d3bf 100644 --- a/test/engines/PMA_StorageEngine_bdb_test.php +++ b/test/classes/engines/BdbTest.php @@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_Bdb_Test extends PHPUnit_Framework_TestCase +class BdbTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -36,6 +36,8 @@ class PMA_StorageEngine_Bdb_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Bdb('bdb'); } diff --git a/test/engines/PMA_StorageEngine_binlog_test.php b/test/classes/engines/BinlogTest.php similarity index 86% rename from test/engines/PMA_StorageEngine_binlog_test.php rename to test/classes/engines/BinlogTest.php index 9ebf68c82b..77c51e98f1 100644 --- a/test/engines/PMA_StorageEngine_binlog_test.php +++ b/test/classes/engines/BinlogTest.php @@ -15,11 +15,11 @@ require_once 'libraries/database_interface.inc.php'; /** - * Tests for PMA_StorageEngine_binlog + * Tests for PMA\libraries\engines\Binlog * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_Binlog_Test extends PHPUnit_Framework_TestCase +class BinlogTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -35,6 +35,8 @@ class PMA_StorageEngine_Binlog_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Binlog('binlog'); } diff --git a/test/engines/PMA_StorageEngine_innodb_test.php b/test/classes/engines/InnodbTest.php similarity index 98% rename from test/engines/PMA_StorageEngine_innodb_test.php rename to test/classes/engines/InnodbTest.php index 63a077385c..99a794c3d1 100644 --- a/test/engines/PMA_StorageEngine_innodb_test.php +++ b/test/classes/engines/InnodbTest.php @@ -15,11 +15,11 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; /** - * Tests for PMA_StorageEngine_innodb + * Tests for PMA\libraries\engines\Innodb * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_Innodb_Test extends PHPUnit_Framework_TestCase +class InnodbTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -35,6 +35,8 @@ class PMA_StorageEngine_Innodb_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Innodb('innodb'); } diff --git a/test/engines/PMA_StorageEngine_memory_test.php b/test/classes/engines/MemoryTest.php similarity index 88% rename from test/engines/PMA_StorageEngine_memory_test.php rename to test/classes/engines/MemoryTest.php index 33ff03805e..974f1356f0 100644 --- a/test/engines/PMA_StorageEngine_memory_test.php +++ b/test/classes/engines/MemoryTest.php @@ -16,11 +16,11 @@ require_once 'libraries/database_interface.inc.php'; /** - * Tests for PMA_StorageEngine_memory + * Tests for PMA\libraries\engines\Memory * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_Memory_Test extends PHPUnit_Framework_TestCase +class MemoryTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -36,6 +36,8 @@ class PMA_StorageEngine_Memory_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Memory('memory'); } diff --git a/test/engines/PMA_StorageEngine_mrg_myisam_test.php b/test/classes/engines/Mrg_MyisamTest.php similarity index 90% rename from test/engines/PMA_StorageEngine_mrg_myisam_test.php rename to test/classes/engines/Mrg_MyisamTest.php index 7db1428676..64b46c9125 100644 --- a/test/engines/PMA_StorageEngine_mrg_myisam_test.php +++ b/test/classes/engines/Mrg_MyisamTest.php @@ -18,7 +18,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_MrgMyisam_Test extends PHPUnit_Framework_TestCase +class Mrg_MyisamTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -34,6 +34,8 @@ class PMA_StorageEngine_MrgMyisam_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Mrg_Myisam('mrg_myisam'); } diff --git a/test/engines/PMA_StorageEngine_myisam_test.php b/test/classes/engines/MyisamTest.php similarity index 95% rename from test/engines/PMA_StorageEngine_myisam_test.php rename to test/classes/engines/MyisamTest.php index f754d137e6..d8de427fdb 100644 --- a/test/engines/PMA_StorageEngine_myisam_test.php +++ b/test/classes/engines/MyisamTest.php @@ -15,11 +15,11 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; /** - * Tests for PMA_StorageEngine_myisam + * Tests for PMA\libraries\engines\Myisam * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_Myisam_Test extends PHPUnit_Framework_TestCase +class MyisamTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -35,6 +35,8 @@ class PMA_StorageEngine_Myisam_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Myisam('myisam'); } diff --git a/test/engines/PMA_StorageEngine_ndbcluster_test.php b/test/classes/engines/NdbclusterTest.php similarity index 90% rename from test/engines/PMA_StorageEngine_ndbcluster_test.php rename to test/classes/engines/NdbclusterTest.php index 2fce290d93..e0742b8d14 100644 --- a/test/engines/PMA_StorageEngine_ndbcluster_test.php +++ b/test/classes/engines/NdbclusterTest.php @@ -15,11 +15,11 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; /** - * Tests for PMA_StorageEngine_ndbcluster + * Tests for PMA\libraries\engines\Ndbcluster * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_Ndbcluster_Test extends PHPUnit_Framework_TestCase +class NdbclusterTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -35,6 +35,8 @@ class PMA_StorageEngine_Ndbcluster_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Ndbcluster('nbdcluster'); } diff --git a/test/engines/PMA_StorageEngine_pbxt_test.php b/test/classes/engines/PbxtTest.php similarity index 98% rename from test/engines/PMA_StorageEngine_pbxt_test.php rename to test/classes/engines/PbxtTest.php index aa22c06595..ff29ac2c01 100644 --- a/test/engines/PMA_StorageEngine_pbxt_test.php +++ b/test/classes/engines/PbxtTest.php @@ -17,11 +17,11 @@ require_once 'libraries/core.lib.php'; require_once 'libraries/database_interface.inc.php'; /** - * Tests for PMA_StorageEngine_pbxt + * Tests for PMA\libraries\engines\Pbxt; * * @package PhpMyAdmin-test */ -class PMA_StorageEngine_Pbxt_Test extends PHPUnit_Framework_TestCase +class PbxtTest extends PHPUnit_Framework_TestCase { /** * @access protected @@ -37,6 +37,8 @@ class PMA_StorageEngine_Pbxt_Test extends PHPUnit_Framework_TestCase */ protected function setUp() { + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Pbxt('pbxt'); } From df813fb312e566a724d4ecfba6a53a343887b868 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 16 Oct 2015 18:09:56 +1100 Subject: [PATCH 3/6] Fix tests Signed-off-by: Madhura Jayaratne --- test/libraries/PMA_build_html_for_db_test.php | 1 + test/libraries/PMA_display_create_table_test.php | 2 ++ test/libraries/PMA_insert_edit_test.php | 11 +++++++++++ test/libraries/PMA_relation_test.php | 2 ++ test/libraries/PMA_server_engines_test.php | 1 + test/libraries/PMA_server_privileges_test.php | 2 ++ test/libraries/PMA_sql_query_form_test.php | 3 +++ test/libraries/database_interface_test.php | 1 + test/libraries/rte/PMA_TRI_getEditorForm_test.php | 1 + .../rte/PMA_TRI_getQueryFromRequest_test.php | 1 + 10 files changed, 25 insertions(+) diff --git a/test/libraries/PMA_build_html_for_db_test.php b/test/libraries/PMA_build_html_for_db_test.php index 1355ad3d29..3d88c8a81b 100644 --- a/test/libraries/PMA_build_html_for_db_test.php +++ b/test/libraries/PMA_build_html_for_db_test.php @@ -42,6 +42,7 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase $cfg['ShowFunctionFields'] = false; $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; $cfg['ServerDefault'] = 1; $GLOBALS['PMA_Types'] = new TypesMySQL(); diff --git a/test/libraries/PMA_display_create_table_test.php b/test/libraries/PMA_display_create_table_test.php index c4fbb42e1f..0bd832a174 100644 --- a/test/libraries/PMA_display_create_table_test.php +++ b/test/libraries/PMA_display_create_table_test.php @@ -9,6 +9,8 @@ use PMA\libraries\Theme; $GLOBALS['server'] = 0; +$GLOBALS['cfg']['Server']['DisableIS'] = false; +$GLOBALS['cfg']['DBG']['sql'] = false; /* * Include to test. */ diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index a1a3726512..9d50764422 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -61,6 +61,17 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['TextareaCols'] = 4; $GLOBALS['cfg']['CharTextareaRows'] = 5; $GLOBALS['cfg']['CharTextareaCols'] = 6; + $GLOBALS['cfg']['AllowThirdPartyFraming'] = false; + $GLOBALS['cfg']['SendErrorReports'] = 'ask'; + $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure'; + $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true; + $GLOBALS['cfg']['PmaAbsoluteUri'] = ''; + $GLOBALS['cfg']['DefaultTabTable'] = 'browse'; + $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'structure'; + $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = ''; + $GLOBALS['cfg']['Confirm'] = true; + $GLOBALS['cfg']['LoginCookieValidity'] = 1440; + $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); } /** diff --git a/test/libraries/PMA_relation_test.php b/test/libraries/PMA_relation_test.php index b877667d0a..2d25a4de83 100644 --- a/test/libraries/PMA_relation_test.php +++ b/test/libraries/PMA_relation_test.php @@ -38,6 +38,8 @@ class PMA_Relation_Test extends PHPUnit_Framework_TestCase $GLOBALS['server'] = 1; $GLOBALS['cfg']['Server']['user'] = 'root'; $GLOBALS['cfg']['Server']['pmadb'] = 'phpmyadmin'; + $GLOBALS['cfg']['ZeroConf'] = true; + $GLOBALS['cfg']['PmaAbsoluteUri'] = ''; $_SESSION['relation'][$GLOBALS['server']] = "PMA_relation"; $_SESSION['PMA_Theme'] = new Theme(); $_SESSION['relation'] = array(); diff --git a/test/libraries/PMA_server_engines_test.php b/test/libraries/PMA_server_engines_test.php index ac538c3a79..43f37dcfc9 100644 --- a/test/libraries/PMA_server_engines_test.php +++ b/test/libraries/PMA_server_engines_test.php @@ -45,6 +45,7 @@ class PMA_ServerEngines_Test extends PHPUnit_Framework_TestCase $_REQUEST['pos'] = 3; //$GLOBALS + $GLOBALS['server'] = 0; $GLOBALS['cfg']['MaxRows'] = 10; $GLOBALS['cfg']['ServerDefault'] = "server"; $GLOBALS['cfg']['RememberSorting'] = true; diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index 7e8cdde445..94a2a62c0f 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -70,9 +70,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['PmaAbsoluteUri'] = "PmaAbsoluteUri"; $GLOBALS['cfg']['DefaultTabTable'] = "structure"; $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "structure"; + $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = ""; $GLOBALS['cfg']['Confirm'] = "Confirm"; $GLOBALS['cfg']['ShowHint'] = true; $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true; + $GLOBALS['cfg']['LoginCookieValidity'] = 1440; $GLOBALS['cfgRelation'] = array(); $GLOBALS['cfgRelation']['menuswork'] = false; diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php index 733ba7f0a5..e94ef397d0 100644 --- a/test/libraries/PMA_sql_query_form_test.php +++ b/test/libraries/PMA_sql_query_form_test.php @@ -61,6 +61,9 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['DefaultTabDatabase'] = "structure"; $GLOBALS['cfg']['RetainQueryBox'] = true; $GLOBALS['cfg']['ActionLinksMode'] = 'both'; + $GLOBALS['cfg']['DefaultTabTable'] = 'browse'; + $GLOBALS['cfg']['CodemirrorEnable'] = true; + $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'default'; //_SESSION $_SESSION['relation'][0] = array( diff --git a/test/libraries/database_interface_test.php b/test/libraries/database_interface_test.php index c9f2c1628c..717615e20a 100644 --- a/test/libraries/database_interface_test.php +++ b/test/libraries/database_interface_test.php @@ -28,6 +28,7 @@ class PMA_DBI_Test extends PHPUnit_Framework_TestCase */ function setup() { + $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['cfg']['IconvExtraParams'] = ''; } diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php index 9ea0f5ac59..c159c28ec2 100644 --- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php +++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php @@ -31,6 +31,7 @@ class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase public function setUp() { $GLOBALS['cfg']['ServerDefault'] = ''; + $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['db'] = 'pma_test'; } diff --git a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php index 68b3cee477..77b3de3c0b 100644 --- a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php @@ -38,6 +38,7 @@ class PMA_TRI_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase public function setUp() { $GLOBALS['db'] = 'pma_test'; + $GLOBALS['cfg']['DBG']['sql'] = false; } /** From a19c8a2e8303f8ecb3a15736dec9571fc3673524 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 16 Oct 2015 18:24:51 +1100 Subject: [PATCH 4/6] Remove tab characters Signed-off-by: Madhura Jayaratne --- test/classes/config/PageSettingsTest.php | 2 +- test/classes/engines/BdbTest.php | 4 ++-- test/classes/engines/BinlogTest.php | 4 ++-- test/classes/engines/InnodbTest.php | 4 ++-- test/classes/engines/MemoryTest.php | 4 ++-- test/classes/engines/Mrg_MyisamTest.php | 4 ++-- test/classes/engines/MyisamTest.php | 4 ++-- test/classes/engines/NdbclusterTest.php | 4 ++-- test/classes/engines/PbxtTest.php | 4 ++-- test/libraries/database_interface_test.php | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/classes/config/PageSettingsTest.php b/test/classes/config/PageSettingsTest.php index 51d05c8874..0b844d6284 100644 --- a/test/classes/config/PageSettingsTest.php +++ b/test/classes/config/PageSettingsTest.php @@ -24,7 +24,7 @@ class PageSettingsTest extends PHPUnit_Framework_TestCase */ public function setUp() { - $GLOBALS['cfg']['ServerDefault'] = 1; + $GLOBALS['cfg']['ServerDefault'] = 1; $GLOBALS['server'] = 1; } diff --git a/test/classes/engines/BdbTest.php b/test/classes/engines/BdbTest.php index bd70b3d3bf..ed483974a2 100644 --- a/test/classes/engines/BdbTest.php +++ b/test/classes/engines/BdbTest.php @@ -36,8 +36,8 @@ class BdbTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Bdb('bdb'); } diff --git a/test/classes/engines/BinlogTest.php b/test/classes/engines/BinlogTest.php index 77c51e98f1..5e8d037861 100644 --- a/test/classes/engines/BinlogTest.php +++ b/test/classes/engines/BinlogTest.php @@ -35,8 +35,8 @@ class BinlogTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Binlog('binlog'); } diff --git a/test/classes/engines/InnodbTest.php b/test/classes/engines/InnodbTest.php index 99a794c3d1..8f9e85be90 100644 --- a/test/classes/engines/InnodbTest.php +++ b/test/classes/engines/InnodbTest.php @@ -35,8 +35,8 @@ class InnodbTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Innodb('innodb'); } diff --git a/test/classes/engines/MemoryTest.php b/test/classes/engines/MemoryTest.php index 974f1356f0..58ee38c748 100644 --- a/test/classes/engines/MemoryTest.php +++ b/test/classes/engines/MemoryTest.php @@ -36,8 +36,8 @@ class MemoryTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Memory('memory'); } diff --git a/test/classes/engines/Mrg_MyisamTest.php b/test/classes/engines/Mrg_MyisamTest.php index 64b46c9125..b51fdbe854 100644 --- a/test/classes/engines/Mrg_MyisamTest.php +++ b/test/classes/engines/Mrg_MyisamTest.php @@ -34,8 +34,8 @@ class Mrg_MyisamTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Mrg_Myisam('mrg_myisam'); } diff --git a/test/classes/engines/MyisamTest.php b/test/classes/engines/MyisamTest.php index d8de427fdb..63f0d0ebae 100644 --- a/test/classes/engines/MyisamTest.php +++ b/test/classes/engines/MyisamTest.php @@ -35,8 +35,8 @@ class MyisamTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Myisam('myisam'); } diff --git a/test/classes/engines/NdbclusterTest.php b/test/classes/engines/NdbclusterTest.php index e0742b8d14..8827697b68 100644 --- a/test/classes/engines/NdbclusterTest.php +++ b/test/classes/engines/NdbclusterTest.php @@ -35,8 +35,8 @@ class NdbclusterTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Ndbcluster('nbdcluster'); } diff --git a/test/classes/engines/PbxtTest.php b/test/classes/engines/PbxtTest.php index ff29ac2c01..fc89558129 100644 --- a/test/classes/engines/PbxtTest.php +++ b/test/classes/engines/PbxtTest.php @@ -37,8 +37,8 @@ class PbxtTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['server'] = 0; + $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['server'] = 0; $this->object = new Pbxt('pbxt'); } diff --git a/test/libraries/database_interface_test.php b/test/libraries/database_interface_test.php index 717615e20a..d8bbe37363 100644 --- a/test/libraries/database_interface_test.php +++ b/test/libraries/database_interface_test.php @@ -28,7 +28,7 @@ class PMA_DBI_Test extends PHPUnit_Framework_TestCase */ function setup() { - $GLOBALS['cfg']['DBG']['sql'] = false; + $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['cfg']['IconvExtraParams'] = ''; } From 3ef4a744c65c6fcbf502b702ab77b5925568e12a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 16 Oct 2015 18:39:58 +1100 Subject: [PATCH 5/6] Fix more failing tests Signed-off-by: Madhura Jayaratne --- test/libraries/PMA_Form_Processing_test.php | 10 ++++++++++ test/libraries/PMA_designer_test.php | 2 ++ 2 files changed, 12 insertions(+) diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php index 9f9418907a..e7f91177fc 100644 --- a/test/libraries/PMA_Form_Processing_test.php +++ b/test/libraries/PMA_Form_Processing_test.php @@ -20,6 +20,16 @@ require_once 'libraries/core.lib.php'; */ class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase { + /** + * Prepares environment for the test. + * + * @return void + */ + public function setUp() + { + $GLOBALS['server'] = 1; + $GLOBALS['cfg']['ServerDefault'] = 1; + } /** * Test for process_formset() diff --git a/test/libraries/PMA_designer_test.php b/test/libraries/PMA_designer_test.php index 5c58b435ed..7b031e783b 100644 --- a/test/libraries/PMA_designer_test.php +++ b/test/libraries/PMA_designer_test.php @@ -33,6 +33,8 @@ class PMA_DesignerTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['ServerDefault'] = 1; $GLOBALS['cfg']['PDFPageSizes'] = array('A3', 'A4'); $GLOBALS['cfg']['PDFDefaultPageSize'] = 'A4'; + $GLOBALS['cfg']['Schema']['pdf_orientation'] = 'L'; + $GLOBALS['cfg']['Schema']['pdf_paper'] = 'A4'; $_SESSION = array( 'relation' => array( From 23c4e00c842ea9514f0ee5255f0f6d1feae0870a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 16 Oct 2015 19:42:09 +1100 Subject: [PATCH 6/6] Rename more class related tests Signed-off-by: Madhura Jayaratne --- .../PMA_Linter_Test.php => classes/LinterTest.php} | 6 ++---- .../PMA_string_test.php => classes/PMA_StringTest.php} | 8 +++----- .../StringCTypeTest.php} | 8 +++----- .../StringNativeType.php} | 8 +++----- .../PMA_Tracker_test.php => classes/TrackerTest.php} | 6 +++--- .../PMA_zip_test.php => classes/ZipFileTest.php} | 6 +++--- 6 files changed, 17 insertions(+), 25 deletions(-) rename test/{libraries/PMA_Linter_Test.php => classes/LinterTest.php} (97%) rename test/{libraries/PMA_string_test.php => classes/PMA_StringTest.php} (95%) rename test/{libraries/PMA_StringCType_test.php => classes/StringCTypeTest.php} (96%) rename test/{libraries/PMA_StringNativeType_test.php => classes/StringNativeType.php} (96%) rename test/{libraries/PMA_Tracker_test.php => classes/TrackerTest.php} (99%) rename test/{libraries/PMA_zip_test.php => classes/ZipFileTest.php} (94%) diff --git a/test/libraries/PMA_Linter_Test.php b/test/classes/LinterTest.php similarity index 97% rename from test/libraries/PMA_Linter_Test.php rename to test/classes/LinterTest.php index 9402e90fc1..a9cc049b38 100644 --- a/test/libraries/PMA_Linter_Test.php +++ b/test/classes/LinterTest.php @@ -11,14 +11,12 @@ */ use PMA\libraries\Linter; - - /** - * Tests for Linter.php. + * Tests for PMA\libraries\Linter * * @package PhpMyAdmin-test */ -class PMA_Linter_Test extends PHPUnit_Framework_TestCase +class LinterTest extends PHPUnit_Framework_TestCase { /** diff --git a/test/libraries/PMA_string_test.php b/test/classes/PMA_StringTest.php similarity index 95% rename from test/libraries/PMA_string_test.php rename to test/classes/PMA_StringTest.php index 3f2f564f51..47c4c7c879 100644 --- a/test/libraries/PMA_string_test.php +++ b/test/classes/PMA_StringTest.php @@ -1,7 +1,7 @@