More tests for classes

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Oct 16, 2015 · 1043a36 · 1043a36
1 parent ab49273
commit 1043a36
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 19 deletions.
diff --git a/test/libraries/PMA_ConfigGenerator_test.php → test/classes/ConfigGeneratorTest.php b/test/libraries/PMA_ConfigGenerator_test.php → test/classes/ConfigGeneratorTest.php
@@ -18,11 +18,11 @@
 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 → test/classes/config/ConfigFileTest.php b/test/libraries/PMA_ConfigFile_test.php → test/classes/config/ConfigFileTest.php
@@ -18,7 +18,7 @@
  *
  * @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 → test/classes/config/PageSettingsTest.php b/test/libraries/PMA_page_settings_test.php → test/classes/config/PageSettingsTest.php
@@ -11,11 +11,11 @@
 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 → test/classes/engines/BdbTest.php b/test/engines/PMA_StorageEngine_bdb_test.php → test/classes/engines/BdbTest.php
@@ -20,7 +20,7 @@
  *
  * @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/...engines/PMA_StorageEngine_binlog_test.php → test/classes/engines/BinlogTest.php b/...engines/PMA_StorageEngine_binlog_test.php → test/classes/engines/BinlogTest.php
@@ -15,11 +15,11 @@
 
 
 /**
- * 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/...engines/PMA_StorageEngine_innodb_test.php → test/classes/engines/InnodbTest.php b/...engines/PMA_StorageEngine_innodb_test.php → test/classes/engines/InnodbTest.php
@@ -15,11 +15,11 @@
 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/...engines/PMA_StorageEngine_memory_test.php → test/classes/engines/MemoryTest.php b/...engines/PMA_StorageEngine_memory_test.php → test/classes/engines/MemoryTest.php
@@ -16,11 +16,11 @@
 
 
 /**
- * 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/...nes/PMA_StorageEngine_mrg_myisam_test.php → test/classes/engines/Mrg_MyisamTest.php b/...nes/PMA_StorageEngine_mrg_myisam_test.php → test/classes/engines/Mrg_MyisamTest.php
@@ -18,7 +18,7 @@
  *
  * @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/...engines/PMA_StorageEngine_myisam_test.php → test/classes/engines/MyisamTest.php b/...engines/PMA_StorageEngine_myisam_test.php → test/classes/engines/MyisamTest.php
@@ -15,11 +15,11 @@
 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/...nes/PMA_StorageEngine_ndbcluster_test.php → test/classes/engines/NdbclusterTest.php b/...nes/PMA_StorageEngine_ndbcluster_test.php → test/classes/engines/NdbclusterTest.php
@@ -15,11 +15,11 @@
 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 → test/classes/engines/PbxtTest.php b/test/engines/PMA_StorageEngine_pbxt_test.php → test/classes/engines/PbxtTest.php
@@ -17,11 +17,11 @@
 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');
     }