gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13695 from mauriciofauth/tests

Browse Source 
Add namespace to test classes
This commit is contained in:
Maurício Meneghini Fauth 2017-09-20 16:47:38 -03:00 committed by GitHub
commit fcead90b47
182 changed files with 717 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -29,7 +29,8 @@
"autoload-dev": {
"psr-4": {
"PhpMyAdmin\\Tests\\": "test/classes"
}
},
"classmap": ["test/PMATestCase.php"]
},
"repositories": [
{

10
test/classes/AdvisorTest.php
View File

@ -5,13 +5,10 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Advisor;
use PhpMyAdmin\Config;
use PhpMyAdmin\Theme;
/**
@ -19,7 +16,7 @@ use PhpMyAdmin\Theme;
*
* @package PhpMyAdmin-test
*/
class AdvisorTest extends PMATestCase
class AdvisorTest extends \PMATestCase
{
/**
@ -30,6 +27,7 @@ class AdvisorTest extends PMATestCase
*/
public function setup()
{
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['server'] = 1;
}

6
test/classes/BookmarkTest.php
View File

@ -5,15 +5,17 @@
*
* @package PhpMyAdmin-test
*/
use PhpMyAdmin\Bookmark;
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Bookmark;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Tests for Bookmark class
*
* @package PhpMyAdmin-test
*/
class BookmarkTest extends PHPUnit_Framework_TestCase
class BookmarkTest extends TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.

3
test/classes/BrowseForeignersTest.php
View File

@ -8,13 +8,14 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\BrowseForeigners;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Tests for PhpMyAdmin\BrowseForeigners
*
* @package PhpMyAdmin-test
*/
class BrowseForeignersTest extends \PHPUnit_Framework_TestCase
class BrowseForeignersTest extends TestCase
{
/**
* Setup for test cases

6
test/classes/CentralColumnsTest.php
View File

@ -8,20 +8,21 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\CentralColumns;
use PhpMyAdmin\Config;
use PhpMyAdmin\Theme;
use PhpMyAdmin\TypesMySQL;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
$GLOBALS['server'] = 1;
/**
* tests for PhpMyAdmin\CentralColumns
*
* @package PhpMyAdmin-test
*/
class CentralColumnsTest extends \PHPUnit_Framework_TestCase
class CentralColumnsTest extends TestCase
{
private $_columnData = array(
array(
@ -67,6 +68,7 @@ class CentralColumnsTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Types'] = new TypesMySQL();
$GLOBALS['cfg']['Server']['user'] = 'pma_user';
$GLOBALS['cfg']['Server']['DisableIS'] = true;

4
test/classes/CharsetsTest.php
View File

@ -5,15 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Charsets;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Tests for MySQL Charsets
*
* @package PhpMyAdmin-test
*/
class CharsetsTest extends PHPUnit_Framework_TestCase
class CharsetsTest extends TestCase
{
public function setUp()
{

3
test/classes/CheckUserPrivilegesTest.php
View File

@ -8,6 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\CheckUserPrivileges;
use PHPUnit_Framework_TestCase as TestCase;
/*
* Include to test.
@ -20,7 +21,7 @@ $GLOBALS['cfg']['Server']['DisableIS'] = false;
*
* @package PhpMyAdmin-test
*/
class CheckUserPrivilegesTest extends \PHPUnit_Framework_TestCase
class CheckUserPrivilegesTest extends TestCase
{
/**
* prepares environment for tests

9
test/classes/config/ConfigFileTest.php → test/classes/Config/ConfigFileTest.php
View File

@ -5,20 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Config;
/*
* Include to test.
*/
use PhpMyAdmin\Config\ConfigFile;
require_once 'test/PMATestCase.php';
use stdClass;
/**
* Tests for Config File Management
*
* @package PhpMyAdmin-test
*/
class ConfigFileTest extends PMATestCase
class ConfigFileTest extends \PMATestCase
{
/**
* Any valid key that exists in config.default.php and isn't empty

16
test/classes/config/DescriptionTest.php → test/classes/Config/DescriptionTest.php
View File

@ -5,18 +5,28 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\Descriptions;
require_once 'test/PMATestCase.php';
/**
* Tests for PMA_FormDisplay class
*
* @package PhpMyAdmin-test
*/
class DescriptionTest extends PMATestCase
class DescriptionTest extends \PMATestCase
{
/**
* Setup tests
*
* @return void
*/
public function setUp()
{
$GLOBALS['PMA_Config'] = new Config();
}
/**
* @dataProvider getValues
*/

12
test/classes/config/FormDisplayTemplateTest.php → test/classes/Config/FormDisplayTemplateTest.php
View File

@ -5,7 +5,9 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\FormDisplayTemplate;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
@ -17,6 +19,16 @@ use PHPUnit_Framework_TestCase as TestCase;
*/
class FormDisplayTemplateTest extends TestCase
{
/**
* Setup tests
*
* @return void
*/
public function setUp()
{
$GLOBALS['PMA_Config'] = new Config();
}
/**
* Test for FormDisplayTemplate::displayFormTop()
*

29
test/classes/config/FormDisplayTest.php → test/classes/Config/FormDisplayTest.php
View File

@ -5,19 +5,21 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\FormDisplay;
require_once 'test/PMATestCase.php';
use ReflectionClass;
use ReflectionMethod;
use ReflectionProperty;
/**
* Tests for PMA_FormDisplay class
*
* @package PhpMyAdmin-test
*/
class FormDisplayTest extends PMATestCase
class FormDisplayTest extends \PMATestCase
{
/**
* @var FormDisplay
@ -33,7 +35,6 @@ class FormDisplayTest extends PMATestCase
{
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;
$this->object = new FormDisplay(new ConfigFile());
}
@ -70,7 +71,7 @@ class FormDisplayTest extends PMATestCase
*/
public function testRegisterForm()
{
$reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
$reflection = new ReflectionClass('PhpMyAdmin\Config\FormDisplay');
$attrForms = $reflection->getProperty('_forms');
$attrForms->setAccessible(true);
@ -125,7 +126,7 @@ class FormDisplayTest extends PMATestCase
->setMethods(array('save'))
->getMock();
$attrForms = new \ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_forms');
$attrForms = new ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_forms');
$attrForms->setAccessible(true);
$attrForms->setValue($this->object, array(1, 2, 3));
@ -152,7 +153,7 @@ class FormDisplayTest extends PMATestCase
*/
public function testDisplayErrors()
{
$reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
$reflection = new ReflectionClass('PhpMyAdmin\Config\FormDisplay');
$attrIsValidated = $reflection->getProperty('_isValidated');
$attrIsValidated->setAccessible(true);
@ -198,7 +199,7 @@ class FormDisplayTest extends PMATestCase
*/
public function testFixErrors()
{
$reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
$reflection = new ReflectionClass('PhpMyAdmin\Config\FormDisplay');
$attrIsValidated = $reflection->getProperty('_isValidated');
$attrIsValidated->setAccessible(true);
@ -249,7 +250,7 @@ class FormDisplayTest extends PMATestCase
*/
public function testValidateSelect()
{
$attrValidateSelect = new \ReflectionMethod(
$attrValidateSelect = new ReflectionMethod(
'PhpMyAdmin\Config\FormDisplay',
'_validateSelect'
);
@ -303,7 +304,7 @@ class FormDisplayTest extends PMATestCase
*/
public function testHasErrors()
{
$attrErrors = new \ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_errors');
$attrErrors = new ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_errors');
$attrErrors->setAccessible(true);
$this->assertFalse(
@ -351,7 +352,7 @@ class FormDisplayTest extends PMATestCase
*/
public function testGetOptName()
{
$method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_getOptName');
$method = new ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_getOptName');
$method->setAccessible(true);
$this->assertEquals(
@ -372,10 +373,10 @@ class FormDisplayTest extends PMATestCase
*/
public function testLoadUserprefsInfo()
{
$method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_loadUserprefsInfo');
$method = new ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_loadUserprefsInfo');
$method->setAccessible(true);
$attrUserprefs = new \ReflectionProperty(
$attrUserprefs = new ReflectionProperty(
'PhpMyAdmin\Config\FormDisplay',
'_userprefsDisallow'
);
@ -395,7 +396,7 @@ class FormDisplayTest extends PMATestCase
*/
public function testSetComments()
{
$method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_setComments');
$method = new ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_setComments');
$method->setAccessible(true);
// recoding

16
test/classes/config/FormTest.php → test/classes/Config/FormTest.php
View File

@ -5,20 +5,21 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Form;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionClass;
use ReflectionProperty;
/**
* Tests for PMA_Form class
*
* @package PhpMyAdmin-test
*/
class FormTest extends PMATestCase
class FormTest extends \PMATestCase
{
/**
* @var Form
@ -34,7 +35,6 @@ class FormTest extends PMATestCase
{
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;
$this->object = new Form(
'pma_form_name', array('pma_form1','pma_form2'), new ConfigFile(), 1
@ -80,7 +80,7 @@ class FormTest extends PMATestCase
*/
public function testGetOptionType()
{
$attrFieldsTypes = new \ReflectionProperty('PhpMyAdmin\Config\Form', '_fieldsTypes');
$attrFieldsTypes = new ReflectionProperty('PhpMyAdmin\Config\Form', '_fieldsTypes');
$attrFieldsTypes->setAccessible(true);
$attrFieldsTypes->setValue(
$this->object,
@ -136,7 +136,7 @@ class FormTest extends PMATestCase
*/
public function testReadFormPathsCallBack()
{
$reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
$reflection = new ReflectionClass('PhpMyAdmin\Config\Form');
$method = $reflection->getMethod('_readFormPathsCallback');
$method->setAccessible(true);
@ -188,7 +188,7 @@ class FormTest extends PMATestCase
*/
public function testReadFormPaths()
{
$reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
$reflection = new ReflectionClass('PhpMyAdmin\Config\Form');
$method = $reflection->getMethod('readFormPaths');
$method->setAccessible(true);
@ -243,7 +243,7 @@ class FormTest extends PMATestCase
*/
public function testReadTypes()
{
$reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
$reflection = new ReflectionClass('PhpMyAdmin\Config\Form');
$method = $reflection->getMethod('readTypes');
$method->setAccessible(true);

7
test/classes/config/FormListTest.php → test/classes/Config/Forms/FormListTest.php
View File

@ -5,23 +5,24 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Config\Forms;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\UserFormList;
use PhpMyAdmin\Config\Forms\Page\PageFormList;
use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
require_once 'test/PMATestCase.php';
/**
* Tests for PMA_FormDisplay class
*
* @package PhpMyAdmin-test
*/
class FormListTest extends PMATestCase
class FormListTest extends \PMATestCase
{
public function setUp()
{
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['server'] = 1;
}

8
test/classes/config/PageSettingsTest.php → test/classes/Config/PageSettingsTest.php
View File

@ -5,16 +5,17 @@
*
* @package PhpMyAdmin-test
*/
use PhpMyAdmin\Config\PageSettings;
namespace PhpMyAdmin\Tests\Config;
require_once 'test/PMATestCase.php';
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
/**
* Tests for PhpMyAdmin\Config\PageSettings
*
* @package PhpMyAdmin-test
*/
class PageSettingsTest extends PMATestCase
class PageSettingsTest extends \PMATestCase
{
/**
* Setup tests
@ -23,6 +24,7 @@ class PageSettingsTest extends PMATestCase
*/
public function setUp()
{
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['server'] = 1;
$GLOBALS['db'] = 'db';
}

10
test/classes/config/ServerConfigChecksTest.php → test/classes/Config/ServerConfigChecksTest.php
View File

@ -5,23 +5,25 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\ServerConfigChecks;
require_once 'test/PMATestCase.php';
use ReflectionProperty;
/**
* Tests for ServeConfigChecks class
*
* @package PhpMyAdmin-test
*/
class ServeConfigChecksTest extends PMATestCase
class ServeConfigChecksTest extends \PMATestCase
{
private $sessionID;
public function setUp()
{
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['cfg']['AvailableCharsets'] = array();
$GLOBALS['cfg']['ServerDefault'] = 0;
$GLOBALS['server'] = 0;
@ -29,7 +31,7 @@ class ServeConfigChecksTest extends PMATestCase
$cf = new ConfigFile();
$GLOBALS['ConfigFile'] = $cf;
$reflection = new \ReflectionProperty('PhpMyAdmin\Config\ConfigFile', '_id');
$reflection = new ReflectionProperty('PhpMyAdmin\Config\ConfigFile', '_id');
$reflection->setAccessible(true);
$this->sessionID = $reflection->getValue($cf);

41
test/classes/ConfigTest.php
View File

@ -6,20 +6,18 @@
* @package PhpMyAdmin-test
* @group current
*/
namespace PhpMyAdmin\Tests;
/*
* Include to test.
*/
use PhpMyAdmin\Config;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use PHPUnit_Framework_Assert as Assert;
/**
* Tests behaviour of PhpMyAdmin\Config class
*
* @package PhpMyAdmin-test
*/
class ConfigTest extends PMATestCase
class ConfigTest extends \PMATestCase
{
/**
* Turn off backup globals
@ -44,14 +42,14 @@ class ConfigTest extends PMATestCase
*/
protected function setUp()
{
$this->object = new PhpMyAdmin\Config;
$this->object = new Config;
$GLOBALS['server'] = 0;
$_SESSION['is_git_revision'] = true;
$GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(CONFIG_FILE);
$GLOBALS['PMA_Config'] = new Config(CONFIG_FILE);
$GLOBALS['cfg']['ProxyUrl'] = '';
//for testing file permissions
$this->permTestObj = new PhpMyAdmin\Config("./config.sample.inc.php");
$this->permTestObj = new Config("./config.sample.inc.php");
}
/**
@ -90,12 +88,12 @@ class ConfigTest extends PMATestCase
{
$this->assertContains(
'<form name="form_fontsize_selection" id="form_fontsize_selection"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
$this->assertContains(
'<label for="select_fontsize">',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
//test getFontsizeOptions for "em" unit
@ -104,44 +102,44 @@ class ConfigTest extends PMATestCase
$_COOKIE['pma_fontsize'] = "10em";
$this->assertContains(
'<option value="7em"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
$this->assertContains(
'<option value="8em"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
//test getFontsizeOptions for "pt" unit
$_COOKIE['pma_fontsize'] = "10pt";
$this->assertContains(
'<option value="2pt"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
$this->assertContains(
'<option value="4pt"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
//test getFontsizeOptions for "px" unit
$_COOKIE['pma_fontsize'] = "10px";
$this->assertContains(
'<option value="5px"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
$this->assertContains(
'<option value="6px"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
//test getFontsizeOptions for unknown unit
$_COOKIE['pma_fontsize'] = "10abc";
$this->assertContains(
'<option value="7abc"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
$this->assertContains(
'<option value="8abc"',
PhpMyAdmin\Config::getFontsizeForm()
Config::getFontsizeForm()
);
unset($_COOKIE['pma_fontsize']);
//rollback the fontsize setting
@ -830,10 +828,9 @@ class ConfigTest extends PMATestCase
*/
public function testGetThemeUniqueValue()
{
$partial_sum = (
PHPUnit_Framework_Assert::readAttribute($this->object, 'source_mtime') +
PHPUnit_Framework_Assert::readAttribute(
Assert::readAttribute($this->object, 'source_mtime') +
Assert::readAttribute(
$this->object,
'default_source_mtime'
) +

13
test/classes/controllers/DatabaseStructureControllerTest.php → test/classes/Controllers/Database/DatabaseStructureControllerTest.php
View File

@ -1,32 +1,29 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* DatabaseStructureController_Test class
* DatabaseStructureControllerTest class
*
* this class is for testing DatabaseStructureController class
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Database;
/*
* Include to test.
*/
use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Table;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionClass;
/**
* DatabaseStructureController_Test class
* DatabaseStructureControllerTest class
*
* this class is for testing DatabaseStructureController class
*
* @package PhpMyAdmin-test
*/
class DatabaseStructureControllerTest extends PMATestCase
class DatabaseStructureControllerTest extends \PMATestCase
{
/**
* @var \PhpMyAdmin\Tests\Stubs\Response

6
test/classes/controllers/ServerBinlogControllerTest.php → test/classes/Controllers/Server/ServerBinlogControllerTest.php
View File

@ -5,20 +5,20 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Server;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Controllers\Server\ServerBinlogController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Util;
require_once 'test/PMATestCase.php';
use ReflectionClass;
/**
* Tests for ServerCollationsController class
*
* @package PhpMyAdmin-test
*/
class ServerBinlogControllerTest extends PMATestCase
class ServerBinlogControllerTest extends \PMATestCase
{
/**
* Prepares environment for the test.

8
test/classes/controllers/ServerCollationsControllerTest.php → test/classes/Controllers/Server/ServerCollationsControllerTest.php
View File

@ -5,10 +5,12 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Server;
use PhpMyAdmin\Controllers\Server\ServerCollationsController;
use PhpMyAdmin\Core;
use PhpMyAdmin\Theme;
use ReflectionClass;
/*
* Include to test.
@ -24,19 +26,15 @@ $GLOBALS['text_dir'] = "text_dir";
$GLOBALS['cfg']['Server'] = array(
'DisableIS' => false
);
//$_SESSION
require_once 'libraries/server_common.inc.php';
require_once 'test/PMATestCase.php';
/**
* Tests for ServerCollationsController class
*
* @package PhpMyAdmin-test
*/
class ServerCollationsControllerTest extends PMATestCase
class ServerCollationsControllerTest extends \PMATestCase
{
/**
* Prepares environment for the test.

9
test/classes/controllers/ServerDatabasesControllerTest.php → test/classes/Controllers/Server/ServerDatabasesControllerTest.php
View File

@ -5,13 +5,14 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Server;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionClass;
/**
* Tests for ServerDatabasesController class
@ -19,7 +20,7 @@ require_once 'test/PMATestCase.php';
* @package PhpMyAdmin-test
*/
class ServerDatabasesControllerTest extends PMATestCase
class ServerDatabasesControllerTest extends \PMATestCase
{
/**
* Prepares environment for the test.
@ -33,7 +34,7 @@ class ServerDatabasesControllerTest extends PMATestCase
$_REQUEST['pos'] = 3;
//$GLOBALS
$GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['is_superuser'] = true;

12
test/classes/controllers/ServerEnginesControllerTest.php → test/classes/Controllers/Server/ServerEnginesControllerTest.php
View File

@ -5,21 +5,21 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Server;
use PhpMyAdmin\Controllers\Server\ServerEnginesController;
use PhpMyAdmin\StorageEngine;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Controllers\Server\ServerEnginesController;
use PhpMyAdmin\Url;
require_once 'test/PMATestCase.php';
use PhpMyAdmin\Util;
use ReflectionClass;
/**
* Tests for ServerEnginesController class
*
* @package PhpMyAdmin-test
*/
class ServerEnginesControllerTest extends PMATestCase
class ServerEnginesControllerTest extends \PMATestCase
{
/**
* Prepares environment for the test.
@ -123,7 +123,7 @@ class ServerEnginesControllerTest extends PMATestCase
//validate 2: Engine Mysql Help Page
$this->assertContains(
PhpMyAdmin\Util::showMySQLDocu($engine_plugin->getMysqlHelpPage()),
Util::showMySQLDocu($engine_plugin->getMysqlHelpPage()),
$html
);

11
test/classes/controllers/ServerPluginsControllerTest.php → test/classes/Controllers/Server/ServerPluginsControllerTest.php
View File

@ -5,22 +5,19 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Server;
/*
* Include to test.
*/
use PhpMyAdmin\Theme;
use PhpMyAdmin\Controllers\Server\ServerPluginsController;
use PhpMyAdmin\Di\Container;
require_once 'test/PMATestCase.php';
use PhpMyAdmin\Theme;
use ReflectionClass;
/**
* Tests for ServerPluginsController class
*
* @package PhpMyAdmin-test
*/
class ServerPluginsControllerTest extends PMATestCase
class ServerPluginsControllerTest extends \PMATestCase
{
/**
* Prepares environment for the test.

11
test/classes/controllers/ServerVariablesControllerTest.php → test/classes/Controllers/Server/ServerVariablesControllerTest.php
View File

@ -5,21 +5,22 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Server;
use PhpMyAdmin\Core;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
require_once 'test/PMATestCase.php';
use PhpMyAdmin\Util;
use ReflectionClass;
/**
* Tests for ServerVariablesController class
*
* @package PhpMyAdmin-test
*/
class ServerVariablesControllerTest extends PMATestCase
class ServerVariablesControllerTest extends \PMATestCase
{
/**
* @var \PhpMyAdmin\Tests\Stubs\Response
@ -184,11 +185,11 @@ class ServerVariablesControllerTest extends PMATestCase
);
//validate 2: images
$this->assertContains(
PhpMyAdmin\Util::getIcon('b_save.png', __('Save')),
Util::getIcon('b_save.png', __('Save')),
$html
);
$this->assertContains(
PhpMyAdmin\Util::getIcon('b_close.png', __('Cancel')),
Util::getIcon('b_close.png', __('Cancel')),
$html
);
}

19
test/classes/controllers/TableIndexesControllerTest.php → test/classes/Controllers/Table/TableIndexesControllerTest.php
View File

@ -5,25 +5,24 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Table;
use PhpMyAdmin\Controllers\Table\TableIndexesController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Index;
use PhpMyAdmin\Message;
use PhpMyAdmin\Response;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
use PhpMyAdmin\Util;
/**
* Tests for libraries/controllers/TableIndexesController.php
*
* @package PhpMyAdmin-test
*/
class TableIndexesControllerTest extends PMATestCase
class TableIndexesControllerTest extends \PMATestCase
{
/**
* Setup function for test cases
@ -152,7 +151,7 @@ class TableIndexesControllerTest extends PMATestCase
$response = new ResponseStub();
$container->set('PhpMyAdmin\Response', $response);
$container->alias('response', 'PhpMyAdmin\Response');
$index = new PhpMyAdmin\Index();
$index = new Index();
$ctrl = new TableIndexesController($index);
@ -173,8 +172,8 @@ class TableIndexesControllerTest extends PMATestCase
$html
);
$doc_html = PhpMyAdmin\Util::showHint(
PhpMyAdmin\Message::notice(
$doc_html = Util::showHint(
Message::notice(
__(
'"PRIMARY" <b>must</b> be the name of'
. ' and <b>only of</b> a primary key!'
@ -187,7 +186,7 @@ class TableIndexesControllerTest extends PMATestCase
);
$this->assertContains(
PhpMyAdmin\Util::showMySQLDocu('ALTER_TABLE'),
Util::showMySQLDocu('ALTER_TABLE'),
$html
);

8
test/classes/controllers/TableRelationControllerTest.php → test/classes/Controllers/Table/TableRelationControllerTest.php
View File

@ -5,22 +5,18 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Table;
/*
* Include to test.
*/
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for libraries/controllers/TableRelationController.php
*
* @package PhpMyAdmin-test
*/
class TableRelationControllerTest extends PMATestCase
class TableRelationControllerTest extends \PMATestCase
{
/**
* @var \PhpMyAdmin\Tests\Stubs\Response

10
test/classes/controllers/TableSearchControllerTest.php → test/classes/Controllers/Table/TableSearchControllerTest.php
View File

@ -5,25 +5,23 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Table;
/*
* Include to test.
*/
use PhpMyAdmin\Controllers\Table\TableSearchController;
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
use PhpMyAdmin\TypesMySQL;
require_once 'test/PMATestCase.php';
use ReflectionClass;
use stdClass;
/**
* Tests for PMA_TableSearch
*
* @package PhpMyAdmin-test
*/
class TableSearchControllerTest extends PMATestCase
class TableSearchControllerTest extends \PMATestCase
{
/**
* @var PhpMyAdmin\Tests\Stubs\Response

9
test/classes/controllers/TableStructureControllerTest.php → test/classes/Controllers/Table/TableStructureControllerTest.php
View File

@ -7,15 +7,12 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Controllers\Table;
/*
* Include to test.
*/
use PhpMyAdmin\Di\Container;
use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionClass;
/**
* TableStructureController_Test class
@ -24,7 +21,7 @@ require_once 'test/PMATestCase.php';
*
* @package PhpMyAdmin-test
*/
class TableStructureControllerTest extends PMATestCase
class TableStructureControllerTest extends \PMATestCase
{
/**
* @var \PhpMyAdmin\Tests\Stubs\Response

9
test/classes/CoreTest.php
View File

@ -5,22 +5,19 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Config;
use PhpMyAdmin\Core;
use PhpMyAdmin\Sanitize;
use stdClass;
/**
* Tests for PhpMyAdmin\Core class
*
* @package PhpMyAdmin-test
*/
class CoreTest extends PMATestCase
class CoreTest extends \PMATestCase
{
protected $goto_whitelist = array(
'db_datadict.php',

3
test/classes/Database/DesignerTest.php
View File

@ -8,13 +8,14 @@ namespace PhpMyAdmin\Tests\Database;
use PhpMyAdmin\Database\Designer;
use PhpMyAdmin\DatabaseInterface;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Tests for PhpMyAdmin\Database\Designer
*
* @package PhpMyAdmin-test
*/
class DesignerTest extends \PHPUnit_Framework_TestCase
class DesignerTest extends TestCase
{
/**

13
test/classes/DatabaseInterfaceTest.php
View File

@ -5,20 +5,19 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Dbi\DbiDummy;
use PhpMyAdmin\Util;
require_once 'test/PMATestCase.php';
/**
* Tests basic functionality of dummy dbi driver
*
* @package PhpMyAdmin-test
*/
class DatabaseInterfaceTest extends PMATestCase
class DatabaseInterfaceTest extends \PMATestCase
{
private $_dbi;
/**
@ -28,7 +27,7 @@ class DatabaseInterfaceTest extends PMATestCase
*/
function setup()
{
$extension = new PhpMyAdmin\Dbi\DbiDummy();
$extension = new DbiDummy();
$this->_dbi = new DatabaseInterface($extension);
}
@ -43,7 +42,7 @@ class DatabaseInterfaceTest extends PMATestCase
{
Util::cacheUnset('mysql_cur_user');
$extension = new PhpMyAdmin\Dbi\DbiDummy();
$extension = new DbiDummy();
$extension->setResult('SELECT CURRENT_USER();', $value);
$dbi = new DatabaseInterface($extension);
@ -387,7 +386,7 @@ class DatabaseInterfaceTest extends PMATestCase
{
Util::cacheUnset('is_amazon_rds');
$extension = new PhpMyAdmin\Dbi\DbiDummy();
$extension = new DbiDummy();
$extension->setResult('SELECT @@basedir', $value);
$dbi = new DatabaseInterface($extension);

10
test/classes/DbQbeTest.php
View File

@ -4,21 +4,17 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\DbQbe;
use ReflectionClass;
/**
* Tests for PhpMyAdmin\DbQbe class
*
* @package PhpMyAdmin-test
*/
class DbQbeTest extends PMATestCase
class DbQbeTest extends \PMATestCase
{
/**
* @access protected

10
test/classes/DbSearchTest.php
View File

@ -4,22 +4,18 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\DbSearch;
use PhpMyAdmin\Theme;
use ReflectionClass;
/**
* Tests for database search.
*
* @package PhpMyAdmin-test
*/
class DbSearchTest extends PMATestCase
class DbSearchTest extends \PMATestCase
{
/**
* @access protected

10
test/classes/dbi/DbiMysqlTest.php → test/classes/Dbi/DbiMysqlTest.php
View File

@ -4,22 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Dbi;
use PhpMyAdmin\Dbi\DbiMysql;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Dbi\DbiMysql class
*
* @package PhpMyAdmin-test
*/
class DbiMysqlTest extends PMATestCase
class DbiMysqlTest extends \PMATestCase
{
/**
* @access protected

8
test/classes/dbi/DbiMysqliTest.php → test/classes/Dbi/DbiMysqliTest.php
View File

@ -4,21 +4,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Dbi;
/*
* Include to test.
*/
use PhpMyAdmin\Dbi\DbiMysqli;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Dbi\DbiMysqli class
*
* @package PhpMyAdmin-test
*/
class DbiMysqliTest extends PMATestCase
class DbiMysqliTest extends \PMATestCase
{
/**
* @access protected

8
test/classes/di/ContainerExceptionTest.php → test/classes/Di/ContainerExceptionTest.php
View File

@ -5,11 +5,7 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
namespace PhpMyAdmin\Tests\Di;
use PhpMyAdmin\Di\ContainerException;
@ -18,7 +14,7 @@ use PhpMyAdmin\Di\ContainerException;
*
* @package PhpMyAdmin-test
*/
class ContainerExceptionTest extends PMATestCase
class ContainerExceptionTest extends \PMATestCase
{
/**
* @access protected

8
test/classes/di/ContainerTest.php → test/classes/Di/ContainerTest.php
View File

@ -5,11 +5,7 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
namespace PhpMyAdmin\Tests\Di;
use PhpMyAdmin\Di\Container;
@ -18,7 +14,7 @@ use PhpMyAdmin\Di\Container;
*
* @package PhpMyAdmin-test
*/
class ContainerTest extends PMATestCase
class ContainerTest extends \PMATestCase
{
/**
* @access protected

8
test/classes/di/NotFoundExceptionTest.php → test/classes/Di/NotFoundExceptionTest.php
View File

@ -5,11 +5,7 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
namespace PhpMyAdmin\Tests\Di;
use PhpMyAdmin\Di\NotFoundException;
@ -18,7 +14,7 @@ use PhpMyAdmin\Di\NotFoundException;
*
* @package PhpMyAdmin-test
*/
class NotFoundExceptionTest extends PMATestCase
class NotFoundExceptionTest extends \PMATestCase
{
/**
* @access protected

3
test/classes/Display/ChangePasswordTest.php
View File

@ -11,6 +11,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Display\ChangePassword;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
require_once 'libraries/config.default.php';
@ -21,7 +22,7 @@ require_once 'libraries/config.default.php';
*
* @package PhpMyAdmin-test
*/
class ChangePasswordTest extends \PHPUnit_Framework_TestCase
class ChangePasswordTest extends TestCase
{
/**
* Test for setUp

3
test/classes/Display/CreateTableTest.php
View File

@ -11,6 +11,7 @@ use PhpMyAdmin\Display\CreateTable;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
/**
* PhpMyAdmin\Tests\Display\CreateTableTest class
@ -19,7 +20,7 @@ use PhpMyAdmin\Util;
*
* @package PhpMyAdmin-test
*/
class CreateTableTest extends \PHPUnit_Framework_TestCase
class CreateTableTest extends TestCase
{
/**
* Test for setUp

3
test/classes/Display/ExportTest.php
View File

@ -13,6 +13,7 @@ use PhpMyAdmin\Plugins;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
/**
* class PhpMyAdmin\Tests\Display\ExportTest
@ -22,7 +23,7 @@ use PhpMyAdmin\Util;
* @package PhpMyAdmin-test
* @group large
*/
class ExportTest extends \PHPUnit_Framework_TestCase
class ExportTest extends TestCase
{
/**
* Test for setUp

5
test/classes/Display/ResultsTest.php
View File

@ -16,11 +16,6 @@ use PhpMyAdmin\Transformations;
use ReflectionClass;
use stdClass;
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
/**
* Test cases for displaying results.
*

4
test/classes/EncodingTest.php
View File

@ -5,15 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Encoding;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Tests for Charset Conversions
*
* @package PhpMyAdmin-test
*/
class EncodingTest extends PHPUnit_Framework_TestCase
class EncodingTest extends TestCase
{
public function setUp()
{

9
test/classes/engines/BdbTest.php → test/classes/Engines/BdbTest.php
View File

@ -4,21 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Engines\Bdb;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\Bdb
*
* @package PhpMyAdmin-test
*/
class BdbTest extends PMATestCase
class BdbTest extends \PMATestCase
{
/**
* @access protected

9
test/classes/engines/BinlogTest.php → test/classes/Engines/BinlogTest.php
View File

@ -4,21 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Engines\Binlog;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\Binlog
*
* @package PhpMyAdmin-test
*/
class BinlogTest extends PMATestCase
class BinlogTest extends \PMATestCase
{
/**
* @access protected

9
test/classes/engines/InnodbTest.php → test/classes/Engines/InnodbTest.php
View File

@ -4,21 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Engines\Innodb;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\Innodb
*
* @package PhpMyAdmin-test
*/
class InnodbTest extends PMATestCase
class InnodbTest extends \PMATestCase
{
/**
* @access protected

9
test/classes/engines/MemoryTest.php → test/classes/Engines/MemoryTest.php
View File

@ -4,21 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Engines\Memory;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\Memory
*
* @package PhpMyAdmin-test
*/
class MemoryTest extends PMATestCase
class MemoryTest extends \PMATestCase
{
/**
* @access protected

9
test/classes/engines/MrgMyisamTest.php → test/classes/Engines/MrgMyisamTest.php
View File

@ -4,21 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Engines\MrgMyisam;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\MrgMyisam
*
* @package PhpMyAdmin-test
*/
class MrgMyisamTest extends PMATestCase
class MrgMyisamTest extends \PMATestCase
{
/**
* @access protected

9
test/classes/engines/MyisamTest.php → test/classes/Engines/MyisamTest.php
View File

@ -4,21 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Engines\Myisam;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\Myisam
*
* @package PhpMyAdmin-test
*/
class MyisamTest extends PMATestCase
class MyisamTest extends \PMATestCase
{
/**
* @access protected

9
test/classes/engines/NdbclusterTest.php → test/classes/Engines/NdbclusterTest.php
View File

@ -4,21 +4,16 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Engines\Ndbcluster;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\Ndbcluster
*
* @package PhpMyAdmin-test
*/
class NdbclusterTest extends PMATestCase
class NdbclusterTest extends \PMATestCase
{
/**
* @access protected

9
test/classes/engines/PbxtTest.php → test/classes/Engines/PbxtTest.php
View File

@ -5,22 +5,17 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests\Engines;
use PhpMyAdmin\Core;
use PhpMyAdmin\Engines\Pbxt;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Engines\Pbxt;
*
* @package PhpMyAdmin-test
*/
class PbxtTest extends PMATestCase
class PbxtTest extends \PMATestCase
{
/**
* @access protected

11
test/classes/ErrorHandlerTest.php
View File

@ -4,22 +4,18 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\ErrorHandler;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionClass;
/**
* Test for PhpMyAdmin\ErrorHandler class.
*
* @package PhpMyAdmin-test
*/
class ErrorHandlerTest extends PMATestCase
class ErrorHandlerTest extends \PMATestCase
{
/**
* @access protected
@ -36,7 +32,6 @@ class ErrorHandlerTest extends PMATestCase
protected function setUp()
{
$this->object = new ErrorHandler();
}
/**

13
test/classes/ErrorTest.php
View File

@ -5,22 +5,17 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Error;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Error class testing.
*
* @package PhpMyAdmin-test
*/
class ErrorTest extends PMATestCase
class ErrorTest extends \PMATestCase
{
/**
* @access protected
@ -60,7 +55,7 @@ class ErrorTest extends PMATestCase
{
$bt = array(array('file'=>'bt1','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>$this)));
$this->object->setBacktrace($bt);
$bt[0]['args']['foo'] = '<Class:ErrorTest>';
$bt[0]['args']['foo'] = '<Class:PhpMyAdmin\Tests\ErrorTest>';
$this->assertEquals($bt, $this->object->getBacktrace());
}
@ -123,7 +118,7 @@ class ErrorTest extends PMATestCase
public function testGetBacktraceDisplay()
{
$this->assertContains(
'PHPUnit_Framework_TestResult->run(<Class:ErrorTest>)<br />',
'PHPUnit_Framework_TestResult->run(<Class:PhpMyAdmin\Tests\ErrorTest>)<br />',
$this->object->getBacktraceDisplay()
);
}

3
test/classes/ExportTest.php
View File

@ -8,6 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Export;
use PHPUnit_Framework_TestCase as TestCase;
/**
* PhpMyAdmin\ExportTest class
@ -17,7 +18,7 @@ use PhpMyAdmin\Export;
* @package PhpMyAdmin-test
* @group large
*/
class ExportTest extends \PHPUnit_Framework_TestCase
class ExportTest extends TestCase
{
/**
* Test for Export::mergeAliases

19
test/classes/FileTest.php
View File

@ -1,19 +1,20 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for PhpMyAdmin\File class
* tests for File class
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
require_once 'test/PMATestCase.php';
use PhpMyAdmin\File;
/**
* tests for PhpMyAdmin\File class
*
* @package PhpMyAdmin-test
*/
class FileTest extends PMATestCase
class FileTest extends \PMATestCase
{
/**
* Setup function for test cases
@ -26,7 +27,7 @@ class FileTest extends PMATestCase
}
/**
* Test for PhpMyAdmin\File::getCompression
* Test for File::getCompression
*
* @param string $file file string
* @param string $mime expected mime
@ -36,12 +37,12 @@ class FileTest extends PMATestCase
*/
public function testMIME($file, $mime)
{
$arr = new PhpMyAdmin\File($file);
$arr = new File($file);
$this->assertEquals($mime, $arr->getCompression());
}
/**
* Test for PhpMyAdmin\File::getContent
* Test for File::getContent
*
* @param string $file file string
*
@ -51,12 +52,12 @@ class FileTest extends PMATestCase
public function testBinaryContent($file)
{
$data = '0x' . bin2hex(file_get_contents($file));
$file = new PhpMyAdmin\File($file);
$file = new File($file);
$this->assertEquals($data, $file->getContent());
}
/**
* Test for PhpMyAdmin\File::read
* Test for File::read
*
* @param string $file file string
*
@ -65,7 +66,7 @@ class FileTest extends PMATestCase
*/
public function testReadCompressed($file)
{
$file = new PhpMyAdmin\File($file);
$file = new File($file);
$file->setDecompressContent(true);
$file->open();
$this->assertEquals("TEST FILE\n", $file->read(100));

5
test/classes/FontTest.php
View File

@ -4,17 +4,16 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Font;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Font class
*
* @package PhpMyAdmin-test
*/
class FontTest extends PMATestCase
class FontTest extends \PMATestCase
{
/**
* Test getStringWidth with different characters.

10
test/classes/FooterTest.php
View File

@ -4,24 +4,20 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Config;
use PhpMyAdmin\ErrorHandler;
use PhpMyAdmin\Footer;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionClass;
/**
* Tests for Footer class
*
* @package PhpMyAdmin-test
*/
class FooterTest extends PMATestCase
class FooterTest extends \PMATestCase
{
/**

5
test/classes/gis/GisFactoryTest.php → test/classes/Gis/GisFactoryTest.php
View File

@ -5,14 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisFactory;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Test class for PhpMyAdmin\Gis\GisFactory
*
* @package PhpMyAdmin-test
*/
class GisFactoryTest extends PHPUnit_Framework_TestCase
class GisFactoryTest extends TestCase
{
/**

5
test/classes/gis/GisGeomTest.php → test/classes/Gis/GisGeomTest.php
View File

@ -5,13 +5,16 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Abstract parent class for all GIS<Geom_type> test classes
*
* @package PhpMyAdmin-test
*/
abstract class GisGeomTest extends PHPUnit_Framework_TestCase
abstract class GisGeomTest extends TestCase
{
/**

9
test/classes/gis/GisGeometryCollectionTest.php → test/classes/Gis/GisGeometryCollectionTest.php
View File

@ -6,15 +6,18 @@
*
* @package PhpMyAdmin-test
*/
use PhpMyAdmin\Gis\GisGeometryCollection;
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisGeometryCollection;
use PHPUnit_Framework_TestCase as TestCase;
use TCPDF;
/**
* Tests for PhpMyAdmin\Gis\GisGeometryCollection class
*
* @package PhpMyAdmin-test
*/
class GisGeometryCollectionTest extends PHPUnit_Framework_TestCase
class GisGeometryCollectionTest extends TestCase
{
/**
@ -268,7 +271,7 @@ class GisGeometryCollectionTest extends PHPUnit_Framework_TestCase
'scale' => 2,
'height' => 150
),
new \TCPDF(),
new TCPDF(),
)
);
}

6
test/classes/gis/GisGeometryTest.php → test/classes/Gis/GisGeometryTest.php
View File

@ -5,13 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PHPUnit_Framework_TestCase as TestCase;
use ReflectionClass;
/**
* Tests for PhpMyAdmin\Gis\GisGeometry class
*
* @package PhpMyAdmin-test
*/
class GisGeometryTest extends PHPUnit_Framework_TestCase
class GisGeometryTest extends TestCase
{
/**
* @access protected

5
test/classes/gis/GisLineStringTest.php → test/classes/Gis/GisLineStringTest.php
View File

@ -5,10 +5,11 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisLineString;
require_once 'GisGeomTest.php';
use PhpMyAdmin\Tests\Gis\GisGeomTest;
use TCPDF;
/**
* Tests for PhpMyAdmin\Gis\GisLineString class

5
test/classes/gis/GisMultiLineStringTest.php → test/classes/Gis/GisMultiLineStringTest.php
View File

@ -5,10 +5,11 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisMultiLineString;
require_once 'GisGeomTest.php';
use PhpMyAdmin\Tests\Gis\GisGeomTest;
use TCPDF;
/**
* Tests for PhpMyAdmin\Gis\GisMultiLineString class

5
test/classes/gis/GisMultiPointTest.php → test/classes/Gis/GisMultiPointTest.php
View File

@ -5,10 +5,11 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisMultiPoint;
require_once 'GisGeomTest.php';
use PhpMyAdmin\Tests\Gis\GisGeomTest;
use TCPDF;
/**
* Tests for PhpMyAdmin\Gis\GisMultiPoint class

5
test/classes/gis/GisMultiPolygonTest.php → test/classes/Gis/GisMultiPolygonTest.php
View File

@ -5,10 +5,11 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisMultiPolygon;
require_once 'GisGeomTest.php';
use PhpMyAdmin\Tests\Gis\GisGeomTest;
use TCPDF;
/**
* Tests for PhpMyAdmin\Gis\GisMultiPolygon class

5
test/classes/gis/GisPointTest.php → test/classes/Gis/GisPointTest.php
View File

@ -5,10 +5,11 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisPoint;
require_once 'GisGeomTest.php';
use PhpMyAdmin\Tests\Gis\GisGeomTest;
use TCPDF;
/**
* Tests for PhpMyAdmin\Gis\GisPoint class.

5
test/classes/gis/GisPolygonTest.php → test/classes/Gis/GisPolygonTest.php
View File

@ -5,10 +5,11 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisPolygon;
require_once 'GisGeomTest.php';
use PhpMyAdmin\Tests\Gis\GisGeomTest;
use TCPDF;
/**
* Tests for PhpMyAdmin\Gis\GisPolygon class

6
test/classes/HeaderTest.php
View File

@ -5,13 +5,13 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Config;
use PhpMyAdmin\Core;
use PhpMyAdmin\Header;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionMethod;
/**
* Test for PhpMyAdmin\Header class
@ -19,7 +19,7 @@ require_once 'test/PMATestCase.php';
* @package PhpMyAdmin-test
* @group medium
*/
class HeaderTest extends PMATestCase
class HeaderTest extends \PMATestCase
{
/**
* Configures global environment.

7
test/classes/ImportTest.php
View File

@ -11,6 +11,7 @@ use PhpMyAdmin\Import;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
/*
* we must set $GLOBALS['server'] here
@ -18,16 +19,12 @@ use PhpMyAdmin\Util;
*/
$GLOBALS['server'] = 0;
/*
* Include to test.
*/
/**
* Tests for import functions
*
* @package PhpMyAdmin-test
*/
class ImportTest extends \PHPUnit_Framework_TestCase
class ImportTest extends TestCase
{
/**
* Prepares environment for the test.

5
test/classes/IndexTest.php
View File

@ -5,17 +5,16 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Index;
require_once 'test/PMATestCase.php';
/**
* Test for Index class
*
* @package PhpMyAdmin-test
*/
class IndexTest extends PMATestCase
class IndexTest extends \PMATestCase
{
private $_params = array();

4
test/classes/InsertEditTest.php
View File

@ -16,17 +16,17 @@ use PhpMyAdmin\Theme;
use PhpMyAdmin\Tracker;
use PhpMyAdmin\Types;
use PhpMyAdmin\TypesMySQL;
use PHPUnit_Framework_TestCase as TestCase;
use ReflectionProperty;
use stdClass;
/**
* Tests for PhpMyAdmin\InsertEdit
*
* @package PhpMyAdmin-test
* @group medium
*/
class InsertEditTest extends \PHPUnit_Framework_TestCase
class InsertEditTest extends TestCase
{
/**
* Setup for test cases

3
test/classes/IpAllowDenyTest.php
View File

@ -9,6 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Core;
use PhpMyAdmin\IpAllowDeny;
use PHPUnit_Framework_TestCase as TestCase;
/**
* PhpMyAdmin\Tests\IpAllowDenyTest class
@ -17,7 +18,7 @@ use PhpMyAdmin\IpAllowDeny;
*
* @package PhpMyAdmin-test
*/
class IpAllowDenyTest extends \PHPUnit_Framework_TestCase
class IpAllowDenyTest extends TestCase
{
/**
* Prepares environment for the test.

7
test/classes/LanguageTest.php
View File

@ -5,10 +5,7 @@
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\LanguageManager;
@ -17,7 +14,7 @@ use PhpMyAdmin\LanguageManager;
*
* @package PhpMyAdmin-test
*/
class LanguageTest extends PMATestCase
class LanguageTest extends \PMATestCase
{
private $manager;

9
test/classes/LinterTest.php
View File

@ -5,22 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
/*
* Include to test.
*/
use PhpMyAdmin\Linter;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Linter
*
* @package PhpMyAdmin-test
*/
class LinterTest extends PMATestCase
class LinterTest extends \PMATestCase
{
/**
* Test for Linter::getLines
*

8
test/classes/ListDatabaseTest.php
View File

@ -5,22 +5,20 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\ListDatabase;
use ReflectionClass;
$GLOBALS['server'] = 1;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
/*
* Include to test.
*/
require_once 'test/PMATestCase.php';
/**
* tests for ListDatabase class
*
* @package PhpMyAdmin-test
*/
class ListDatabaseTest extends PMATestCase
class ListDatabaseTest extends \PMATestCase
{
/**
* SetUp for test cases

8
test/classes/MenuTest.php
View File

@ -5,22 +5,18 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
/*
* Include to test.
*/
use PhpMyAdmin\Core;
use PhpMyAdmin\Menu;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Test for Menu class
*
* @package PhpMyAdmin-test
*/
class MenuTest extends PMATestCase
class MenuTest extends \PMATestCase
{
/**
* Configures global environment.

5
test/classes/MessageTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Message;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Test for Message class
*
* @package PhpMyAdmin-test
*/
class MessageTest extends PMATestCase
class MessageTest extends \PMATestCase
{
/**
* @var PhpMyAdmin\Message

5
test/classes/MimeTest.php
View File

@ -5,16 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin;
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Mime;
use PHPUnit_Framework_TestCase as TestCase;
/**
* Test for mime detection.
*
* @package PhpMyAdmin-test
*/
class MimeTest extends \PHPUnit_Framework_TestCase
class MimeTest extends TestCase
{
/**
* Test for Mime::detect

3
test/classes/MultSubmitsTest.php
View File

@ -10,6 +10,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\MultSubmits;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
/**
* PhpMyAdmin\Tests\MultSubmitsTest class
@ -18,7 +19,7 @@ use PhpMyAdmin\Url;
*
* @package PhpMyAdmin-test
*/
class MultSubmitsTest extends \PHPUnit_Framework_TestCase
class MultSubmitsTest extends TestCase
{
/**
* Test for setUp

8
test/classes/navigation/NavigationTest.php → test/classes/Navigation/NavigationTest.php
View File

@ -5,18 +5,18 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation;
use PhpMyAdmin\Navigation\Navigation;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Navigation class
*
* @package PhpMyAdmin-test
*/
class NavigationTest extends PMATestCase
class NavigationTest extends \PMATestCase
{
/**
* @var PhpMyAdmin\Navigation\Navigation
@ -31,7 +31,7 @@ class NavigationTest extends PMATestCase
*/
protected function setUp()
{
$this->object = new PhpMyAdmin\Navigation\Navigation();
$this->object = new Navigation();
$GLOBALS['cfgRelation']['db'] = 'pmadb';
$GLOBALS['cfgRelation']['navigationhiding'] = 'navigationhiding';
$GLOBALS['cfg']['Server']['user'] = 'user';

15
test/classes/navigation/NavigationTreeTest.php → test/classes/Navigation/NavigationTreeTest.php
View File

@ -5,26 +5,27 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation;
use PhpMyAdmin\Config;
use PhpMyAdmin\Navigation\NavigationTree;
use PhpMyAdmin\Theme;
/*
* we must set $GLOBALS['server'] here
* since 'check_user_privileges.inc.php' will use it globally
*/
use PhpMyAdmin\Navigation\NavigationTree;
use PhpMyAdmin\Theme;
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
require_once 'libraries/check_user_privileges.inc.php';
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\NavigationTree class
*
* @package PhpMyAdmin-test
*/
class NavigationTreeTest extends PMATestCase
class NavigationTreeTest extends \PMATestCase
{
/**
* @var NavigationTree
@ -40,7 +41,7 @@ class NavigationTreeTest extends PMATestCase
protected function setUp()
{
$GLOBALS['server'] = 1;
$GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['Server']['host'] = 'localhost';
$GLOBALS['cfg']['Server']['user'] = 'root';
@ -52,7 +53,7 @@ class NavigationTreeTest extends PMATestCase
$GLOBALS['pmaThemeImage'] = 'image';
$GLOBALS['db'] = 'db';
$this->object = new PhpMyAdmin\Navigation\NavigationTree();
$this->object = new NavigationTree();
}
/**

5
test/classes/navigation/NodeFactoryTest.php → test/classes/Navigation/NodeFactoryTest.php
View File

@ -5,19 +5,18 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Navigation\Nodes\Node;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for NodeFactory class
*
* @package PhpMyAdmin-test
*/
class NodeFactoryTest extends PMATestCase
class NodeFactoryTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeColumnContainerTest.php → test/classes/Navigation/Nodes/NodeColumnContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeColumnContainer class
*
* @package PhpMyAdmin-test
*/
class NodeColumnContainerTest extends PMATestCase
class NodeColumnContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeColumnTest.php → test/classes/Navigation/Nodes/NodeColumnTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeColumn class
*
* @package PhpMyAdmin-test
*/
class NodeColumnTest extends PMATestCase
class NodeColumnTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeDatabaseChildTest.php → test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
View File

@ -5,20 +5,19 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild class
*
* @package PhpMyAdmin-test
*/
class NodeDatabaseChildTest extends PMATestCase
class NodeDatabaseChildTest extends \PMATestCase
{
/**
* @var NodeDatabaseChild

5
test/classes/navigation/NodeDatabaseTest.php → test/classes/Navigation/Nodes/NodeDatabaseTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabase class
*
* @package PhpMyAdmin-test
*/
class NodeDatabaseTest extends PMATestCase
class NodeDatabaseTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeEventContainerTest.php → test/classes/Navigation/Nodes/NodeEventContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeEventContainer class
*
* @package PhpMyAdmin-test
*/
class NodeEventContainerTest extends PMATestCase
class NodeEventContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeEventTest.php → test/classes/Navigation/Nodes/NodeEventTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeEvent class
*
* @package PhpMyAdmin-test
*/
class NodeEventTest extends PMATestCase
class NodeEventTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeFunctionContainerTest.php → test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeFunctionContainer class
*
* @package PhpMyAdmin-test
*/
class NodeFunctionContainerTest extends PMATestCase
class NodeFunctionContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeFunctionTest.php → test/classes/Navigation/Nodes/NodeFunctionTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeFunction class
*
* @package PhpMyAdmin-test
*/
class NodeFunctionTest extends PMATestCase
class NodeFunctionTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeIndexContainerTest.php → test/classes/Navigation/Nodes/NodeIndexContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeIndexContainer class
*
* @package PhpMyAdmin-test
*/
class NodeIndexContainerTest extends PMATestCase
class NodeIndexContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeIndexTest.php → test/classes/Navigation/Nodes/NodeIndexTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeIndex class
*
* @package PhpMyAdmin-test
*/
class NodeIndexTest extends PMATestCase
class NodeIndexTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeProcedureContainerTest.php → test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedureContainer class
*
* @package PhpMyAdmin-test
*/
class NodeProcedureContainerTest extends PMATestCase
class NodeProcedureContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeProcedureTest.php → test/classes/Navigation/Nodes/NodeProcedureTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedure class
*
* @package PhpMyAdmin-test
*/
class NodeProcedureTest extends PMATestCase
class NodeProcedureTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeTableContainerTest.php → test/classes/Navigation/Nodes/NodeTableContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeTableContainer class
*
* @package PhpMyAdmin-test
*/
class NodeTableContainerTest extends PMATestCase
class NodeTableContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeTableTest.php → test/classes/Navigation/Nodes/NodeTableTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeTable class
*
* @package PhpMyAdmin-test
*/
class NodeTableTest extends PMATestCase
class NodeTableTest extends \PMATestCase
{
/**
* SetUp for test cases

6
test/classes/navigation/NodeTest.php → test/classes/Navigation/Nodes/NodeTest.php
View File

@ -5,19 +5,19 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Navigation\Nodes\Node;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
use ReflectionMethod;
/**
* Tests for Node class
*
* @package PhpMyAdmin-test
*/
class NodeTest extends PMATestCase
class NodeTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeTriggerContainerTest.php → test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
*
* @package PhpMyAdmin-test
*/
class NodeTriggerContainerTest extends PMATestCase
class NodeTriggerContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeTriggerTest.php → test/classes/Navigation/Nodes/NodeTriggerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
*
* @package PhpMyAdmin-test
*/
class NodeTriggerTest extends PMATestCase
class NodeTriggerTest extends \PMATestCase
{
/**
* SetUp for test cases

5
test/classes/navigation/NodeViewContainerTest.php → test/classes/Navigation/Nodes/NodeViewContainerTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeViewContainer class
*
* @package PhpMyAdmin-test
*/
class NodeViewContainerTest extends PMATestCase
class NodeViewContainerTest extends \PMATestCase
{
/**
* SetUp for test cases

6
test/classes/navigation/NodeViewTest.php → test/classes/Navigation/Nodes/NodeViewTest.php
View File

@ -5,18 +5,17 @@
*
* @package PhpMyAdmin-test
*/
namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Theme;
require_once 'test/PMATestCase.php';
/**
* Tests for PhpMyAdmin\Navigation\Nodes\NodeView class
*
* @package PhpMyAdmin-test
*/
class NodeViewTest extends PMATestCase
class NodeViewTest extends \PMATestCase
{
/**
* SetUp for test cases
@ -28,7 +27,6 @@ class NodeViewTest extends PMATestCase
$GLOBALS['server'] = 0;
}
/**
* Test for __construct
*

Some files were not shown because too many files have changed in this diff Show More