From e88dcc15bb77a20c7ccf38d7223b3b3cd61f9545 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 Dec 2015 19:22:10 +1100 Subject: [PATCH 1/8] Introduce base test case. Reset configuration values to defaults for each test case Signed-off-by: Madhura Jayaratne --- test/PMATestCase.php | 21 +++++++++++++++++++++ test/classes/StorageEngineTest.php | 7 ++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 test/PMATestCase.php diff --git a/test/PMATestCase.php b/test/PMATestCase.php new file mode 100644 index 0000000000..66d56f7aed --- /dev/null +++ b/test/PMATestCase.php @@ -0,0 +1,21 @@ + Date: Thu, 17 Dec 2015 19:36:30 +1100 Subject: [PATCH 2/8] Use PMATestCase as base class Signed-off-by: Madhura Jayaratne --- test/classes/config/ConfigFileTest.php | 4 ++-- test/classes/config/FormDisplayTest.php | 3 ++- test/classes/config/FormTest.php | 3 ++- test/classes/config/PageSettingsTest.php | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/classes/config/ConfigFileTest.php b/test/classes/config/ConfigFileTest.php index eab2cf2d3e..bec7cfe9e8 100644 --- a/test/classes/config/ConfigFileTest.php +++ b/test/classes/config/ConfigFileTest.php @@ -11,6 +11,7 @@ */ use PMA\libraries\config\ConfigFile; +require_once 'test/PMATestCase.php'; require_once 'libraries/php-gettext/gettext.inc'; /** @@ -18,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class ConfigFileTest extends PHPUnit_Framework_TestCase +class ConfigFileTest extends PMATestCase { /** * Any valid key that exists in config.default.php and isn't empty @@ -41,7 +42,6 @@ class ConfigFileTest extends PHPUnit_Framework_TestCase protected function setUp() { $GLOBALS['server'] = 1; - $GLOBALS['cfg']['AvailableCharsets'] = array(); $this->object = new ConfigFile(); } diff --git a/test/classes/config/FormDisplayTest.php b/test/classes/config/FormDisplayTest.php index 83ed963c1e..e1df715283 100644 --- a/test/classes/config/FormDisplayTest.php +++ b/test/classes/config/FormDisplayTest.php @@ -11,6 +11,7 @@ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\FormDisplay; use PMA\libraries\Theme; +require_once 'test/PMATestCase.php'; require_once 'libraries/config/config_functions.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/user_preferences.lib.php'; @@ -20,7 +21,7 @@ require_once 'libraries/user_preferences.lib.php'; * * @package PhpMyAdmin-test */ -class FormDisplayTest extends PHPUnit_Framework_TestCase +class FormDisplayTest extends PMATestCase { /** * @var FormDisplay diff --git a/test/classes/config/FormTest.php b/test/classes/config/FormTest.php index a736ae2789..bc4e9d0969 100644 --- a/test/classes/config/FormTest.php +++ b/test/classes/config/FormTest.php @@ -11,6 +11,7 @@ use PMA\libraries\config\ConfigFile; use PMA\libraries\config\Form; use PMA\libraries\Theme; +require_once 'test/PMATestCase.php'; require_once 'libraries/php-gettext/gettext.inc'; /** @@ -18,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc'; * * @package PhpMyAdmin-test */ -class FormTest extends PHPUnit_Framework_TestCase +class FormTest extends PMATestCase { /** * @var Form diff --git a/test/classes/config/PageSettingsTest.php b/test/classes/config/PageSettingsTest.php index 24da92febf..28f1ba51f5 100644 --- a/test/classes/config/PageSettingsTest.php +++ b/test/classes/config/PageSettingsTest.php @@ -7,6 +7,7 @@ */ use PMA\libraries\config\PageSettings; +require_once 'test/PMATestCase.php'; require_once 'libraries/config/user_preferences.forms.php'; require_once 'libraries/config/page_settings.forms.php'; @@ -15,7 +16,7 @@ require_once 'libraries/config/page_settings.forms.php'; * * @package PhpMyAdmin-test */ -class PageSettingsTest extends PHPUnit_Framework_TestCase +class PageSettingsTest extends PMATestCase { /** * Setup tests @@ -24,7 +25,6 @@ class PageSettingsTest extends PHPUnit_Framework_TestCase */ public function setUp() { - $GLOBALS['cfg']['ServerDefault'] = 1; $GLOBALS['server'] = 1; $GLOBALS['db'] = 'db'; } From 4622f16b1fcff6249c5adaa3ef949a6fc6866de3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 Dec 2015 20:06:21 +1100 Subject: [PATCH 3/8] Use common test class as parent for more test cases Signed-off-by: Madhura Jayaratne --- .../DatabaseStructureControllerTest.php | 11 ++--------- .../ServerCollationsControllerTest.php | 13 ++----------- .../ServerDatabasesControllerTest.php | 18 ++++-------------- .../ServerEnginesControllerTest.php | 13 ++----------- .../ServerPluginsControllerTest.php | 13 ++----------- .../ServerVariablesControllerTest.php | 14 ++------------ .../controllers/TableIndexesControllerTest.php | 3 ++- .../TableRelationControllerTest.php | 4 ++-- .../controllers/TableSearchControllerTest.php | 12 ++---------- .../TableStructureControllerTest.php | 11 ++--------- 10 files changed, 22 insertions(+), 90 deletions(-) diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php index a2fc4e73df..b833da6d1d 100644 --- a/test/classes/controllers/DatabaseStructureControllerTest.php +++ b/test/classes/controllers/DatabaseStructureControllerTest.php @@ -16,6 +16,7 @@ use PMA\libraries\di\Container; use PMA\libraries\Table; use PMA\libraries\Theme; +require_once 'test/PMATestCase.php'; require_once 'libraries/database_interface.inc.php'; require_once 'test/libraries/stubs/ResponseStub.php'; @@ -26,7 +27,7 @@ require_once 'test/libraries/stubs/ResponseStub.php'; * * @package PhpMyAdmin-test */ -class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase +class DatabaseStructureControllerTest extends PMATestCase { /** * @var \PMA\Test\Stubs\Response @@ -45,15 +46,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase $_REQUEST['pos'] = 3; //$GLOBALS - $GLOBALS['cfg']['MaxRows'] = 10; $GLOBALS['server'] = 1; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['RememberSorting'] = true; - $GLOBALS['cfg']['SQP'] = array(); - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ShowSQL'] = true; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; - $GLOBALS['cfg']['LimitChars'] = 100; $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['table'] = "table"; diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php index a3442d3dd4..7b39ef0aa5 100644 --- a/test/classes/controllers/ServerCollationsControllerTest.php +++ b/test/classes/controllers/ServerCollationsControllerTest.php @@ -24,7 +24,6 @@ $GLOBALS['available_languages']= array( "ch" => array("Chinese", "TW-Chinese") ); $GLOBALS['text_dir'] = "text_dir"; -$GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['cfg']['Server'] = array( 'DisableIS' => false ); @@ -42,13 +41,14 @@ require_once 'libraries/js_escape.lib.php'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/server_common.inc.php'; require_once 'libraries/mysql_charsets.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for ServerCollationsController class * * @package PhpMyAdmin-test */ -class ServerCollationsControllerTest extends PHPUnit_Framework_TestCase +class ServerCollationsControllerTest extends PMATestCase { /** * Prepares environment for the test. @@ -62,16 +62,7 @@ class ServerCollationsControllerTest extends PHPUnit_Framework_TestCase $_REQUEST['pos'] = 3; //$GLOBALS - $GLOBALS['cfg']['MaxRows'] = 10; $GLOBALS['is_ajax_request'] = true; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['RememberSorting'] = true; - $GLOBALS['cfg']['SQP'] = array(); - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ShowSQL'] = true; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; - $GLOBALS['cfg']['LimitChars'] = 100; - $GLOBALS['table'] = "table"; $GLOBALS['pmaThemeImage'] = 'image'; } diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php index 2ef9e15180..ad23838bb5 100644 --- a/test/classes/controllers/ServerDatabasesControllerTest.php +++ b/test/classes/controllers/ServerDatabasesControllerTest.php @@ -18,7 +18,8 @@ require_once 'libraries/database_interface.inc.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/js_escape.lib.php'; -require_once 'libraries/config.default.php'; +require_once 'test/libraries/stubs/ResponseStub.php'; +require_once 'test/PMATestCase.php'; /** * Tests for ServerDatabasesController class @@ -26,7 +27,7 @@ require_once 'libraries/config.default.php'; * @package PhpMyAdmin-test */ -class ServerDatabasesControllerTest extends PHPUnit_Framework_TestCase +class ServerDatabasesControllerTest extends PMATestCase { /** * Prepares environment for the test. @@ -42,18 +43,7 @@ class ServerDatabasesControllerTest extends PHPUnit_Framework_TestCase //$GLOBALS $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); $GLOBALS['PMA_Config']->enableBc(); - $GLOBALS['cfg']['MaxRows'] = 10; - $GLOBALS['cfg']['MaxDbList'] = 100; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['RememberSorting'] = true; - $GLOBALS['cfg']['SQP'] = array(); - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ShowSQL'] = true; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; - $GLOBALS['cfg']['LimitChars'] = 100; - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['cfg']['ActionLinksMode'] = "both"; - $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure'; + $GLOBALS['is_superuser'] = false; $GLOBALS['table'] = "table"; $GLOBALS['replication_info']['master']['status'] = false; diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php index 741e9fb58b..5c152124ae 100644 --- a/test/classes/controllers/ServerEnginesControllerTest.php +++ b/test/classes/controllers/ServerEnginesControllerTest.php @@ -17,13 +17,14 @@ require_once 'libraries/database_interface.inc.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/js_escape.lib.php'; +require_once 'test/PMATestCase.php'; /** * Tests for ServerEnginesController class * * @package PhpMyAdmin-test */ -class ServerEnginesControllerTest extends PHPUnit_Framework_TestCase +class ServerEnginesControllerTest extends PMATestCase { /** * Prepares environment for the test. @@ -38,16 +39,6 @@ class ServerEnginesControllerTest extends PHPUnit_Framework_TestCase //$GLOBALS $GLOBALS['server'] = 0; - $GLOBALS['cfg']['MaxRows'] = 10; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['RememberSorting'] = true; - $GLOBALS['cfg']['SQP'] = array(); - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ShowSQL'] = true; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; - $GLOBALS['cfg']['LimitChars'] = 100; - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['table'] = "table"; $GLOBALS['pmaThemeImage'] = 'image'; diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/controllers/ServerPluginsControllerTest.php index e2a5dd00f8..c8bb4026bd 100644 --- a/test/classes/controllers/ServerPluginsControllerTest.php +++ b/test/classes/controllers/ServerPluginsControllerTest.php @@ -17,13 +17,14 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/js_escape.lib.php'; +require_once 'test/PMATestCase.php'; /** * Tests for ServerPluginsController class * * @package PhpMyAdmin-test */ -class ServerPluginsControllerTest extends PHPUnit_Framework_TestCase +class ServerPluginsControllerTest extends PMATestCase { /** * Prepares environment for the test. @@ -37,16 +38,6 @@ class ServerPluginsControllerTest extends PHPUnit_Framework_TestCase $_REQUEST['pos'] = 3; //$GLOBALS - $GLOBALS['cfg']['MaxRows'] = 10; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['RememberSorting'] = true; - $GLOBALS['cfg']['SQP'] = array(); - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ShowSQL'] = true; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; - $GLOBALS['cfg']['LimitChars'] = 100; - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['table'] = "table"; $GLOBALS['pmaThemeImage'] = 'image'; diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php index 387e31b776..214cf51829 100644 --- a/test/classes/controllers/ServerVariablesControllerTest.php +++ b/test/classes/controllers/ServerVariablesControllerTest.php @@ -14,6 +14,7 @@ require_once 'libraries/url_generating.lib.php'; require_once 'libraries/database_interface.inc.php'; require_once 'test/libraries/stubs/ResponseStub.php'; +require_once 'test/PMATestCase.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/js_escape.lib.php'; @@ -23,7 +24,7 @@ require_once 'libraries/js_escape.lib.php'; * * @package PhpMyAdmin-test */ -class ServerVariablesControllerTest extends PHPUnit_Framework_TestCase +class ServerVariablesControllerTest extends PMATestCase { /** * @var \PMA\Test\Stubs\Response @@ -42,17 +43,6 @@ class ServerVariablesControllerTest extends PHPUnit_Framework_TestCase $_REQUEST['pos'] = 3; //$GLOBALS - $GLOBALS['cfg']['MaxRows'] = 10; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['RememberSorting'] = true; - $GLOBALS['cfg']['SQP'] = array(); - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ShowSQL'] = true; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; - $GLOBALS['cfg']['LimitChars'] = 100; - $GLOBALS['cfg']['DBG']['sql'] = false; - $GLOBALS['cfg']['Server']['host'] = "localhost"; - $GLOBALS['cfg']['ActionLinksMode'] = 'icons'; $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF'); $GLOBALS['server'] = 1; $GLOBALS['table'] = "table"; diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php index 77d1756a29..fd7f88ccea 100644 --- a/test/classes/controllers/TableIndexesControllerTest.php +++ b/test/classes/controllers/TableIndexesControllerTest.php @@ -25,13 +25,14 @@ require_once 'libraries/url_generating.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'test/libraries/stubs/ResponseStub.php'; +require_once 'test/PMATestCase.php'; /** * Tests for libraries/controllers/TableIndexesController.php * * @package PhpMyAdmin-test */ -class TableIndexesControllerTest extends PHPUnit_Framework_TestCase +class TableIndexesControllerTest extends PMATestCase { /** * Setup function for test cases diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php index a942019e81..5ca0ee0cfc 100644 --- a/test/classes/controllers/TableRelationControllerTest.php +++ b/test/classes/controllers/TableRelationControllerTest.php @@ -17,13 +17,14 @@ require_once 'libraries/database_interface.inc.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/relation.lib.php'; require_once 'test/libraries/stubs/ResponseStub.php'; +require_once 'test/PMATestCase.php'; /** * Tests for libraries/controllers/TableRelationController.php * * @package PhpMyAdmin-test */ -class TableRelationControllerTest extends PHPUnit_Framework_TestCase +class TableRelationControllerTest extends PMATestCase { /** * @var \PMA\Test\Stubs\Response @@ -39,7 +40,6 @@ class TableRelationControllerTest extends PHPUnit_Framework_TestCase { $GLOBALS['server'] = 0; $GLOBALS['pmaThemeImage'] = 'theme/'; - $GLOBALS['cfg']['ShowHint'] = true; //$_SESSION $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme'); $_SESSION['PMA_Theme'] = new Theme(); diff --git a/test/classes/controllers/TableSearchControllerTest.php b/test/classes/controllers/TableSearchControllerTest.php index 0343f42202..355d98c109 100644 --- a/test/classes/controllers/TableSearchControllerTest.php +++ b/test/classes/controllers/TableSearchControllerTest.php @@ -15,13 +15,14 @@ use PMA\libraries\Theme; use PMA\libraries\TypesMySQL; require_once 'test/libraries/stubs/ResponseStub.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA_TableSearch * * @package PhpMyAdmin-test */ -class TableSearchControllerTest extends PHPUnit_Framework_TestCase +class TableSearchControllerTest extends PMATestCase { /** * @var PMA\Test\Stubs\Response @@ -48,16 +49,7 @@ class TableSearchControllerTest extends PHPUnit_Framework_TestCase $GLOBALS['is_ajax_request'] = false; $GLOBALS['cfgRelation'] = PMA_getRelationsParam(); $GLOBALS['PMA_Types'] = new TypesMySQL(); - - $GLOBALS['cfg']['ServerDefault'] = 1; - $GLOBALS['cfg']['maxRowPlotLimit'] = 500; $GLOBALS['cfg']['Server']['DisableIS'] = false; - $GLOBALS['cfg']['ServerDefault'] = 1; - $GLOBALS['cfg']['ActionLinksMode'] = 'both'; - $GLOBALS['cfg']['ForeignKeyMaxLimit'] = 100; - $GLOBALS['cfg']['InitialSlidersState'] = 'closed'; - $GLOBALS['cfg']['MaxRows'] = 25; - $GLOBALS['cfg']['TabsMode'] = 'text'; $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') ->disableOriginalConstructor() diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php index 3f2cd58680..38f9cc57a3 100644 --- a/test/classes/controllers/TableStructureControllerTest.php +++ b/test/classes/controllers/TableStructureControllerTest.php @@ -16,6 +16,7 @@ use PMA\libraries\Theme; require_once 'libraries/database_interface.inc.php'; require_once 'test/libraries/stubs/ResponseStub.php'; +require_once 'test/PMATestCase.php'; /** * TableStructureController_Test class @@ -24,7 +25,7 @@ require_once 'test/libraries/stubs/ResponseStub.php'; * * @package PhpMyAdmin-test */ -class TableStructureControllerTest extends PHPUnit_Framework_TestCase +class TableStructureControllerTest extends PMATestCase { /** * @var \PMA\Test\Stubs\Response @@ -43,15 +44,7 @@ class TableStructureControllerTest extends PHPUnit_Framework_TestCase $_REQUEST['pos'] = 3; //$GLOBALS - $GLOBALS['cfg']['MaxRows'] = 10; $GLOBALS['server'] = 1; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['RememberSorting'] = true; - $GLOBALS['cfg']['SQP'] = array(); - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ShowSQL'] = true; - $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; - $GLOBALS['cfg']['LimitChars'] = 100; $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['table'] = "table"; From 102f89c511697265703c1fce9c7e9ee9682da8de Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 Dec 2015 20:16:47 +1100 Subject: [PATCH 4/8] Temporarily remove locale and lint to make travis run fast Signed-off-by: Madhura Jayaratne --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ef831af71..74231b551d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,6 @@ before_script: script: - ant clean - - ant locales - - if [ -z "$SELENIUM" ] ; then ant lint ; fi - set -e; if [ $TRAVIS_PHP_VERSION == "hhvm" ] ; then ant phpunit-hhvm ; From eb2c50e4463a4d5a65df341c74dff50c7a5e0edf Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 Dec 2015 20:22:41 +1100 Subject: [PATCH 5/8] Move more test classes to be subclasses to PMATestCase Signed-off-by: Madhura Jayaratne --- test/classes/controllers/TableIndexesControllerTest.php | 2 -- test/classes/dbi/DBIMysqlTest.php | 5 ++--- test/classes/dbi/DBIMysqliTest.php | 6 ++---- test/classes/engines/BdbTest.php | 5 ++--- test/classes/engines/BinlogTest.php | 5 ++--- test/classes/engines/InnodbTest.php | 4 ++-- test/classes/engines/MemoryTest.php | 5 ++--- 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 ++-- 11 files changed, 20 insertions(+), 28 deletions(-) diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php index fd7f88ccea..a2081edc85 100644 --- a/test/classes/controllers/TableIndexesControllerTest.php +++ b/test/classes/controllers/TableIndexesControllerTest.php @@ -48,8 +48,6 @@ class TableIndexesControllerTest extends PMATestCase $GLOBALS['server'] = 1; $GLOBALS['cfg']['Server']['pmadb'] = ''; $GLOBALS['pmaThemeImage'] = 'theme/'; - $GLOBALS['cfg']['ServerDefault'] = "server"; - $GLOBALS['cfg']['ShowHint'] = true; $GLOBALS['url_params'] = array( 'db' => 'db', 'server' => 1 diff --git a/test/classes/dbi/DBIMysqlTest.php b/test/classes/dbi/DBIMysqlTest.php index 134f1e2bac..df97501076 100644 --- a/test/classes/dbi/DBIMysqlTest.php +++ b/test/classes/dbi/DBIMysqlTest.php @@ -14,6 +14,7 @@ use PMA\libraries\dbi\DBIMysql; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; require_once 'libraries/database_interface.inc.php'; @@ -22,7 +23,7 @@ require_once 'libraries/database_interface.inc.php'; * * @package PhpMyAdmin-test */ -class DBIMysqlTest extends PHPUnit_Framework_TestCase +class DBIMysqlTest extends PMATestCase { /** * @access protected @@ -42,7 +43,6 @@ class DBIMysqlTest extends PHPUnit_Framework_TestCase $this->markTestSkipped('The MySQL extension is not available.'); } $GLOBALS['cfg']['Server']['ssl'] = true; - $GLOBALS['cfg']['PersistentConnections'] = false; $GLOBALS['cfg']['Server']['compress'] = true; $this->object = new DBIMysql(); } @@ -173,7 +173,6 @@ class DBIMysqlTest extends PHPUnit_Framework_TestCase $ret ); - $GLOBALS['cfg']['PersistentConnections'] = true; $ret = $this->object->connect( $user, $password, $is_controluser, $server, $auxiliary_connection diff --git a/test/classes/dbi/DBIMysqliTest.php b/test/classes/dbi/DBIMysqliTest.php index fe1c185af4..2b90fd0e9d 100644 --- a/test/classes/dbi/DBIMysqliTest.php +++ b/test/classes/dbi/DBIMysqliTest.php @@ -15,13 +15,14 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\dbi\DBIMysqli class * * @package PhpMyAdmin-test */ -class DBIMysqliTest extends PHPUnit_Framework_TestCase +class DBIMysqliTest extends PMATestCase { /** * @access protected @@ -38,10 +39,7 @@ class DBIMysqliTest extends PHPUnit_Framework_TestCase protected function setUp() { $GLOBALS['cfg']['Server']['ssl'] = false; - $GLOBALS['cfg']['PersistentConnections'] = false; $GLOBALS['cfg']['Server']['compress'] = true; - $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; - $GLOBALS['cfg']['ActionLinksMode'] = "both"; $GLOBALS['pmaThemeImage'] = 'image'; //$_SESSION diff --git a/test/classes/engines/BdbTest.php b/test/classes/engines/BdbTest.php index ed483974a2..713f8628d9 100644 --- a/test/classes/engines/BdbTest.php +++ b/test/classes/engines/BdbTest.php @@ -13,14 +13,14 @@ use PMA\libraries\engines\Bdb; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; - +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Bdb * * @package PhpMyAdmin-test */ -class BdbTest extends PHPUnit_Framework_TestCase +class BdbTest extends PMATestCase { /** * @access protected @@ -36,7 +36,6 @@ class BdbTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $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 5e8d037861..c1457b05ac 100644 --- a/test/classes/engines/BinlogTest.php +++ b/test/classes/engines/BinlogTest.php @@ -12,14 +12,14 @@ use PMA\libraries\engines\Binlog; require_once 'libraries/database_interface.inc.php'; - +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Binlog * * @package PhpMyAdmin-test */ -class BinlogTest extends PHPUnit_Framework_TestCase +class BinlogTest extends PMATestCase { /** * @access protected @@ -35,7 +35,6 @@ class BinlogTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $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 8f9e85be90..11f353d7e8 100644 --- a/test/classes/engines/InnodbTest.php +++ b/test/classes/engines/InnodbTest.php @@ -13,13 +13,14 @@ use PMA\libraries\engines\Innodb; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Innodb * * @package PhpMyAdmin-test */ -class InnodbTest extends PHPUnit_Framework_TestCase +class InnodbTest extends PMATestCase { /** * @access protected @@ -35,7 +36,6 @@ class InnodbTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $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 58ee38c748..bd98d8b7d2 100644 --- a/test/classes/engines/MemoryTest.php +++ b/test/classes/engines/MemoryTest.php @@ -13,14 +13,14 @@ use PMA\libraries\engines\Memory; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; - +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Memory * * @package PhpMyAdmin-test */ -class MemoryTest extends PHPUnit_Framework_TestCase +class MemoryTest extends PMATestCase { /** * @access protected @@ -36,7 +36,6 @@ class MemoryTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $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 b51fdbe854..c48981bdac 100644 --- a/test/classes/engines/Mrg_MyisamTest.php +++ b/test/classes/engines/Mrg_MyisamTest.php @@ -12,13 +12,14 @@ use PMA\libraries\engines\Mrg_Myisam; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Mrg_Myisam * * @package PhpMyAdmin-test */ -class Mrg_MyisamTest extends PHPUnit_Framework_TestCase +class Mrg_MyisamTest extends PMATestCase { /** * @access protected @@ -34,7 +35,6 @@ class Mrg_MyisamTest 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/classes/engines/MyisamTest.php b/test/classes/engines/MyisamTest.php index 63f0d0ebae..5abf5d9a6e 100644 --- a/test/classes/engines/MyisamTest.php +++ b/test/classes/engines/MyisamTest.php @@ -13,13 +13,14 @@ use PMA\libraries\engines\Myisam; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Myisam * * @package PhpMyAdmin-test */ -class MyisamTest extends PHPUnit_Framework_TestCase +class MyisamTest extends PMATestCase { /** * @access protected @@ -35,7 +36,6 @@ class MyisamTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $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 8827697b68..ff1c308542 100644 --- a/test/classes/engines/NdbclusterTest.php +++ b/test/classes/engines/NdbclusterTest.php @@ -13,13 +13,14 @@ use PMA\libraries\engines\Ndbcluster; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Ndbcluster * * @package PhpMyAdmin-test */ -class NdbclusterTest extends PHPUnit_Framework_TestCase +class NdbclusterTest extends PMATestCase { /** * @access protected @@ -35,7 +36,6 @@ class NdbclusterTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $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 fc89558129..a59c76aa29 100644 --- a/test/classes/engines/PbxtTest.php +++ b/test/classes/engines/PbxtTest.php @@ -15,13 +15,14 @@ use PMA\libraries\engines\Pbxt; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/core.lib.php'; require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\engines\Pbxt; * * @package PhpMyAdmin-test */ -class PbxtTest extends PHPUnit_Framework_TestCase +class PbxtTest extends PMATestCase { /** * @access protected @@ -37,7 +38,6 @@ class PbxtTest extends PHPUnit_Framework_TestCase */ protected function setUp() { - $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['server'] = 0; $this->object = new Pbxt('pbxt'); } From f4e87fa07081fa0e8ea81734c57f479c74be89fe Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 Dec 2015 21:31:28 +1100 Subject: [PATCH 6/8] Fix failing tests Signed-off-by: Madhura Jayaratne --- test/classes/controllers/ServerDatabasesControllerTest.php | 2 +- test/classes/dbi/DBIMysqlTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php index ad23838bb5..afa3ca79ce 100644 --- a/test/classes/controllers/ServerDatabasesControllerTest.php +++ b/test/classes/controllers/ServerDatabasesControllerTest.php @@ -43,7 +43,7 @@ class ServerDatabasesControllerTest extends PMATestCase //$GLOBALS $GLOBALS['PMA_Config'] = new PMA\libraries\Config(); $GLOBALS['PMA_Config']->enableBc(); - $GLOBALS['is_superuser'] = false; + $GLOBALS['is_superuser'] = true; $GLOBALS['table'] = "table"; $GLOBALS['replication_info']['master']['status'] = false; diff --git a/test/classes/dbi/DBIMysqlTest.php b/test/classes/dbi/DBIMysqlTest.php index df97501076..6eb1966e94 100644 --- a/test/classes/dbi/DBIMysqlTest.php +++ b/test/classes/dbi/DBIMysqlTest.php @@ -173,6 +173,7 @@ class DBIMysqlTest extends PMATestCase $ret ); + $GLOBALS['cfg']['PersistentConnections'] = true; $ret = $this->object->connect( $user, $password, $is_controluser, $server, $auxiliary_connection From 041916910396a67dbffccb1e0c05c7464c33ec05 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 Dec 2015 22:55:47 +1100 Subject: [PATCH 7/8] Move navigation related tests under PMATestCase Signed-off-by: Madhura Jayaratne --- test/classes/navigation/NavigationTest.php | 3 ++- test/classes/navigation/NavigationTreeTest.php | 3 ++- .../navigation/NodeColumnContainerTest.php | 5 ++--- test/classes/navigation/NodeColumnTest.php | 5 ++--- .../navigation/NodeDatabaseChildTest.php | 3 ++- test/classes/navigation/NodeDatabaseTest.php | 7 ++----- .../navigation/NodeEventContainerTest.php | 5 ++--- test/classes/navigation/NodeEventTest.php | 5 ++--- test/classes/navigation/NodeFactoryTest.php | 5 ++--- .../navigation/NodeFunctionContainerTest.php | 5 ++--- test/classes/navigation/NodeFunctionTest.php | 5 ++--- .../navigation/NodeIndexContainerTest.php | 5 ++--- test/classes/navigation/NodeIndexTest.php | 5 ++--- .../navigation/NodeProcedureContainerTest.php | 5 ++--- test/classes/navigation/NodeProcedureTest.php | 5 ++--- .../navigation/NodeTableContainerTest.php | 5 ++--- test/classes/navigation/NodeTableTest.php | 5 ++--- test/classes/navigation/NodeTest.php | 17 ++--------------- .../navigation/NodeTriggerContainerTest.php | 5 ++--- test/classes/navigation/NodeTriggerTest.php | 5 ++--- .../navigation/NodeViewContainerTest.php | 5 ++--- test/classes/navigation/NodeViewTest.php | 5 ++--- 22 files changed, 44 insertions(+), 74 deletions(-) diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php index 529d666d50..19941d5c8a 100644 --- a/test/classes/navigation/NavigationTest.php +++ b/test/classes/navigation/NavigationTest.php @@ -12,13 +12,14 @@ require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\Navigation class * * @package PhpMyAdmin-test */ -class NavigationTest extends PHPUnit_Framework_TestCase +class NavigationTest extends PMATestCase { /** * @var PMA\libraries\navigation\Navigation diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/navigation/NavigationTreeTest.php index 45d37b6763..7bb8ba067d 100644 --- a/test/classes/navigation/NavigationTreeTest.php +++ b/test/classes/navigation/NavigationTreeTest.php @@ -21,13 +21,14 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/check_user_privileges.lib.php'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\NavigationTree class * * @package PhpMyAdmin-test */ -class NavigationTreeTest extends PHPUnit_Framework_TestCase +class NavigationTreeTest extends PMATestCase { /** * @var NavigationTree diff --git a/test/classes/navigation/NodeColumnContainerTest.php b/test/classes/navigation/NodeColumnContainerTest.php index dde0d35876..6f777605d7 100644 --- a/test/classes/navigation/NodeColumnContainerTest.php +++ b/test/classes/navigation/NodeColumnContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeColumnContainer class * * @package PhpMyAdmin-test */ -class NodeColumnContainerTest extends PHPUnit_Framework_TestCase +class NodeColumnContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeColumnTest.php b/test/classes/navigation/NodeColumnTest.php index b1315324c0..445312b783 100644 --- a/test/classes/navigation/NodeColumnTest.php +++ b/test/classes/navigation/NodeColumnTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeColumn class * * @package PhpMyAdmin-test */ -class NodeColumnTest extends PHPUnit_Framework_TestCase +class NodeColumnTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeDatabaseChildTest.php b/test/classes/navigation/NodeDatabaseChildTest.php index 35dc1c2f36..5a11911ba5 100644 --- a/test/classes/navigation/NodeDatabaseChildTest.php +++ b/test/classes/navigation/NodeDatabaseChildTest.php @@ -13,13 +13,14 @@ use PMA\libraries\Theme; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeDatabaseChild class * * @package PhpMyAdmin-test */ -class NodeDatabaseChildTest extends PHPUnit_Framework_TestCase +class NodeDatabaseChildTest extends PMATestCase { /** * @var NodeDatabaseChild diff --git a/test/classes/navigation/NodeDatabaseTest.php b/test/classes/navigation/NodeDatabaseTest.php index 561043969e..ae2c1272c5 100644 --- a/test/classes/navigation/NodeDatabaseTest.php +++ b/test/classes/navigation/NodeDatabaseTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeDatabase class * * @package PhpMyAdmin-test */ -class NodeDatabaseTest extends PHPUnit_Framework_TestCase +class NodeDatabaseTest extends PMATestCase { /** * SetUp for test cases @@ -33,8 +32,6 @@ class NodeDatabaseTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['MaxNavigationItems'] = 250; $GLOBALS['cfg']['Server'] = array(); $GLOBALS['cfg']['Server']['DisableIS'] = true; - $GLOBALS['cfg']['DBG'] = array(); - $GLOBALS['cfg']['DBG']['sql'] = false; $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme'); } diff --git a/test/classes/navigation/NodeEventContainerTest.php b/test/classes/navigation/NodeEventContainerTest.php index e5e552229b..6dabf4f312 100644 --- a/test/classes/navigation/NodeEventContainerTest.php +++ b/test/classes/navigation/NodeEventContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeEventContainer class * * @package PhpMyAdmin-test */ -class NodeEventContainerTest extends PHPUnit_Framework_TestCase +class NodeEventContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeEventTest.php b/test/classes/navigation/NodeEventTest.php index 987e4c923c..971657cad5 100644 --- a/test/classes/navigation/NodeEventTest.php +++ b/test/classes/navigation/NodeEventTest.php @@ -10,15 +10,14 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeEvent class * * @package PhpMyAdmin-test */ -class NodeEventTest extends PHPUnit_Framework_TestCase +class NodeEventTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeFactoryTest.php b/test/classes/navigation/NodeFactoryTest.php index 9cbf67c135..32ff93f096 100644 --- a/test/classes/navigation/NodeFactoryTest.php +++ b/test/classes/navigation/NodeFactoryTest.php @@ -11,16 +11,15 @@ use PMA\libraries\navigation\nodes\Node; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for NodeFactory class * * @package PhpMyAdmin-test */ -class NodeFactoryTest extends PHPUnit_Framework_TestCase +class NodeFactoryTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeFunctionContainerTest.php b/test/classes/navigation/NodeFunctionContainerTest.php index 69186efd44..ed7fa9b6ee 100644 --- a/test/classes/navigation/NodeFunctionContainerTest.php +++ b/test/classes/navigation/NodeFunctionContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeFunctionContainer class * * @package PhpMyAdmin-test */ -class NodeFunctionContainerTest extends PHPUnit_Framework_TestCase +class NodeFunctionContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeFunctionTest.php b/test/classes/navigation/NodeFunctionTest.php index c2c3f9fc94..601f890a9e 100644 --- a/test/classes/navigation/NodeFunctionTest.php +++ b/test/classes/navigation/NodeFunctionTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeFunction class * * @package PhpMyAdmin-test */ -class NodeFunctionTest extends PHPUnit_Framework_TestCase +class NodeFunctionTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeIndexContainerTest.php b/test/classes/navigation/NodeIndexContainerTest.php index 7e29e0d789..2969ed5556 100644 --- a/test/classes/navigation/NodeIndexContainerTest.php +++ b/test/classes/navigation/NodeIndexContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeIndexContainer class * * @package PhpMyAdmin-test */ -class NodeIndexContainerTest extends PHPUnit_Framework_TestCase +class NodeIndexContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeIndexTest.php b/test/classes/navigation/NodeIndexTest.php index f93953045a..c330217ecb 100644 --- a/test/classes/navigation/NodeIndexTest.php +++ b/test/classes/navigation/NodeIndexTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeIndex class * * @package PhpMyAdmin-test */ -class NodeIndexTest extends PHPUnit_Framework_TestCase +class NodeIndexTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeProcedureContainerTest.php b/test/classes/navigation/NodeProcedureContainerTest.php index 0b47158686..1901300f57 100644 --- a/test/classes/navigation/NodeProcedureContainerTest.php +++ b/test/classes/navigation/NodeProcedureContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeProcedureContainer class * * @package PhpMyAdmin-test */ -class NodeProcedureContainerTest extends PHPUnit_Framework_TestCase +class NodeProcedureContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeProcedureTest.php b/test/classes/navigation/NodeProcedureTest.php index b6ccaf2319..d95282cc97 100644 --- a/test/classes/navigation/NodeProcedureTest.php +++ b/test/classes/navigation/NodeProcedureTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeProcedure class * * @package PhpMyAdmin-test */ -class NodeProcedureTest extends PHPUnit_Framework_TestCase +class NodeProcedureTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeTableContainerTest.php b/test/classes/navigation/NodeTableContainerTest.php index 270acc31e2..064cf5eeae 100644 --- a/test/classes/navigation/NodeTableContainerTest.php +++ b/test/classes/navigation/NodeTableContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeTableContainer class * * @package PhpMyAdmin-test */ -class NodeTableContainerTest extends PHPUnit_Framework_TestCase +class NodeTableContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeTableTest.php b/test/classes/navigation/NodeTableTest.php index a606916065..9f513fbff5 100644 --- a/test/classes/navigation/NodeTableTest.php +++ b/test/classes/navigation/NodeTableTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeTable class * * @package PhpMyAdmin-test */ -class NodeTableTest extends PHPUnit_Framework_TestCase +class NodeTableTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeTest.php b/test/classes/navigation/NodeTest.php index e179355168..7200bf3500 100644 --- a/test/classes/navigation/NodeTest.php +++ b/test/classes/navigation/NodeTest.php @@ -11,16 +11,15 @@ use PMA\libraries\navigation\nodes\Node; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/database_interface.inc.php'; +require_once 'test/PMATestCase.php'; /** * Tests for Node class * * @package PhpMyAdmin-test */ -class NodeTest extends PHPUnit_Framework_TestCase +class NodeTest extends PMATestCase { /** * SetUp for test cases @@ -300,9 +299,6 @@ class NodeTest extends PHPUnit_Framework_TestCase $method->invoke($node, 'SCHEMA_NAME', 'schemaName') ); - if (! isset($GLOBALS['cfg'])) { - $GLOBALS['cfg'] = array(); - } if (! isset($GLOBALS['cfg']['Server'])) { $GLOBALS['cfg']['Server'] = array(); } @@ -344,9 +340,6 @@ class NodeTest extends PHPUnit_Framework_TestCase { $pos = 10; $limit = 20; - if (! isset($GLOBALS['cfg'])) { - $GLOBALS['cfg'] = array(); - } $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true; $GLOBALS['cfg']['FirstLevelNavigationItems'] = $limit; @@ -395,9 +388,6 @@ class NodeTest extends PHPUnit_Framework_TestCase { $pos = 10; $limit = 20; - if (! isset($GLOBALS['cfg'])) { - $GLOBALS['cfg'] = array(); - } $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = false; $GLOBALS['cfg']['FirstLevelNavigationItems'] = $limit; @@ -433,9 +423,6 @@ class NodeTest extends PHPUnit_Framework_TestCase { $pos = 0; $limit = 10; - if (! isset($GLOBALS['cfg'])) { - $GLOBALS['cfg'] = array(); - } $GLOBALS['cfg']['Server']['DisableIS'] = true; $GLOBALS['dbs_to_test'] = false; $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true; diff --git a/test/classes/navigation/NodeTriggerContainerTest.php b/test/classes/navigation/NodeTriggerContainerTest.php index e66b2d73d1..2708d38eb0 100644 --- a/test/classes/navigation/NodeTriggerContainerTest.php +++ b/test/classes/navigation/NodeTriggerContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeTrigger class * * @package PhpMyAdmin-test */ -class NodeTriggerContainerTest extends PHPUnit_Framework_TestCase +class NodeTriggerContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeTriggerTest.php b/test/classes/navigation/NodeTriggerTest.php index ab0a454572..c2f20d0bec 100644 --- a/test/classes/navigation/NodeTriggerTest.php +++ b/test/classes/navigation/NodeTriggerTest.php @@ -10,15 +10,14 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeTrigger class * * @package PhpMyAdmin-test */ -class NodeTriggerTest extends PHPUnit_Framework_TestCase +class NodeTriggerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeViewContainerTest.php b/test/classes/navigation/NodeViewContainerTest.php index 560a67736e..eddeea7351 100644 --- a/test/classes/navigation/NodeViewContainerTest.php +++ b/test/classes/navigation/NodeViewContainerTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeViewContainer class * * @package PhpMyAdmin-test */ -class NodeViewContainerTest extends PHPUnit_Framework_TestCase +class NodeViewContainerTest extends PMATestCase { /** * SetUp for test cases diff --git a/test/classes/navigation/NodeViewTest.php b/test/classes/navigation/NodeViewTest.php index f01edcb4bc..f80121b592 100644 --- a/test/classes/navigation/NodeViewTest.php +++ b/test/classes/navigation/NodeViewTest.php @@ -10,16 +10,15 @@ use PMA\libraries\navigation\NodeFactory; use PMA\libraries\Theme; require_once 'libraries/navigation/NodeFactory.php'; - - require_once 'libraries/php-gettext/gettext.inc'; +require_once 'test/PMATestCase.php'; /** * Tests for PMA\libraries\navigation\nodes\NodeView class * * @package PhpMyAdmin-test */ -class NodeViewTest extends PHPUnit_Framework_TestCase +class NodeViewTest extends PMATestCase { /** * SetUp for test cases From cd3d66c60e94f804e25295c2f833d85ddf6c1f1d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 Dec 2015 23:03:34 +1100 Subject: [PATCH 8/8] Revert "Temporarily remove locale and lint to make travis run fast" This reverts commit 102f89c511697265703c1fce9c7e9ee9682da8de. Signed-off-by: Madhura Jayaratne --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 74231b551d..6ef831af71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,8 @@ before_script: script: - ant clean + - ant locales + - if [ -z "$SELENIUM" ] ; then ant lint ; fi - set -e; if [ $TRAVIS_PHP_VERSION == "hhvm" ] ; then ant phpunit-hhvm ;