From cb41cecb66964fe92826355e351d24656c679f57 Mon Sep 17 00:00:00 2001
From: peter279k <peter279k@gmail.com>
Date: Sat, 13 Oct 2018 18:01:50 +0800
Subject: [PATCH] Test enhancement

---
 .travis.yml                   |  5 +++--
 composer.json                 |  2 +-
 test/phpunit.xml.dist         | 13 +++++++++++++
 test/unit/ClientTest.php      |  3 ++-
 test/unit/FilesExistTest.php  |  4 +++-
 test/unit/LicenceYearTest.php |  4 +++-
 test/unit/ResponseTest.php    |  9 +++++----
 7 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 test/phpunit.xml.dist

diff --git a/.travis.yml b/.travis.yml
index 0ba5d28..6b2ce1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,15 @@
 language: php
 before_script:
 - composer install --dev --no-interaction
-- cd test/unit
 script:
-- ../../vendor/bin/phpunit . --bootstrap bootstrap.php --filter test* --coverage-clover=coverage.xml
+- vendor/bin/phpunit --configuration=test/phpunit.xml.dist --coverage-clover=coverage.xml
 after_success:
 - bash <(curl -s https://codecov.io/bash)
 php:
 - 5.6
 - 7.0
+- 7.1
+- 7.2
 env:
   global:
   - secure: eUN0huKA436uIkISu6V3yW01/gZHC6slBvlnprMPEhzclU2szH6qhWEXWS5CcOG6EEDBReqLZdNAwu+FC69KGFO9+6oW2GQQLSsfEViqFi/Ig2N0r4EBO4jLRebgq0GOfetPwQvJH27d8BCiloPy8rXBb5pskxSNw4B4bRyXHz4=
diff --git a/composer.json b/composer.json
index 5c0a3af..7957c6a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "php": ">=5.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4",
+        "phpunit/phpunit": "^5.7 || ^6.5",
         "squizlabs/php_codesniffer": "~2.0"
     },
     "autoload": {
diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist
new file mode 100644
index 0000000..a3c0314
--- /dev/null
+++ b/test/phpunit.xml.dist
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit colors="true" bootstrap="../vendor/autoload.php">
+    <testsuites>
+        <testsuite name="All">
+            <directory>.</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">../lib</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/test/unit/ClientTest.php b/test/unit/ClientTest.php
index 538b1b0..d796393 100644
--- a/test/unit/ClientTest.php
+++ b/test/unit/ClientTest.php
@@ -3,8 +3,9 @@
 namespace SendGrid\Test;
 
 use SendGrid\Client;
+use PHPUnit\Framework\TestCase;
 
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {
     /** @var MockClient */
     private $client;
diff --git a/test/unit/FilesExistTest.php b/test/unit/FilesExistTest.php
index 340167c..2898d2f 100644
--- a/test/unit/FilesExistTest.php
+++ b/test/unit/FilesExistTest.php
@@ -2,7 +2,9 @@
 
 namespace SendGrid\Test;
 
-class FilesExistTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class FilesExistTest extends TestCase
 {
     public function testFileArePresentInRepo()
     {
diff --git a/test/unit/LicenceYearTest.php b/test/unit/LicenceYearTest.php
index f81e957..4b33f3c 100644
--- a/test/unit/LicenceYearTest.php
+++ b/test/unit/LicenceYearTest.php
@@ -2,7 +2,9 @@
 
 namespace SendGrid\Test;
 
-class LicenceYearTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class LicenceYearTest extends TestCase
 {
     public function testConstructor()
     {
diff --git a/test/unit/ResponseTest.php b/test/unit/ResponseTest.php
index a4927ae..3366ec6 100644
--- a/test/unit/ResponseTest.php
+++ b/test/unit/ResponseTest.php
@@ -3,13 +3,14 @@
 namespace SendGrid\Test;
 
 use SendGrid\Response;
+use PHPUnit\Framework\TestCase;
 
-class ResponseTest extends \PHPUnit_Framework_TestCase
+class ResponseTest extends TestCase
 {
     public function testConstructor()
     {
         $response = new Response();
-        
+
         $this->assertAttributeEquals(200, 'statusCode', $response);
         $this->assertAttributeEquals('', 'body', $response);
         $this->assertAttributeEquals([], 'headers', $response);
@@ -41,11 +42,11 @@ public function testHeaders()
 
         $this->assertEquals(['Content-Type: text/html'], $response->headers());
     }
-    
+
     public function testAssociativeHeaders()
     {
         $response = new Response(null, null, ['Content-Type: text/html', 'HTTP/1.1 200 OK']);
-        
+
         $this->assertEquals(['Content-Type' => 'text/html', 'Status' => 'HTTP/1.1 200 OK'], $response->headers(true));
     }
 }