refactor tests

Author: robocoder

composer.json

@@ -27,14 +27,20 @@
         "ext-curl": "*"
     },
     "require-dev": {
+        "php": ">=7.1",
         "satooshi/php-coveralls": "^1.0||^2.0",
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": ">=4.8"
     },
     "autoload": {
         "psr-0": {
             "WebDriver": "lib/"
        }
     },
+    "autoload-dev": {
+        "psr-0": {
+            "Test": "test/"
+       }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.0.x-dev"

phpunit.xml.dist

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     backupGlobals               = "false"
     backupStaticAttributes      = "false"
     colors                      = "true"
@@ -10,22 +9,18 @@
     convertWarningsToExceptions = "true"
     processIsolation            = "false"
     stopOnFailure               = "false"
-    syntaxCheck                 = "false"
-    bootstrap                   = "lib/WebDriver/ClassLoader.php" >
-
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>test/Test</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>lib</directory>
-            <exclude>
-                <file>__init__.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">lib</directory>
+    </include>
+    <exclude>
+      <file>__init__.php</file>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Project Test Suite">
+      <directory suffix="Test.php">test/Test</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

test/Test/WebDriver/ChromeDriverTest.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright 2021-2021 Anthon Pang. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @package WebDriver
+ *
+ * @author Anthon Pang <apang@softwaredevelopment.ca>
+ */
+
+namespace Test\WebDriver;
+
+use Test\WebDriver\WebDriverTestBase;
+
+/**
+ * ChromeDriver
+ *
+ * @package WebDriver
+ *
+ * @group Functional
+ */
+class ChromeDriverTest extends WebDriverTestBase
+{
+    protected $testWebDriverRootUrl = 'http://localhost:9515';
+    protected $testWebDriverName    = 'chromedriver';
+}

test/Test/WebDriver/ExceptionTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2011-2017 Anthon Pang. All Rights Reserved.
  *
@@ -21,6 +22,7 @@
 
 namespace Test\WebDriver;
 
+use PHPUnit\Framework\TestCase;
 use WebDriver\Exception;
 
 /**
@@ -30,7 +32,7 @@
  *
  * @group Unit
  */
-class ExceptionTest extends \PHPUnit_Framework_TestCase
+class ExceptionTest extends TestCase
 {
     /**
      * test factory()

test/Test/WebDriver/SeleniumWebDriverTest.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright 2021-2021 Anthon Pang. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @package WebDriver
+ *
+ * @author Anthon Pang <apang@softwaredevelopment.ca>
+ */
+
+namespace Test\WebDriver;
+
+use Test\WebDriver\WebDriverTestBase;
+
+/**
+ * Selenium WebDriver
+ *
+ * @package WebDriver
+ *
+ * @group Functional
+ */
+class SeleniumWebDriverTest extends WebDriverTestBase
+{
+    protected $testWebDriverRootUrl = 'http://localhost:4444/wd/hub';
+    protected $testWebDriverName    = 'selenium';
+}