Merge pull request #498 from gabriel-caruso/phpunit

OndraM · web-flow · commit f049e6756ecb · 2017-11-08T15:31:23.000+01:00
Use namespaces for PHPUnit forward compatibility
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "ext-zip": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.4",
+    "phpunit/phpunit": "^5.7",
     "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -15,12 +15,14 @@
 
 namespace Facebook\WebDriver\Chrome;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @group exclude-saucelabs
  * @covers Facebook\WebDriver\Chrome\ChromeDriverService
  * @covers Facebook\WebDriver\Remote\Service\DriverService
  */
-class ChromeDriverServiceTest extends \PHPUnit_Framework_TestCase
+class ChromeDriverServiceTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
@@ -17,12 +17,13 @@
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group exclude-saucelabs
  * @covers Facebook\WebDriver\Chrome\ChromeDriver
  */
-class ChromeDriverTest extends \PHPUnit_Framework_TestCase
+class ChromeDriverTest extends TestCase
 {
     /** @var ChromeDriver */
     protected $driver;
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
@@ -16,8 +16,9 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
+use PHPUnit\Framework\BaseTestListener;
 
-class ReportSauceLabsStatusListener extends \PHPUnit_Framework_BaseTestListener
+class ReportSauceLabsStatusListener extends BaseTestListener
 {
     public function endTest(\PHPUnit_Framework_Test $test, $time)
     {
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
@@ -20,11 +20,12 @@
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
+use PHPUnit\Framework\TestCase;
 
 /**
  * The base class for test cases.
  */
-class WebDriverTestCase extends \PHPUnit_Framework_TestCase
+class WebDriverTestCase extends TestCase
 {
     /** @var RemoteWebDriver $driver */
     public $driver;
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
@@ -15,10 +15,12 @@
 
 namespace Facebook\WebDriver;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers Facebook\WebDriver\Cookie
  */
-class CookieTest extends \PHPUnit_Framework_TestCase
+class CookieTest extends TestCase
 {
     public function testShouldSetAllProperties()
     {
@@ -143,7 +145,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
      * @param string $domain
      * @param string $expectedMessage
      */
-    public function testShouldValidateCookie($name, $value, $domain, $expectedMessage)
+    public function testShouldValidateCookieOnConstruction($name, $value, $domain, $expectedMessage)
     {
         if ($expectedMessage) {
             $this->expectException(\InvalidArgumentException::class);
@@ -154,6 +156,8 @@ public function testShouldValidateCookie($name, $value, $domain, $expectedMessag
         if ($domain !== null) {
             $cookie->setDomain($domain);
         }
+
+        $this->assertInstanceOf(Cookie::class, $cookie);
     }
 
     /**
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class WebDriverExceptionTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class WebDriverExceptionTest extends TestCase
 {
     public function testShouldStoreResultsOnInstantiation()
     {
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverButtonReleaseActionTest extends TestCase
 {
     /** @var WebDriverButtonReleaseAction */
     private $webDriverButtonReleaseAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverClickActionTest extends TestCase
 {
     /** @var WebDriverClickAction */
     private $webDriverClickAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverClickAndHoldActionTest extends TestCase
 {
     /** @var WebDriverClickAndHoldAction */
     private $webDriverClickAndHoldAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverContextClickActionTest extends TestCase
 {
     /** @var WebDriverContextClickAction */
     private $webDriverContextClickAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class WebDriverCoordinatesTest extends TestCase
 {
     public function testConstruct()
     {
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverDoubleClickActionTest extends TestCase
 {
     /** @var WebDriverDoubleClickAction */
     private $webDriverDoubleClickAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -18,8 +18,9 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverKeyDownActionTest extends TestCase
 {
     /** @var WebDriverKeyDownAction */
     private $webDriverKeyDownAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -18,8 +18,9 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverKeyUpActionTest extends TestCase
 {
     /** @var WebDriverKeyUpAction */
     private $webDriverKeyUpAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverMouseMoveActionTest extends TestCase
 {
     /** @var WebDriverMouseMoveAction */
     private $webDriverMouseMoveAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverMouseToOffsetActionTest extends TestCase
 {
     /**
      * @type WebDriverMoveToOffsetAction
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -18,8 +18,9 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverSendKeysActionTest extends TestCase
 {
     /** @var WebDriverSendKeysAction */
     private $webDriverSendKeysAction;
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -19,8 +19,9 @@
 use Facebook\WebDriver\Firefox\FirefoxPreferences;
 use Facebook\WebDriver\Firefox\FirefoxProfile;
 use Facebook\WebDriver\WebDriverPlatform;
+use PHPUnit\Framework\TestCase;
 
-class DesiredCapabilitiesTest extends \PHPUnit_Framework_TestCase
+class DesiredCapabilitiesTest extends TestCase
 {
     public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
     {
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -16,8 +16,9 @@
 namespace Facebook\WebDriver\Remote;
 
 use phpmock\phpunit\PHPMock;
+use PHPUnit\Framework\TestCase;
 
-class HttpCommandExecutorTest extends \PHPUnit_Framework_TestCase
+class HttpCommandExecutorTest extends TestCase
 {
     use PHPMock;
 
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -19,13 +19,14 @@
 use Facebook\WebDriver\WebDriverNavigation;
 use Facebook\WebDriver\WebDriverOptions;
 use Facebook\WebDriver\WebDriverWait;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
  *
  * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebDriver
  */
-class RemoteWebDriverTest extends \PHPUnit_Framework_TestCase
+class RemoteWebDriverTest extends TestCase
 {
     /** @var RemoteWebDriver */
     private $driver;
diff --git a/tests/unit/Remote/RemoteWebElementTest.php b/tests/unit/Remote/RemoteWebElementTest.php
@@ -15,12 +15,14 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
  *
  * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebElement
  */
-class RemoteWebElementTest extends \PHPUnit_Framework_TestCase
+class RemoteWebElementTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Remote;
 
-class WebDriverCommandTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class WebDriverCommandTest extends TestCase
 {
     public function testShouldSetOptionsUsingConstructor()
     {
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Support;
 
-class XPathEscaperTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class XPathEscaperTest extends TestCase
 {
     /**
      * @dataProvider xpathProvider
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
@@ -20,11 +20,12 @@
 use Facebook\WebDriver\Remote\RemoteExecuteMethod;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\RemoteWebElement;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Facebook\WebDriver\WebDriverExpectedCondition
  */
-class WebDriverExpectedConditionTest extends \PHPUnit_Framework_TestCase
+class WebDriverExpectedConditionTest extends TestCase
 {
     /** @var RemoteWebDriver|\PHPUnit_Framework_MockObject_MockObject */
     private $driverMock;
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
@@ -15,10 +15,12 @@
 
 namespace Facebook\WebDriver;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers Facebook\WebDriver\WebDriverKeys
  */
-class WebDriverKeysTest extends \PHPUnit_Framework_TestCase
+class WebDriverKeysTest extends TestCase
 {
     /**
      * @dataProvider provideKeys
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
@@ -17,11 +17,12 @@
 
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Facebook\WebDriver\WebDriverOptions
  */
-class WebDriverOptionsTest extends \PHPUnit_Framework_TestCase
+class WebDriverOptionsTest extends TestCase
 {
     /** @var ExecuteMethod|\PHPUnit_Framework_MockObject_MockObject */
     private $executor;

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,14 @@`
`15`	`15`
`16`	`16`	`namespace Facebook\WebDriver\Chrome;`
`17`	`17`
	`18`	`+use PHPUnit\Framework\TestCase;`
	`19`	`+`
`18`	`20`	`/**`
`19`	`21`	`* @group exclude-saucelabs`
`20`	`22`	`* @covers Facebook\WebDriver\Chrome\ChromeDriverService`
`21`	`23`	`* @covers Facebook\WebDriver\Remote\Service\DriverService`
`22`	`24`	`*/`
`23`		`-class ChromeDriverServiceTest extends \PHPUnit_Framework_TestCase`
	`25`	`+class ChromeDriverServiceTest extends TestCase`
`24`	`26`	`{`
`25`	`27`	`protected function setUp()`
`26`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,9 @@`
`16`	`16`	`namespace Facebook\WebDriver;`
`17`	`17`
`18`	`18`	`use Facebook\WebDriver\Remote\RemoteWebDriver;`
	`19`	`+use PHPUnit\Framework\BaseTestListener;`
`19`	`20`
`20`		`-class ReportSauceLabsStatusListener extends \PHPUnit_Framework_BaseTestListener`
	`21`	`+class ReportSauceLabsStatusListener extends BaseTestListener`
`21`	`22`	`{`
`22`	`23`	`public function endTest(\PHPUnit_Framework_Test $test, $time)`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,12 @@`
`15`	`15`
`16`	`16`	`namespace Facebook\WebDriver;`
`17`	`17`
	`18`	`+use PHPUnit\Framework\TestCase;`
	`19`	`+`
`18`	`20`	`/**`
`19`	`21`	`* @covers Facebook\WebDriver\Cookie`
`20`	`22`	`*/`
`21`		`-class CookieTest extends \PHPUnit_Framework_TestCase`
	`23`	`+class CookieTest extends TestCase`
`22`	`24`	`{`
`23`	`25`	`public function testShouldSetAllProperties()`
`24`	`26`	`{`
`@@ -143,7 +145,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()`
`143`	`145`	`* @param string $domain`
`144`	`146`	`* @param string $expectedMessage`
`145`	`147`	`*/`
`146`		`- public function testShouldValidateCookie($name, $value, $domain, $expectedMessage)`
	`148`	`+ public function testShouldValidateCookieOnConstruction($name, $value, $domain, $expectedMessage)`
`147`	`149`	`{`
`148`	`150`	`if ($expectedMessage) {`
`149`	`151`	`$this->expectException(\InvalidArgumentException::class);`
`@@ -154,6 +156,8 @@ public function testShouldValidateCookie($name, $value, $domain, $expectedMessag`
`154`	`156`	`if ($domain !== null) {`
`155`	`157`	`$cookie->setDomain($domain);`
`156`	`158`	`}`
	`159`	`+`
	`160`	`+ $this->assertInstanceOf(Cookie::class, $cookie);`
`157`	`161`	`}`
`158`	`162`
`159`	`163`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@`
`15`	`15`
`16`	`16`	`namespace Facebook\WebDriver\Exception;`
`17`	`17`
`18`		`-class WebDriverExceptionTest extends \PHPUnit_Framework_TestCase`
	`18`	`+use PHPUnit\Framework\TestCase;`
	`19`	`+`
	`20`	`+class WebDriverExceptionTest extends TestCase`
`19`	`21`	`{`
`20`	`22`	`public function testShouldStoreResultsOnInstantiation()`
`21`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@`
`17`	`17`
`18`	`18`	`use Facebook\WebDriver\Internal\WebDriverLocatable;`
`19`	`19`	`use Facebook\WebDriver\WebDriverMouse;`
	`20`	`+use PHPUnit\Framework\TestCase;`
`20`	`21`
`21`		`-class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase`
	`22`	`+class WebDriverButtonReleaseActionTest extends TestCase`
`22`	`23`	`{`
`23`	`24`	`/** @var WebDriverButtonReleaseAction */`
`24`	`25`	`private $webDriverButtonReleaseAction;`