diff --git a/composer.json b/composer.json index 63d7b57d09..1a43ac0ada 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ }, "autoload-dev": { "psr-4": { - "PhpMyAdmin\\Tests\\": "test/classes" + "PhpMyAdmin\\Tests\\": "test/classes", + "PhpMyAdmin\\Tests\\Selenium\\": "test/selenium/" } }, "repositories": [ diff --git a/test/selenium/PmaSeleniumChangePasswordTest.php b/test/selenium/ChangePasswordTest.php similarity index 94% rename from test/selenium/PmaSeleniumChangePasswordTest.php rename to test/selenium/ChangePasswordTest.php index 2d00fe2000..aea07b71b4 100644 --- a/test/selenium/PmaSeleniumChangePasswordTest.php +++ b/test/selenium/ChangePasswordTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumPrivilegesTest class + * PrivilegesTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumChangePasswordTest extends PMA_SeleniumBase +class ChangePasswordTest extends TestBase { /** * Tests the changing of the password diff --git a/test/selenium/PmaSeleniumCreateDropDatabaseTest.php b/test/selenium/CreateDropDatabaseTest.php similarity index 94% rename from test/selenium/PmaSeleniumCreateDropDatabaseTest.php rename to test/selenium/CreateDropDatabaseTest.php index 3e10fe79ec..6fe2dc6727 100644 --- a/test/selenium/PmaSeleniumCreateDropDatabaseTest.php +++ b/test/selenium/CreateDropDatabaseTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumCreateDropDatabaseTest class + * CreateDropDatabaseTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumCreateDropDatabaseTest extends PMA_SeleniumBase +class CreateDropDatabaseTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumCreateRemoveUserTest.php b/test/selenium/CreateRemoveUserTest.php similarity index 96% rename from test/selenium/PmaSeleniumCreateRemoveUserTest.php rename to test/selenium/CreateRemoveUserTest.php index f117b7177d..86fba66674 100644 --- a/test/selenium/PmaSeleniumCreateRemoveUserTest.php +++ b/test/selenium/CreateRemoveUserTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumCreateRemoveUserTest class + * CreateRemoveUserTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumCreateRemoveUserTest extends PMA_SeleniumBase +class CreateRemoveUserTest extends TestBase { /** * Username for the user diff --git a/test/selenium/PmaSeleniumDbEventsTest.php b/test/selenium/DbEventsTest.php similarity index 98% rename from test/selenium/PmaSeleniumDbEventsTest.php rename to test/selenium/DbEventsTest.php index ff59f91d33..37f767bb3c 100644 --- a/test/selenium/PmaSeleniumDbEventsTest.php +++ b/test/selenium/DbEventsTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumDbEventsTest class + * DbEventsTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumDbEventsTest extends PMA_SeleniumBase +class DbEventsTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumDbOperationsTest.php b/test/selenium/DbOperationsTest.php similarity index 96% rename from test/selenium/PmaSeleniumDbOperationsTest.php rename to test/selenium/DbOperationsTest.php index 825df88b51..e419baa042 100644 --- a/test/selenium/PmaSeleniumDbOperationsTest.php +++ b/test/selenium/DbOperationsTest.php @@ -7,17 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; - +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumDbOperationsTest class + * DbOperationsTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumDbOperationsTest extends PMA_SeleniumBase +class DbOperationsTest extends TestBase { /** * setUp function that can use the selenium session (called before each test) diff --git a/test/selenium/PmaSeleniumDbProceduresTest.php b/test/selenium/DbProceduresTest.php similarity index 97% rename from test/selenium/PmaSeleniumDbProceduresTest.php rename to test/selenium/DbProceduresTest.php index 13858716c8..bf55326834 100644 --- a/test/selenium/PmaSeleniumDbProceduresTest.php +++ b/test/selenium/DbProceduresTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumDbProceduresTest class + * DbProceduresTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumDbProceduresTest extends PMA_SeleniumBase +class DbProceduresTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumDbStructureTest.php b/test/selenium/DbStructureTest.php similarity index 95% rename from test/selenium/PmaSeleniumDbStructureTest.php rename to test/selenium/DbStructureTest.php index fe6cecb39b..96bbd4925c 100644 --- a/test/selenium/PmaSeleniumDbStructureTest.php +++ b/test/selenium/DbStructureTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumDbStructureTest class + * DbStructureTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumDbStructureTest extends PMA_SeleniumBase +class DbStructureTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumDbTriggersTest.php b/test/selenium/DbTriggersTest.php similarity index 97% rename from test/selenium/PmaSeleniumDbTriggersTest.php rename to test/selenium/DbTriggersTest.php index 34772717ff..830e2eb1c5 100644 --- a/test/selenium/PmaSeleniumDbTriggersTest.php +++ b/test/selenium/DbTriggersTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumDbTriggersTest class + * DbTriggersTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumDbTriggersTest extends PMA_SeleniumBase +class DbTriggersTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumExportTest.php b/test/selenium/ExportTest.php similarity index 97% rename from test/selenium/PmaSeleniumExportTest.php rename to test/selenium/ExportTest.php index c6d95a6f1a..214c0e6d90 100644 --- a/test/selenium/PmaSeleniumExportTest.php +++ b/test/selenium/ExportTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumExportTest class + * ExportTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumExportTest extends PMA_SeleniumBase +class ExportTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumImportTest.php b/test/selenium/ImportTest.php similarity index 96% rename from test/selenium/PmaSeleniumImportTest.php rename to test/selenium/ImportTest.php index edd717d322..3412fb7f0f 100644 --- a/test/selenium/PmaSeleniumImportTest.php +++ b/test/selenium/ImportTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumImportTest class + * ImportTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumImportTest extends PMA_SeleniumBase +class ImportTest extends TestBase { /** * setUp function that can use the selenium session (called before each test) diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/LoginTest.php similarity index 90% rename from test/selenium/PmaSeleniumLoginTest.php rename to test/selenium/LoginTest.php index 5417d31e25..a33b35878d 100644 --- a/test/selenium/PmaSeleniumLoginTest.php +++ b/test/selenium/LoginTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumLoginTest class + * LoginTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumLoginTest extends PMA_SeleniumBase +class LoginTest extends TestBase { public function setUpPage() { diff --git a/test/selenium/PmaSeleniumNormalizationTest.php b/test/selenium/NormalizationTest.php similarity index 98% rename from test/selenium/PmaSeleniumNormalizationTest.php rename to test/selenium/NormalizationTest.php index f3719482d4..509497ef59 100644 --- a/test/selenium/PmaSeleniumNormalizationTest.php +++ b/test/selenium/NormalizationTest.php @@ -7,7 +7,7 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** * PMA_SeleniumNormalizationTest class @@ -16,7 +16,7 @@ require_once 'TestBase.php'; * @subpackage Selenium * @group selenium */ -class PMA_SeleniumNormalizationTest extends PMA_SeleniumBase +class NormalizationTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumQueryByExampleTest.php b/test/selenium/QueryByExampleTest.php similarity index 97% rename from test/selenium/PmaSeleniumQueryByExampleTest.php rename to test/selenium/QueryByExampleTest.php index b545303ef1..e74b0b885c 100644 --- a/test/selenium/PmaSeleniumQueryByExampleTest.php +++ b/test/selenium/QueryByExampleTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumQueryByExampleTest class + * QueryByExampleTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PmaSeleniumQueryByExampleTest extends PMA_SeleniumBase +class QueryByExampleTest extends TestBase { /** diff --git a/test/selenium/PmaSeleniumServerSettingsTest.php b/test/selenium/ServerSettingsTest.php similarity index 96% rename from test/selenium/PmaSeleniumServerSettingsTest.php rename to test/selenium/ServerSettingsTest.php index 97aa66a19f..bb95b706e3 100644 --- a/test/selenium/PmaSeleniumServerSettingsTest.php +++ b/test/selenium/ServerSettingsTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumServerSettingsTest class + * ServerSettingsTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumSettingsTest extends PMA_SeleniumBase +class SettingsTest extends TestBase { /** * setUp function that can use the selenium session (called before each test) diff --git a/test/selenium/PmaSeleniumSqlQueryTest.php b/test/selenium/SqlQueryTest.php similarity index 97% rename from test/selenium/PmaSeleniumSqlQueryTest.php rename to test/selenium/SqlQueryTest.php index 6e7599936d..f258b9b1db 100644 --- a/test/selenium/PmaSeleniumSqlQueryTest.php +++ b/test/selenium/SqlQueryTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumSqlQueryTest class + * SqlQueryTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumSqlQueryTest extends PMA_SeleniumBase +class SqlQueryTest extends TestBase { /** diff --git a/test/selenium/PmaSeleniumTableBrowseTest.php b/test/selenium/TableBrowseTest.php similarity index 98% rename from test/selenium/PmaSeleniumTableBrowseTest.php rename to test/selenium/TableBrowseTest.php index 69473e004d..f0b55a8564 100644 --- a/test/selenium/PmaSeleniumTableBrowseTest.php +++ b/test/selenium/TableBrowseTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumTableBrowseTest class + * TableBrowseTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase +class TableBrowseTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumTableCreateTest.php b/test/selenium/TableCreateTest.php similarity index 97% rename from test/selenium/PmaSeleniumTableCreateTest.php rename to test/selenium/TableCreateTest.php index 19634e6602..ad3f62265a 100644 --- a/test/selenium/PmaSeleniumTableCreateTest.php +++ b/test/selenium/TableCreateTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumTableCreateTest class + * TableCreateTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumTableCreateTest extends PMA_SeleniumBase +class TableCreateTest extends TestBase { public function setUpPage() diff --git a/test/selenium/PmaSeleniumTableInsertTest.php b/test/selenium/TableInsertTest.php similarity index 97% rename from test/selenium/PmaSeleniumTableInsertTest.php rename to test/selenium/TableInsertTest.php index d231df3072..e31191da34 100644 --- a/test/selenium/PmaSeleniumTableInsertTest.php +++ b/test/selenium/TableInsertTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumTableInsertTest class + * TableInsertTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumTableInsertTest extends PMA_SeleniumBase +class TableInsertTest extends TestBase { /** * Setup the browser environment to run the selenium t diff --git a/test/selenium/PmaSeleniumTableOperationsTest.php b/test/selenium/TableOperationsTest.php similarity index 98% rename from test/selenium/PmaSeleniumTableOperationsTest.php rename to test/selenium/TableOperationsTest.php index a706c1447a..8223bfb431 100644 --- a/test/selenium/PmaSeleniumTableOperationsTest.php +++ b/test/selenium/TableOperationsTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumTableOperationsTest class + * TableOperationsTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumTableOperationsTest extends PMA_SeleniumBase +class TableOperationsTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumTableStructureTest.php b/test/selenium/TableStructureTest.php similarity index 97% rename from test/selenium/PmaSeleniumTableStructureTest.php rename to test/selenium/TableStructureTest.php index c16f765643..788a931929 100644 --- a/test/selenium/PmaSeleniumTableStructureTest.php +++ b/test/selenium/TableStructureTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumTableStructureTest class + * TableStructureTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumTableStructureTest extends PMA_SeleniumBase +class TableStructureTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php index 8aa0740d73..ac4e7c91d9 100644 --- a/test/selenium/TestBase.php +++ b/test/selenium/TestBase.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-test * @subpackage Selenium */ +namespace PhpMyAdmin\Tests\Selenium; /** * Base class for Selenium tests. @@ -14,7 +15,7 @@ * @subpackage Selenium * @group selenium */ -abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase +abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase { /** * mysqli object diff --git a/test/selenium/PmaSeleniumTrackingTest.php b/test/selenium/TrackingTest.php similarity index 98% rename from test/selenium/PmaSeleniumTrackingTest.php rename to test/selenium/TrackingTest.php index 415919d29a..70dbcff916 100644 --- a/test/selenium/PmaSeleniumTrackingTest.php +++ b/test/selenium/TrackingTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumTrackingTest class + * TrackingTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumTrackingTest extends PMA_SeleniumBase +class TrackingTest extends TestBase { /** * Setup the browser environment to run the selenium test case diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/XssTest.php similarity index 90% rename from test/selenium/PmaSeleniumXssTest.php rename to test/selenium/XssTest.php index 95c94857c7..3641047595 100644 --- a/test/selenium/PmaSeleniumXssTest.php +++ b/test/selenium/XssTest.php @@ -7,16 +7,16 @@ * @subpackage Selenium */ -require_once 'TestBase.php'; +namespace PhpMyAdmin\Tests\Selenium; /** - * PmaSeleniumXSSTest class + * XSSTest class * * @package PhpMyAdmin-test * @subpackage Selenium * @group selenium */ -class PMA_SeleniumXSSTest extends PMA_SeleniumBase +class XSSTest extends TestBase { public function setUpPage() {