From 2b7cfb595dcc79e6370fa099542b2cf4575ce032 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 18 Dec 2015 21:32:34 +1100 Subject: [PATCH] Move the rest of the tests related to objects under a common parent test Signed-off-by: Madhura Jayaratne --- test/classes/AdvisorTest.php | 4 ++-- test/classes/ConfigGeneratorTest.php | 5 ++--- test/classes/ConfigTest.php | 3 ++- test/classes/DatabaseInterfaceTest.php | 4 +++- test/classes/DbQbeTest.php | 3 ++- test/classes/DbSearchTest.php | 5 ++--- test/classes/DisplayResultsTest.php | 3 ++- test/classes/ErrorHandlerTest.php | 3 ++- test/classes/ErrorTest.php | 3 ++- test/classes/FileTest.php | 7 +++---- test/classes/FontTest.php | 4 +++- test/classes/FooterTest.php | 4 ++-- test/classes/HeaderTest.php | 3 ++- test/classes/IndexTest.php | 3 ++- test/classes/LinterTest.php | 4 +++- test/classes/ListDatabaseTest.php | 3 ++- test/classes/MenuTest.php | 12 ++---------- test/classes/MessageTest.php | 3 ++- test/classes/PDFTest.php | 3 ++- test/classes/PMA_StringTest.php | 4 +++- test/classes/ScriptsTest.php | 3 ++- test/classes/ServerStatusDataTest.php | 3 ++- test/classes/StringCTypeTest.php | 4 +++- test/classes/StringNativeType.php | 4 +++- test/classes/SystemDatabaseTest.php | 4 +++- test/classes/TableTest.php | 7 ++----- test/classes/TemplateTest.php | 4 +++- test/classes/ThemeManagerTest.php | 3 ++- test/classes/ThemeTest.php | 3 ++- test/classes/TrackerTest.php | 4 ++-- test/classes/TypesMySQLTest.php | 3 ++- test/classes/TypesTest.php | 4 +++- test/classes/UtilTest.php | 6 +++--- test/classes/VersionInformationTest.php | 4 +++- test/classes/ZipFileTest.php | 4 +++- 35 files changed, 83 insertions(+), 60 deletions(-) diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index ab7ce04578..e05be4ec18 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -12,6 +12,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/core.lib.php'; +require_once 'test/PMATestCase.php'; use PMA\libraries\Advisor; use PMA\libraries\Theme; @@ -21,7 +22,7 @@ use PMA\libraries\Theme; * * @package PhpMyAdmin-test */ -class AdvisorTest extends PHPUnit_Framework_TestCase +class AdvisorTest extends PMATestCase { /** @@ -34,7 +35,6 @@ class AdvisorTest extends PHPUnit_Framework_TestCase { $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme'); $GLOBALS['server'] = 0; - $GLOBALS['cfg']['ServerDefault'] = ''; } /** diff --git a/test/classes/ConfigGeneratorTest.php b/test/classes/ConfigGeneratorTest.php index bbe1b5ad25..9e15b8bec3 100644 --- a/test/classes/ConfigGeneratorTest.php +++ b/test/classes/ConfigGeneratorTest.php @@ -14,15 +14,15 @@ use PMA\libraries\config\ConfigFile; use PMA\setup\lib\ConfigGenerator; require_once 'libraries/core.lib.php'; - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\setup\lib\ConfigGenerator * * @package PhpMyAdmin-test */ -class ConfigGeneratorTest extends PHPUnit_Framework_TestCase +class ConfigGeneratorTest extends PMATestCase { /** @@ -33,7 +33,6 @@ class ConfigGeneratorTest extends PHPUnit_Framework_TestCase */ public function testGetConfigFile() { - $GLOBALS['cfg']['AvailableCharsets'] = array(); unset($_SESSION['eol']); $GLOBALS['PMA_Config'] = new Config(); diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 7a71c0c4e3..8750ebb462 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -17,13 +17,14 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/vendor_config.php'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests behaviour of PMA\libraries\Config class * * @package PhpMyAdmin-test */ -class ConfigTest extends PHPUnit_Framework_TestCase +class ConfigTest extends PMATestCase { /** * Turn off backup globals diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index be7fc0fcfd..413c5bbba0 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -6,12 +6,14 @@ * @package PhpMyAdmin-test */ +require_once 'test/PMATestCase.php'; + /** * Tests basic functionality of dummy dbi driver * * @package PhpMyAdmin-test */ -class DatabaseInterfaceTest extends PHPUnit_Framework_TestCase +class DatabaseInterfaceTest extends PMATestCase { private $_dbi; diff --git a/test/classes/DbQbeTest.php b/test/classes/DbQbeTest.php index f96ff4771b..2d80d6a159 100644 --- a/test/classes/DbQbeTest.php +++ b/test/classes/DbQbeTest.php @@ -13,6 +13,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/core.lib.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; +require_once 'test/PMATestCase.php'; use PMA\libraries\DbQbe; @@ -21,7 +22,7 @@ use PMA\libraries\DbQbe; * * @package PhpMyAdmin-test */ -class DbQbeTest extends PHPUnit_Framework_TestCase +class DbQbeTest extends PMATestCase { /** * @access protected diff --git a/test/classes/DbSearchTest.php b/test/classes/DbSearchTest.php index 547a3b6124..a1c0813d51 100644 --- a/test/classes/DbSearchTest.php +++ b/test/classes/DbSearchTest.php @@ -13,6 +13,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; use PMA\libraries\DbSearch; use PMA\libraries\Theme; @@ -22,7 +23,7 @@ use PMA\libraries\Theme; * * @package PhpMyAdmin-test */ -class DbSearchTest extends PHPUnit_Framework_TestCase +class DbSearchTest extends PMATestCase { /** * @access protected @@ -40,8 +41,6 @@ class DbSearchTest extends PHPUnit_Framework_TestCase { $this->object = new DbSearch('pma_test'); $GLOBALS['server'] = 0; - $GLOBALS['cfg']['ServerDefault'] = 1; - $GLOBALS['cfg']['ShowHint'] = true; $GLOBALS['db'] = 'pma'; } diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php index 3a0cf5487c..20b337729d 100644 --- a/test/classes/DisplayResultsTest.php +++ b/test/classes/DisplayResultsTest.php @@ -16,13 +16,14 @@ require_once 'libraries/js_escape.lib.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/string.lib.php'; +require_once 'test/PMATestCase.php'; /** * Test cases for displaying results. * * @package PhpMyAdmin-test */ -class DisplayResultsTest extends PHPUnit_Framework_TestCase +class DisplayResultsTest extends PMATestCase { /** * @access protected diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php index ccdadd6423..4e31ce9f2a 100644 --- a/test/classes/ErrorHandlerTest.php +++ b/test/classes/ErrorHandlerTest.php @@ -12,13 +12,14 @@ use PMA\libraries\Theme; require_once 'libraries/sanitizing.lib.php'; +require_once 'test/PMATestCase.php'; /** * Test for PMA\libraries\ErrorHandler class. * * @package PhpMyAdmin-test */ -class ErrorHandlerTest extends PHPUnit_Framework_TestCase +class ErrorHandlerTest extends PMATestCase { /** * @access protected diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php index 117158c2e2..5afbf66c91 100644 --- a/test/classes/ErrorTest.php +++ b/test/classes/ErrorTest.php @@ -13,13 +13,14 @@ use PMA\libraries\Theme; require_once 'libraries/sanitizing.lib.php'; +require_once 'test/PMATestCase.php'; /** * Error class testing. * * @package PhpMyAdmin-test */ -class ErrorTest extends PHPUnit_Framework_TestCase +class ErrorTest extends PMATestCase { /** * @access protected diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php index e2e3cf1709..0e8779a285 100644 --- a/test/classes/FileTest.php +++ b/test/classes/FileTest.php @@ -6,12 +6,14 @@ * @package PhpMyAdmin-test */ +require_once 'test/PMATestCase.php'; + /** * tests for PMA\libraries\File class * * @package PhpMyAdmin-test */ -class FileTest extends PHPUnit_Framework_TestCase +class FileTest extends PMATestCase { /** * Setup function for test cases @@ -20,9 +22,6 @@ class FileTest extends PHPUnit_Framework_TestCase */ public function setup() { - $GLOBALS['cfg']['BZipDump'] = true; - $GLOBALS['cfg']['GZipDump'] = true; - $GLOBALS['cfg']['ZipDump'] = true; $GLOBALS['charset_conversion'] = false; } diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php index 20e9a2ff64..5efb7d06c1 100644 --- a/test/classes/FontTest.php +++ b/test/classes/FontTest.php @@ -5,12 +5,14 @@ * @package PhpMyAdmin-test */ +require_once 'test/PMATestCase.php'; + /** * Tests for PMA\libraries\Font class * * @package PhpMyAdmin-test */ -class FontTest extends PHPUnit_Framework_TestCase +class FontTest extends PMATestCase { /** * Test getStringWidth with different characters. diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index ae39766d4f..ead4c9ab97 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -17,13 +17,14 @@ require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/vendor_config.php'; require_once 'libraries/relation.lib.php'; +require_once 'test/PMATestCase.php'; /** * Tests for Footer class * * @package PhpMyAdmin-test */ -class FooterTest extends PHPUnit_Framework_TestCase +class FooterTest extends PMATestCase { /** @@ -55,7 +56,6 @@ class FooterTest extends PHPUnit_Framework_TestCase $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['collation_connection'] = 'utf8_general_ci'; $GLOBALS['cfg']['Server']['verbose'] = 'verbose host'; - $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure'; $GLOBALS['server'] = '1'; $_GET['reload_left_frame'] = '1'; $GLOBALS['focus_querywindow'] = 'main_pane_left'; diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php index c9bca3ef5d..2a4d6a3b7f 100644 --- a/test/classes/HeaderTest.php +++ b/test/classes/HeaderTest.php @@ -19,6 +19,7 @@ require_once 'libraries/vendor_config.php'; require_once 'libraries/select_lang.inc.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/js_escape.lib.php'; +require_once 'test/PMATestCase.php'; /** * Test for PMA\libraries\Header class @@ -26,7 +27,7 @@ require_once 'libraries/js_escape.lib.php'; * @package PhpMyAdmin-test * @group medium */ -class HeaderTest extends PHPUnit_Framework_TestCase +class HeaderTest extends PMATestCase { /** * Configures global environment. diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php index 689f78aec0..2810bfa869 100644 --- a/test/classes/IndexTest.php +++ b/test/classes/IndexTest.php @@ -10,13 +10,14 @@ * Include to test. */ require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Test for Index class * * @package PhpMyAdmin-test */ -class IndexTest extends PHPUnit_Framework_TestCase +class IndexTest extends PMATestCase { private $_params = array(); diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php index a9cc049b38..f208a9e261 100644 --- a/test/classes/LinterTest.php +++ b/test/classes/LinterTest.php @@ -11,12 +11,14 @@ */ use PMA\libraries\Linter; +require_once 'test/PMATestCase.php'; + /** * Tests for PMA\libraries\Linter * * @package PhpMyAdmin-test */ -class LinterTest extends PHPUnit_Framework_TestCase +class LinterTest extends PMATestCase { /** diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php index 6910f155dd..d10d897d3e 100644 --- a/test/classes/ListDatabaseTest.php +++ b/test/classes/ListDatabaseTest.php @@ -14,13 +14,14 @@ $GLOBALS['cfg']['Server']['DisableIS'] = false; * Include to test. */ require_once 'libraries/relation.lib.php'; +require_once 'test/PMATestCase.php'; /** * tests for ListDatabase class * * @package PhpMyAdmin-test */ -class ListDatabaseTest extends PHPUnit_Framework_TestCase +class ListDatabaseTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php index 476b0bb3fb..9a9cdd22b1 100644 --- a/test/classes/MenuTest.php +++ b/test/classes/MenuTest.php @@ -19,13 +19,14 @@ require_once 'libraries/url_generating.lib.php'; require_once 'libraries/vendor_config.php'; require_once 'libraries/select_lang.inc.php'; require_once 'libraries/relation.lib.php'; +require_once 'test/PMATestCase.php'; /** * Test for Menu class * * @package PhpMyAdmin-test */ -class MenuTest extends PHPUnit_Framework_TestCase +class MenuTest extends PMATestCase { /** * Configures global environment. @@ -39,19 +40,10 @@ class MenuTest extends PHPUnit_Framework_TestCase } $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['server'] = 0; - $GLOBALS['cfg']['ServerDefault'] = 1; $GLOBALS['cfg']['Server']['verbose'] = 'verbose host'; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'both'; $_SESSION['PMA_Theme'] = new Theme(); $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath(); $GLOBALS['pmaThemeImage'] = 'theme/'; - $GLOBALS['cfg']['DefaultTabServer'] = 'welcome'; - $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure'; - $GLOBALS['cfg']['DefaultTabTable'] = 'browse'; - $GLOBALS['cfg']['OBGzip'] = false; - $GLOBALS['cfg']['NaturalOrder'] = true; - $GLOBALS['cfg']['TabsMode'] = 'both'; - $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF'); $GLOBALS['server'] = 'server'; $GLOBALS['db'] = 'pma_test'; diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php index 9dfb51931a..2ff65530f6 100644 --- a/test/classes/MessageTest.php +++ b/test/classes/MessageTest.php @@ -14,13 +14,14 @@ use PMA\libraries\Theme; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Test for Message class * * @package PhpMyAdmin-test */ -class MessageTest extends PHPUnit_Framework_TestCase +class MessageTest extends PMATestCase { /** * @var PMA\libraries\Message diff --git a/test/classes/PDFTest.php b/test/classes/PDFTest.php index f51dee881f..dc04dd04d8 100644 --- a/test/classes/PDFTest.php +++ b/test/classes/PDFTest.php @@ -13,13 +13,14 @@ use PMA\libraries\PDF; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/core.lib.php'; +require_once 'test/PMATestCase.php'; /** * tests for PDF class * * @package PhpMyAdmin-test */ -class PDFTest extends PHPUnit_Framework_TestCase +class PDFTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/PMA_StringTest.php b/test/classes/PMA_StringTest.php index 067a112194..d69c3b4848 100644 --- a/test/classes/PMA_StringTest.php +++ b/test/classes/PMA_StringTest.php @@ -11,12 +11,14 @@ */ use PMA\libraries\PMA_String; +require_once 'test/PMATestCase.php'; + /** * Tests for PMA\libraries\PMA_String * * @package PhpMyAdmin-test */ -class PMA_StringClassTest extends PHPUnit_Framework_TestCase +class PMA_StringClassTest extends PMATestCase { /** * @var String diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php index f88d0b5242..db6be2ab5a 100644 --- a/test/classes/ScriptsTest.php +++ b/test/classes/ScriptsTest.php @@ -14,13 +14,14 @@ use PMA\libraries\Scripts; require_once 'libraries/js_escape.lib.php'; require_once 'libraries/url_generating.lib.php'; +require_once 'test/PMATestCase.php'; /** * Tests for Script.php * * @package PhpMyAdmin-test */ -class ScriptsTest extends PHPUnit_Framework_TestCase +class ScriptsTest extends PMATestCase { /** * @access protected diff --git a/test/classes/ServerStatusDataTest.php b/test/classes/ServerStatusDataTest.php index 1b09500e31..e7ad7f0293 100644 --- a/test/classes/ServerStatusDataTest.php +++ b/test/classes/ServerStatusDataTest.php @@ -14,13 +14,14 @@ use PMA\libraries\ServerStatusData; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Test for ServerStatusData class * * @package PhpMyAdmin-test */ -class ServerStatusDataTest extends PHPUnit_Framework_TestCase +class ServerStatusDataTest extends PMATestCase { /** * @access protected diff --git a/test/classes/StringCTypeTest.php b/test/classes/StringCTypeTest.php index 644afcc0ff..91bedc36bc 100644 --- a/test/classes/StringCTypeTest.php +++ b/test/classes/StringCTypeTest.php @@ -11,12 +11,14 @@ */ use PMA\libraries\StringCType; +require_once 'test/PMATestCase.php'; + /** * Tests for PMA\libraries\StringCType * * @package PhpMyAdmin-test */ -class StringCTypeTest extends PHPUnit_Framework_TestCase +class StringCTypeTest extends PMATestCase { private $_object; diff --git a/test/classes/StringNativeType.php b/test/classes/StringNativeType.php index 8d95c2c1a5..c212844f23 100644 --- a/test/classes/StringNativeType.php +++ b/test/classes/StringNativeType.php @@ -11,12 +11,14 @@ */ use PMA\libraries\StringNativeType; +require_once 'test/PMATestCase.php'; + /** * Tests for PMA\libraries\StringNativeType * * @package PhpMyAdmin-test */ -class StringNativeTypeTest extends PHPUnit_Framework_TestCase +class StringNativeTypeTest extends PMATestCase { private $_object; diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php index eb4d896501..f079e640c5 100644 --- a/test/classes/SystemDatabaseTest.php +++ b/test/classes/SystemDatabaseTest.php @@ -6,12 +6,14 @@ * @package PhpMyAdmin-test */ +require_once 'test/PMATestCase.php'; + /** * Tests for libraries/SystemDatabase.php * * @package PhpMyAdmin-test */ -class SystemDatabaseTest extends PHPUnit_Framework_TestCase +class SystemDatabaseTest extends PMATestCase { /** * Setup function for test cases diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index df1630f4cb..4f69918222 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -18,13 +18,14 @@ require_once 'libraries/database_interface.inc.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/relation.lib.php'; +require_once 'test/PMATestCase.php'; /** * Tests behaviour of Table class * * @package PhpMyAdmin-test */ -class TableTest extends PHPUnit_Framework_TestCase +class TableTest extends PMATestCase { /** * Configures environment @@ -38,10 +39,6 @@ class TableTest extends PHPUnit_Framework_TestCase */ $GLOBALS['server'] = 0; $GLOBALS['cfg']['Server']['DisableIS'] = false; - $GLOBALS['cfg']['ServerDefault'] = 1; - $GLOBALS['cfg']['ActionLinksMode'] = 'both'; - $GLOBALS['cfg']['MaxExactCount'] = 100; - $GLOBALS['cfg']['MaxExactCountViews'] = 100; $GLOBALS['cfg']['Server']['pmadb'] = "pmadb"; $GLOBALS['sql_auto_increment'] = true; $GLOBALS['sql_if_not_exists'] = true; diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php index b3913f9b1f..69a148a903 100644 --- a/test/classes/TemplateTest.php +++ b/test/classes/TemplateTest.php @@ -6,12 +6,14 @@ * @package PhpMyAdmin-test */ +require_once 'test/PMATestCase.php'; + /** * Test for PMA\libraries\Template class * * @package PhpMyAdmin-test */ -class TemplateTest extends PHPUnit_Framework_TestCase +class TemplateTest extends PMATestCase { /** * Test for render diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php index 731d0a8838..8fe76155f1 100644 --- a/test/classes/ThemeManagerTest.php +++ b/test/classes/ThemeManagerTest.php @@ -14,13 +14,14 @@ use PMA\libraries\ThemeManager; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/core.lib.php'; +require_once 'test/PMATestCase.php'; /** * tests for ThemeManager class * * @package PhpMyAdmin-test */ -class ThemeManagerTest extends PHPUnit_Framework_TestCase +class ThemeManagerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index ad43e93fe0..4e1ee3e883 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -10,13 +10,14 @@ use PMA\libraries\Theme; require_once 'libraries/core.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; +require_once 'test/PMATestCase.php'; /** * Test class for Theme. * * @package PhpMyAdmin-test */ -class ThemeTest extends PHPUnit_Framework_TestCase +class ThemeTest extends PMATestCase { /** * @var Theme diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php index becaeca5e3..c95f043273 100644 --- a/test/classes/TrackerTest.php +++ b/test/classes/TrackerTest.php @@ -14,13 +14,14 @@ use PMA\libraries\Tracker; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/relation.lib.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\Tracker * * @package PhpMyAdmin-test */ -class TrackerTest extends PHPUnit_Framework_TestCase +class TrackerTest extends PMATestCase { /** @@ -41,7 +42,6 @@ class TrackerTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['tracking_default_statements'] = ''; $GLOBALS['cfg']['Server']['tracking_version_auto_create'] = ''; $GLOBALS['cfg']['Server']['DisableIS'] = false; - $GLOBALS['cfg']['DBG']['sql'] = false; $_SESSION['relation'][$GLOBALS['server']] = array( 'PMA_VERSION' => PMA_VERSION, diff --git a/test/classes/TypesMySQLTest.php b/test/classes/TypesMySQLTest.php index 210660c1a5..120868a1e3 100644 --- a/test/classes/TypesMySQLTest.php +++ b/test/classes/TypesMySQLTest.php @@ -12,13 +12,14 @@ use PMA\libraries\TypesMySQL; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Testcase for MySQL types handling. * * @package PhpMyAdmin-test */ -class TypesMySQLTest extends PHPUnit_Framework_TestCase +class TypesMySQLTest extends PMATestCase { /** * @var PMA\libraries\Types diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php index eb1f51dd3b..f59388e9a1 100644 --- a/test/classes/TypesTest.php +++ b/test/classes/TypesTest.php @@ -6,12 +6,14 @@ */ use PMA\libraries\Types; +require_once 'test/PMATestCase.php'; + /** * Test class for Types. * * @package PhpMyAdmin-test */ -class TypesTest extends PHPUnit_Framework_TestCase +class TypesTest extends PMATestCase { /** * @var Types diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index 9aceaf5a2d..73c9be8dce 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -6,12 +6,14 @@ * @package PhpMyAdmin-test */ +require_once 'test/PMATestCase.php'; + /** * Test for PMA\libraries\Util class * * @package PhpMyAdmin-test */ -class UtilTest extends PHPUnit_Framework_TestCase +class UtilTest extends PMATestCase { /** @@ -74,8 +76,6 @@ class UtilTest extends PHPUnit_Framework_TestCase public function testIsForeignKeyCheck() { $GLOBALS['server'] = 1; - $GLOBALS['cfg']['DBG'] = array(); - $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'enable'; $this->assertEquals( diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php index fdabba1e7a..02a97468c0 100644 --- a/test/classes/VersionInformationTest.php +++ b/test/classes/VersionInformationTest.php @@ -11,12 +11,14 @@ */ use PMA\libraries\VersionInformation; +require_once 'test/PMATestCase.php'; + /** * Tests for methods in PMA\libraries\VersionInformation class * * @package PhpMyAdmin-test */ -class VersionInformationTest extends PHPUnit_Framework_TestCase +class VersionInformationTest extends PMATestCase { private $_releases; diff --git a/test/classes/ZipFileTest.php b/test/classes/ZipFileTest.php index 4868e69969..027b9508c6 100644 --- a/test/classes/ZipFileTest.php +++ b/test/classes/ZipFileTest.php @@ -7,12 +7,14 @@ use PMA\libraries\ZipFile; +require_once 'test/PMATestCase.php'; + /** * Tests for PMA\libraries\ZipFile * * @package PhpMyAdmin-test */ -class ZipFileTest extends PHPUnit_Framework_TestCase +class ZipFileTest extends PMATestCase { /** * @access protected