Merge pull request php-webdriver#126 from cbergau/master

Add a second test suite for functional tests. Refactor RemoteWebDriver

Author: whhone

README.md

@@ -58,6 +58,8 @@ To run unit tests simply run:
 
     ./vendor/bin/phpunit -c ./tests
 
+Note: For the functional test suite, a running selenium server is required.
+
 ## MORE INFORMATION
 
 Check out the Selenium docs and wiki at http://docs.seleniumhq.org/docs/ and https://code.google.com/p/selenium/wiki

lib/remote/RemoteWebDriver.php

@@ -41,18 +41,11 @@ public static function create(
       'name' => 'newSession',
       'parameters' => array('desiredCapabilities' => $desired_capabilities),
     );
-    $response = HttpCommandExecutor::remoteExecute(
-      $command,
-      array(
-        CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
-      )
-    );
 
+    $response = static::remoteExecuteHttpCommand($timeout_in_ms, $command);
     $driver = new static();
-    $executor = new HttpCommandExecutor(
-      $url,
-      $response['sessionId']
-    );
+    $executor = static::createHttpCommandExecutor($url, $response);
+
     return $driver->setCommandExecutor($executor);
   }
 
@@ -76,6 +69,34 @@ public static function createBySessionID(
     return $driver;
   }
 
+  /**
+   * @param string $url
+   * @param array  $response
+   * @return HttpCommandExecutor
+   */
+  public static function createHttpCommandExecutor($url, $response) {
+    $executor = new HttpCommandExecutor(
+      $url,
+      $response['sessionId']
+    );
+    return $executor;
+  }
+
+  /**
+   * @param int   $timeout_in_ms
+   * @param array $command
+   * @return array
+   */
+  public static function remoteExecuteHttpCommand($timeout_in_ms, $command) {
+    $response = HttpCommandExecutor::remoteExecute(
+      $command,
+      array(
+        CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
+      )
+    );
+    return $response;
+  }
+
   /**
    * Close the current window.
    *

tests/__init__.php

@@ -1,3 +1,4 @@
 <?php
 
 require_once __DIR__ . '/../lib/__init__.php';
+require_once __DIR__ . '/functional/WebDriverTestCase.php';

tests/bootstrap.php

@@ -13,29 +13,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-require_once('__init__.php');
-
-/**
- * An example test case for php-webdriver.
- * 
- * Try running it by 
- *   '../vendor/phpunit/phpunit/phpunit.php ExampleTestCase.php'
- */
-class ExampleTestCase extends BasePHPWebDriverTestCase {
+class BaseTest extends WebDriverTestCase {
 
-  public function testTestPageTitle() {
+  public function testGetTitle() {
     $this->driver->get($this->getTestPath('index.html'));
     self::assertEquals(
       'php-webdriver test page',
       $this->driver->getTitle()
     );
   }
 
-  public function testTestPageWelcome() {
+  public function testGetText() {
     $this->driver->get($this->getTestPath('index.html'));
     self::assertEquals(
       'Welcome to the facebook/php-webdriver testing page.',
       $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
     );
   }
+
+  public function testGetById() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+      'Test by ID',
+      $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
+    );
+  }
 }

tests/ExampleTestCase.php renamed to tests/functional/BaseTest.php

@@ -13,15 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-require_once('__init__.php');
-
 /**
  * An example test case for php-webdriver.
  * 
  * Try running it by 
  *   '../vendor/phpunit/phpunit/phpunit.php ExampleTestCase.php'
  */
-class ExampleTestCase extends BasePHPWebDriverTestCase {
+class FileUploadTest extends WebDriverTestCase {
 
   public function testFileUploading() {
     $this->driver->get($this->getTestPath('upload.html'));

tests/FileUploadTestCase.php renamed to tests/functional/FileUploadTest.php

@@ -16,8 +16,9 @@
 /**
  * The base class for test cases.
  */
-class BasePHPWebDriverTestCase extends PHPUnit_Framework_TestCase {
+class WebDriverTestCase extends PHPUnit_Framework_TestCase {
 
+  /** @var RemoteWebDriver $driver */
   protected $driver;
 
   protected function setUp() {

tests/BasePHPWebDriverTestCase.php renamed to tests/functional/WebDriverTestCase.php

@@ -4,5 +4,6 @@
 </head>
 <body>
   <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
+  <p id="id_test">Test by ID</p>
 </body>
 </html>