Fix tests + Add PSR-4 to tests

giorgiosironi · Apr 6, 2020 · fdb7cb5 · fdb7cb5
1 parent 97676a2
commit fdb7cb5
Show file tree

Hide file tree

Showing 23 changed files with 125 additions and 36 deletions.
diff --git a/Tests/CodeCoverageTest.php b/Tests/CodeCoverageTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests;
+
 use PHPUnit\Extensions\Selenium2TestCase;
 
 class CodeCoverageTest extends Selenium2TestCase

diff --git a/Tests/Selenium2TestCase/BaseTestCase.php b/Tests/Selenium2TestCase/BaseTestCase.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Tests\Selenium2TestCase;
+
 use PHPUnit\Extensions\Selenium2TestCase;
 
-class Tests_Selenium2TestCase_BaseTestCase extends Selenium2TestCase
+class BaseTestCase extends Selenium2TestCase
 {
     public function setUp(): void
     {

diff --git a/Tests/Selenium2TestCase/Coverage/CookieTest.php b/Tests/Selenium2TestCase/Coverage/CookieTest.php
@@ -1,7 +1,11 @@
 <?php
+
+namespace Tests\Selenium2TestCase\Coverage;
+
 use PHPUnit\Framework\TestResult;
+use Tests\Selenium2TestCase\BaseTestCase;
 
-class Tests_Selenium2TestCase_Coverage_CookieTest extends Tests_Selenium2TestCase_BaseTestCase
+class CookieTest extends BaseTestCase
 {
     // this is a dummy URL (returns down coverage data in HTML), but Firefox still sets domain cookie, which is what's needed
     protected $coverageScriptUrl = PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_TESTS_URL .'/coverage/dummy.html';

diff --git a/Tests/Selenium2TestCase/Coverage/RemoteCoverageTest.php b/Tests/Selenium2TestCase/Coverage/RemoteCoverageTest.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Tests\Selenium2TestCase\Coverage;
+
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
 use PHPUnit\Framework\TestCase;
 
-class Tests_Selenium2TestCase_Coverage_RemoteCoverageTest extends TestCase
+class RemoteCoverageTest extends TestCase
 {
     public function testObtainsCodeCoverageInformationFromAPossiblyRemoteHttpServer()
     {

diff --git a/Tests/Selenium2TestCase/Coverage/SingleFileTest.php b/Tests/Selenium2TestCase/Coverage/SingleFileTest.php
@@ -1,7 +1,10 @@
 <?php
+
+namespace Tests\Selenium2TestCase\Coverage;
+
 use PHPUnit\Framework\TestCase;
 
-class Tests_Selenium2TestCase_Coverage_SingleFileTest extends TestCase
+class SingleFileTest extends TestCase
 {
     private $dummyTestId = 'ns_dummyTestId';
 

diff --git a/Tests/Selenium2TestCase/CustomDesiredCapabilitiesTest.php b/Tests/Selenium2TestCase/CustomDesiredCapabilitiesTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * Tests for PHPUnit_Extensions_SeleniumTestCase.
  *
@@ -8,7 +11,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Extensions_Selenium2TestCase_CustomDesiredCapabilitiesTest extends Tests_Selenium2TestCase_BaseTestCase
+class CustomDesiredCapabilitiesTest extends BaseTestCase
 {
     public function setUp(): void
     {

diff --git a/Tests/Selenium2TestCase/FailuresTest.php b/Tests/Selenium2TestCase/FailuresTest.php
@@ -1,4 +1,12 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
+use BadMethodCallException;
+use DomainException;
+use InvalidArgumentException;
+use RuntimeException;
+
 /**
  * PHPUnit
  *
@@ -50,7 +58,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Extensions_Selenium2TestCaseFailuresTest extends Tests_Selenium2TestCase_BaseTestCase
+class Selenium2TestCaseFailuresTest extends BaseTestCase
 {
     public function testInexistentCommandCausesTheTestToFail()
     {
@@ -80,7 +88,7 @@ public function testStaleElementsCannotBeAccessed()
             $div->text();
             $this->fail('The element shouldn\'t be accessible.');
         } catch (RuntimeException $e) {
-            $this->assertContains('http://seleniumhq.org/exceptions/stale_element_reference.html', $e->getMessage());
+            $this->assertStringContainsString('http://seleniumhq.org/exceptions/stale_element_reference.html', $e->getMessage());
         }
     }
 

diff --git a/Tests/Selenium2TestCase/LogTest.php b/Tests/Selenium2TestCase/LogTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -50,7 +53,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Tests_Selenium2TestCase_LogTest extends Tests_Selenium2TestCase_BaseTestCase
+class LogTest extends BaseTestCase
 {
     private static $expectedLogTypes = array(
         'default' => array(

diff --git a/Tests/Selenium2TestCase/MobileFeaturesTest.php b/Tests/Selenium2TestCase/MobileFeaturesTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -62,7 +65,7 @@
     define('SAUCE_HOST', '');
 }
 
-class Tests_Selenium2TestCase_MobileFeaturesTest extends Selenium2TestCase
+class MobileFeaturesTest extends Selenium2TestCase
 {
     public static $browsers = array(
         array(

diff --git a/Tests/Selenium2TestCase/MultipleBrowsersMethodTest.php b/Tests/Selenium2TestCase/MultipleBrowsersMethodTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -41,6 +44,7 @@
  * @link       http://www.phpunit.de/
  */
 
+use Exception;
 use PHPUnit\Extensions\Selenium2TestCase;
 
 /**
@@ -50,7 +54,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Extensions_Selenium2TestCaseMultipleBrowsersMethodTest extends Selenium2TestCase
+class MultipleBrowsersMethodTest extends Selenium2TestCase
 {
     private $browserWeSetUp = '';
     private static $testsRun = 0;

diff --git a/Tests/Selenium2TestCase/MultipleBrowsersPropertyTest.php b/Tests/Selenium2TestCase/MultipleBrowsersPropertyTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -52,7 +55,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Extensions_Selenium2TestCaseMultipleBrowsersPropertyTest extends Selenium2TestCase
+class MultipleBrowsersPropertyTest extends Selenium2TestCase
 {
     public static $browsers = array(
         array(

diff --git a/Tests/Selenium2TestCase/PageObjectTest.php b/Tests/Selenium2TestCase/PageObjectTest.php
@@ -1,18 +1,21 @@
 <?php
-class Tests_PageObjectTest extends Tests_Selenium2TestCase_BaseTestCase
+
+namespace Tests\Selenium2TestCase;
+
+class PageObjectTest extends BaseTestCase
 {
     public function testAPageInteractsWithElementsExposingAnHigherLevelApi()
     {
         $this->url('html/test_type_page1.html');
-        $page = new Tests_AuthenticationPage($this);
+        $page = new AuthenticationPage($this);
         $welcomePage = $page->username('TestUser')
                             ->password('TestPassword')
                             ->submit();
         $welcomePage->assertWelcomeIs('Welcome, TestUser!');
     }
 }
 
-class Tests_AuthenticationPage
+class AuthenticationPage
 {
     public function __construct($test)
     {
@@ -36,11 +39,11 @@ public function password($value)
     public function submit()
     {
         $this->test->clickOnElement('submitButton');
-        return new Tests_WelcomePage($this->test);
+        return new WelcomePage($this->test);
     }
 }
 
-class Tests_WelcomePage
+class WelcomePage
 {
     public function __construct($test)
     {
@@ -50,6 +53,6 @@ public function __construct($test)
 
     public function assertWelcomeIs($text)
     {
-        $this->test->assertRegExp("/$text/", $this->header->text());
+        $this->test->assertMatchesRegularExpression("/$text/", $this->header->text());
     }
 }
diff --git a/Tests/Selenium2TestCase/RegressionsTest.php b/Tests/Selenium2TestCase/RegressionsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -50,7 +53,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Extensions_Selenium2TestCaseRegressionsTest extends Tests_Selenium2TestCase_BaseTestCase
+class RegressionsTest extends BaseTestCase
 {
     /**
      * @return string

diff --git a/Tests/Selenium2TestCase/ScreenshotListenerTest.php b/Tests/Selenium2TestCase/ScreenshotListenerTest.php
@@ -1,10 +1,14 @@
 <?php
 
+namespace Tests\Selenium2TestCase;
+
+use Exception;
 use PHPUnit\Extensions\Selenium2TestCase;
 use PHPUnit\Extensions\Selenium2TestCase\ScreenshotListener;
 use PHPUnit\Framework\AssertionFailedError;
+use RuntimeException;
 
-class Tests_Selenium2TestCase_ScreenshotListenerTest extends Tests_Selenium2TestCase_BaseTestCase
+class ScreenshotListenerTest extends BaseTestCase
 {
     /** @var ScreenshotListener */
     private $listener;

diff --git a/Tests/Selenium2TestCase/SessionCommand/FileTest.php b/Tests/Selenium2TestCase/SessionCommand/FileTest.php
@@ -1,6 +1,10 @@
 <?php
 
-class Tests_Selenium2TestCase_SessionCommand_FileTest extends Tests_Selenium2TestCase_BaseTestCase
+namespace Tests\Selenium2TestCase\SessionCommand;
+
+use Tests\Selenium2TestCase\BaseTestCase;
+
+class FileTest extends BaseTestCase
 {
     public function testUploadFile()
     {

diff --git a/Tests/Selenium2TestCase/SessionInSetupTest.php b/Tests/Selenium2TestCase/SessionInSetupTest.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Tests\Selenium2TestCase;
+
 use PHPUnit\Extensions\Selenium2TestCase;
 
-class Tests_Selenium2TestCase_SessionInSetupTest extends Selenium2TestCase
+class SessionInSetupTest extends Selenium2TestCase
 {
     public function setUp(): void
     {

diff --git a/Tests/Selenium2TestCase/SetUpPageTest.php b/Tests/Selenium2TestCase/SetUpPageTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -48,14 +51,14 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Tests_Selenium2TestCase_SetUpPageTest extends Tests_Selenium2TestCase_BaseTestCase {
+class SetUpPageTest extends BaseTestCase {
     public function setUpPage()
     {
         $this->url('html/test_type_page1.html');
     }
 
     public function testSetUpPageIsExecuted()
     {
-        $this->assertRegExp('/html\/test_type_page1\.html$/', $this->url());
+        $this->assertMatchesRegularExpression('/html\/test_type_page1\.html$/', $this->url());
     }
 }
diff --git a/Tests/Selenium2TestCase/SuiteBuildingTest.php b/Tests/Selenium2TestCase/SuiteBuildingTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -43,6 +46,8 @@
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestSuite;
+use Tests\Selenium2TestCase\fixtures\MultipleBrowsersTestCaseSample;
+use Tests\Selenium2TestCase\fixtures\TestCaseSample;
 
 require_once 'PHPUnit/Extensions/Selenium2TestCase.php';
 
@@ -55,20 +60,20 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Extensions_Selenium2SuiteBuildingTest extends TestCase
+class SuiteBuildingTest extends TestCase
 {
     public function testSampleTestCaseBuildsAFullSuiteContainingAllItsTests()
     {
         require_once __DIR__ . '/fixtures/SuiteBuildingSuites.php';
-        $suite = Extensions_Selenium2TestCaseSample::suite('Extensions_Selenium2TestCaseSample');
+        $suite = TestCaseSample::suite(TestCaseSample::class);
         $this->assertInstanceOf(TestSuite::class, $suite);
         $this->assertEquals(2, count($suite->tests()));
     }
 
     public function testAMultipleBrowsersTestCaseBuildsACopyOfEachTestForEachBrowser()
     {
         require_once __DIR__ . '/fixtures/SuiteBuildingSuites.php';
-        $suite = Extensions_Selenium2MultipleBrowsersTestCaseSample::suite('Extensions_Selenium2MultipleBrowsersTestCaseSample');
+        $suite = MultipleBrowsersTestCaseSample::suite(MultipleBrowsersTestCaseSample::class);
         $this->assertInstanceOf(TestSuite::class, $suite);
         $this->assertEquals(2, count($suite->tests()));
     }

diff --git a/Tests/Selenium2TestCase/TimeoutTest.php b/Tests/Selenium2TestCase/TimeoutTest.php
@@ -1,5 +1,8 @@
 <?php
-class Tests_Selenium2TestCase_TimeoutTest extends Tests_Selenium2TestCase_BaseTestCase
+
+namespace Tests\Selenium2TestCase;
+
+class TimeoutTest extends BaseTestCase
 {
     public function setUp(): void
     {

diff --git a/Tests/Selenium2TestCase/URLTest.php b/Tests/Selenium2TestCase/URLTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -51,7 +54,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Extensions_Selenium2TestCase_URLTest extends TestCase
+class URLTest extends TestCase
 {
     public function testDescendsAnURLWithAnAdditionalFolder()
     {

diff --git a/Tests/Selenium2TestCase/WaitUntilTest.php b/Tests/Selenium2TestCase/WaitUntilTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Tests\Selenium2TestCase;
+
 /**
  * PHPUnit
  *
@@ -52,7 +55,7 @@
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
-class Tests_Selenium2TestCase_WaitUntilTest extends Tests_Selenium2TestCase_BaseTestCase
+class WaitUntilTest extends BaseTestCase
 {
     public function testWaitSuccessfully()
     {