Merge pull request #140 from open-source-contributions/test_enhancement

Test enhancement
maxmind · Nov 13, 2019 · 0dd0b0e · 0dd0b0e
2 parents 172ee19 + 14d822a
commit 0dd0b0e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
     - php: 'nightly'
 
 before_install:
-  - composer install --dev -n --prefer-source
+  - composer install -n --prefer-source
   - phpenv rehash
   - "if [[ $RUN_SNYK && $SNYK_TOKEN ]]; then sudo apt-get install -y nodejs; npm install -g snyk; fi"
 

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "2.*",
-        "phpunit/phpunit": "4.* || 5.*",
+        "phpunit/phpunit": "^4.8.36 || 5.*",
         "squizlabs/php_codesniffer": "3.*"
     },
     "autoload": {

diff --git a/tests/GeoIp2/Test/Database/ReaderTest.php b/tests/GeoIp2/Test/Database/ReaderTest.php
@@ -3,11 +3,12 @@
 namespace GeoIp2\Test\Database;
 
 use GeoIp2\Database\Reader;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversNothing
  */
-class ReaderTest extends \PHPUnit_Framework_TestCase
+class ReaderTest extends TestCase
 {
     public function databaseTypes()
     {

diff --git a/tests/GeoIp2/Test/Model/CountryTest.php b/tests/GeoIp2/Test/Model/CountryTest.php
@@ -3,11 +3,12 @@
 namespace GeoIp2\Test\Model;
 
 use GeoIp2\Model\Country;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversNothing
  */
-class CountryTest extends \PHPUnit_Framework_TestCase
+class CountryTest extends TestCase
 {
     private $raw = [
         'continent' => [
@@ -34,7 +35,7 @@ class CountryTest extends \PHPUnit_Framework_TestCase
 
     private $model;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->model = new Country($this->raw, ['en']);
     }

diff --git a/tests/GeoIp2/Test/Model/InsightsTest.php b/tests/GeoIp2/Test/Model/InsightsTest.php
@@ -3,11 +3,12 @@
 namespace GeoIp2\Test\Model;
 
 use GeoIp2\Model\Insights;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversNothing
  */
-class InsightsTest extends \PHPUnit_Framework_TestCase
+class InsightsTest extends TestCase
 {
     public function testFull()
     {

diff --git a/tests/GeoIp2/Test/Model/NameTest.php b/tests/GeoIp2/Test/Model/NameTest.php
@@ -3,11 +3,12 @@
 namespace GeoIp2\Test\Model;
 
 use GeoIp2\Model\Country;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversNothing
  */
-class NameTest extends \PHPUnit_Framework_TestCase
+class NameTest extends TestCase
 {
     public $raw = [
         'continent' => [

diff --git a/tests/GeoIp2/Test/UtilTest.php b/tests/GeoIp2/Test/UtilTest.php
@@ -3,11 +3,12 @@
 namespace GeoIp2\Test;
 
 use GeoIp2\Util;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversNothing
  */
-class UtilTest extends \PHPUnit_Framework_TestCase
+class UtilTest extends TestCase
 {
     public function testCidr()
     {

diff --git a/tests/GeoIp2/Test/WebService/ClientTest.php b/tests/GeoIp2/Test/WebService/ClientTest.php
@@ -4,11 +4,12 @@
 
 use Composer\CaBundle\CaBundle;
 use MaxMind\WebService\Client as WsClient;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversNothing
  */
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {
     private $country = [
             'continent' => [