Merge pull request #13802 from gabriel-caruso/phpunit

Use PSR-1 for PHPUnit TestCase
This commit is contained in:
Michal Čihař 2017-11-08 16:30:52 +01:00 committed by GitHub
commit 8657a28685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 69 additions and 63 deletions

View File

@ -11,12 +11,14 @@
*/
require_once 'config.sample.inc.php';
use PHPUnit\Framework\TestCase;
/**
* Environment tests
*
* @package PhpMyAdmin-test
*/
class Environment_Test extends PHPUnit_Framework_TestCase
class Environment_Test extends TestCase
{
/**
* Tests PHP version

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Bookmark;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for Bookmark class

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\BrowseForeigners;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\BrowseForeigners

View File

@ -13,7 +13,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Types;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
$GLOBALS['server'] = 1;

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Charsets;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for MySQL Charsets

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\CheckUserPrivileges;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/*
* Include to test.

View File

@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests\Config;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\FormDisplayTemplate;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for FromDisplay.tpl.php

View File

@ -8,7 +8,7 @@ namespace PhpMyAdmin\Tests\Database;
use PhpMyAdmin\Database\Designer;
use PhpMyAdmin\DatabaseInterface;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Database\Designer

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Display\ChangePassword;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
require_once 'libraries/config.default.php';

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\Display\CreateTable;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Display\CreateTableTest class

View File

@ -13,7 +13,7 @@ use PhpMyAdmin\Plugins;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* class PhpMyAdmin\Tests\Display\ExportTest

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Encoding;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for Charset Conversions

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Export;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\ExportTest class

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisFactory;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Test class for PhpMyAdmin\Gis\GisFactory

View File

@ -7,7 +7,7 @@
*/
namespace PhpMyAdmin\Tests\Gis;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Abstract parent class for all GIS<Geom_type> test classes

View File

@ -9,7 +9,7 @@
namespace PhpMyAdmin\Tests\Gis;
use PhpMyAdmin\Gis\GisGeometryCollection;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
use TCPDF;
/**

View File

@ -7,7 +7,7 @@
*/
namespace PhpMyAdmin\Tests\Gis;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
use ReflectionClass;
/**

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\Import;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/*
* we must set $GLOBALS['server'] here

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\InsertEdit;
use PhpMyAdmin\Response;
use PhpMyAdmin\Table;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
use ReflectionProperty;
use stdClass;

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Core;
use PhpMyAdmin\IpAllowDeny;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\IpAllowDenyTest class

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Mime;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Test for mime detection.

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\MultSubmits;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\MultSubmitsTest class

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Types;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
use stdClass;
$GLOBALS['server'] = 1;

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for operations

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Response;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
use ReflectionProperty;
/**

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\PmdCommon;
use PhpMyAdmin\Relation;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\PmdCommon

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests\Properties\Options\Groups;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup class

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests\Properties\Options\Groups;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup class

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests\Properties\Options\Groups;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup class

View File

@ -14,7 +14,7 @@ use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for *PhpMyAdmin\Properties\PropertyItem class

View File

@ -7,7 +7,7 @@
*/
namespace PhpMyAdmin\Tests\Properties\Options;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
use ReflectionProperty;
/**

View File

@ -7,7 +7,7 @@
*/
namespace PhpMyAdmin\Tests\Properties\Options;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Properties\Options\OptionsPropertyItem class

View File

@ -7,7 +7,7 @@
*/
namespace PhpMyAdmin\Tests\Properties\Options;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Properties\Options\OptionsPropertyOneItem class

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests\Properties\Plugins;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for PhpMyAdmin\Properties\Plugins\ImportPluginProperties class

View File

@ -7,7 +7,7 @@
*/
namespace PhpMyAdmin\Tests\Properties\Plugins;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Properties\Plugins\PluginPropertyItem class

View File

@ -7,7 +7,7 @@
*/
namespace PhpMyAdmin\Tests\Properties;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Properties\PropertyItem class

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\Tests\RelationCleanupDbiMock;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\RelationCleanupTest class

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Relation

View File

@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\ReplicationGui;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/*
* Include to test.

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests\Rte;
use PhpMyAdmin\Response;
use PhpMyAdmin\Rte\Events;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* This class is for testing PhpMyAdmin\Rte\Events methods

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Response;
use PhpMyAdmin\Rte\Routines;
use PhpMyAdmin\Types;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* This class is for testing PhpMyAdmin\Rte\Routines methods

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests\Rte;
use PhpMyAdmin\Response;
use PhpMyAdmin\Rte\Triggers;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* This class is for testing PhpMyAdmin\Rte\Triggers methods

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Sanitize;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for methods in Sanitize class

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\Server\Privileges;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Server\PrivilegesTest class

View File

@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests\Server;
use PhpMyAdmin\Server\Select;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Server\SelectTest class

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Server\Status\Advisor;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Server\Status\AdvisorTest class

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Server\Status\Monitor;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* this class is for testing PhpMyAdmin\Server\Status\Monitor methods

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\Core;
use PhpMyAdmin\Server\Status\Processes;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Server\Status\ProcessesTest class

View File

@ -13,7 +13,7 @@ use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Queries;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Server\Status\QueriesTest class

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Variables;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* This class is for testing PhpMyAdmin\Server\Status\Variables methods

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Server\Status;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Theme;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Server\StatusTest class

View File

@ -10,7 +10,7 @@ namespace PhpMyAdmin\Tests\Server;
use PhpMyAdmin\Server\UserGroups;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Server\UserGroups

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests\Server;
use PhpMyAdmin\Server\Users;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* PhpMyAdmin\Tests\Server\UsersTest class

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests\Setup;
use PhpMyAdmin\Setup\Index as SetupIndex;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for methods under PhpMyAdmin\Setup\Index

View File

@ -13,7 +13,7 @@ use PhpMyAdmin\SqlQueryForm;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
//the following definition should be used globally
$GLOBALS['server'] = 0;

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Sql;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
use stdClass;
/**

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\SysInfo;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for sysinfo library

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Tracking;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for PhpMyAdmin\Tracking

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Theme;
use PhpMyAdmin\Transformations;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* tests for transformation wrappers

View File

@ -8,7 +8,7 @@
namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Url;
use PHPUnit_Framework_TestCase as TestCase;
use PHPUnit\Framework\TestCase;
/**
* Tests for methods in URL class

View File

@ -10,13 +10,14 @@
* Include to test.
*/
use PHPUnit\Framework\TestCase;
/**
* tests for bookmark.lib.php
*
* @package PhpMyAdmin-test
*/
class FilesTest extends PHPUnit_Framework_TestCase
class FilesTest extends TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.

View File

@ -11,6 +11,7 @@
* Include to test.
*/
use PHPUnit\Framework\TestCase;
/**
** Test for checkbox.phtml
@ -18,7 +19,7 @@
* @package PhpMyAdmin-test
* @group common.lib-tests
*/
class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
class PMA_GetCheckboxTest extends TestCase
{
/**
* Test for checkbox.phtml

View File

@ -10,12 +10,14 @@
* Include to test.
*/
use PHPUnit\Framework\TestCase;
/**
* Tests basic functionality of dummy dbi driver
*
* @package PhpMyAdmin-test
*/
class PMA_DBI_Test extends PHPUnit_Framework_TestCase
class PMA_DBI_Test extends TestCase
{
/**
* Configures test parameters.