Merge remote-tracking branch 'origin/master'

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
 {
 
     /**

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
 {
 
     /**

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

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;

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

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

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

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

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

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

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.

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
 {
 
     /**

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.

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();
 

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
 {
 
     /**

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

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.

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

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

test/classes/PMA_StringTest.php

@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for Specialized String Functions for phpMyAdmin
+ * Tests for PMA\libraries\PMA_String
  *
  * @package PhpMyAdmin-test
  */
@@ -11,14 +11,12 @@
  */
 use PMA\libraries\PMA_String;
 
-
-
 /**
- * Tests for Specialized String Functions for phpMyAdmin
+ * Tests for PMA\libraries\PMA_String
  *
  * @package PhpMyAdmin-test
  */
-class PMA_String_Test extends PHPUnit_Framework_TestCase
+class PMA_StringTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var String

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

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

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

test/classes/StringCTypeTest.php

@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for Specialized String Class (CType) for phpMyAdmin
+ * Tests for PMA\libraries\StringCType
  *
  * @package PhpMyAdmin-test
  */
@@ -11,14 +11,12 @@
  */
 use PMA\libraries\StringCType;
 
-
-
 /**
- * Tests for Specialized String Class (CType) for phpMyAdmin
+ * Tests for PMA\libraries\StringCType
  *
  * @package PhpMyAdmin-test
  */
-class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
+class StringCTypeTest extends PHPUnit_Framework_TestCase
 {
     private $_object;
 

test/classes/StringNativeType.php

@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for Specialized String Class (Native) for phpMyAdmin
+ * Tests for PMA\libraries\StringNativeType
  *
  * @package PhpMyAdmin-test
  */
@@ -11,14 +11,12 @@
  */
 use PMA\libraries\StringNativeType;
 
-
-
 /**
- * Tests for Specialized String Class (Native) for phpMyAdmin
+ * Tests for PMA\libraries\StringNativeType
  *
  * @package PhpMyAdmin-test
  */
-class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
+class StringNativeTypeTest extends PHPUnit_Framework_TestCase
 {
     private $_object;
 

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

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

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

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

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

test/classes/TrackerTest.php

@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for Tracking changes on databases, tables and views
+ * Tests for PMA\libraries\Tracker
  *
  * @package PhpMyAdmin-test
  */
@@ -16,11 +16,11 @@ require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/relation.lib.php';
 
 /**
- * Tests for Tracking changes on databases, tables and views
+ * Tests for PMA\libraries\Tracker
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
+class TrackerTest extends PHPUnit_Framework_TestCase
 {
 
     /**

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

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

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
 {
 
     /**

test/classes/ZipFileTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for displaying results
+ * Tests PMA\libraries\ZipFile
  *
  * @package PhpMyAdmin-test
  */
@@ -8,11 +8,11 @@
 use PMA\libraries\ZipFile;
 
 /**
- * Tests for displaying results
+ * Tests for PMA\libraries\ZipFile
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Zip_Test extends PHPUnit_Framework_TestCase
+class ZipFileTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 {
 
     /**

test/classes/gis/GISGeomTest.php

@@ -7,11 +7,11 @@
  */
 
 /**
- * Abstract parent class for all PMA_GIS_<Geom_type> test classes
+ * Abstract parent class for all GIS<Geom_type> test classes
  *
  * @package PhpMyAdmin-test
  */
-abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
+abstract class GISGeomTest extends PHPUnit_Framework_TestCase
 {
 
     /**

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

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
 {
 
     /**

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;
 

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

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

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;