Test enhancement (#26)

* fix travis setting * replace PHPUnit namespace * Test enhancement * Test enhancement
ddeboer · Jan 5, 2019 · 91281f3 · 91281f3
1 parent 496006d
commit 91281f3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 php:

diff --git a/composer.json b/composer.json
@@ -15,11 +15,11 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.6.0"
     },
     "require-dev": {
         "ext-soap": "*",
-        "phpunit/phpunit": "^4.0 || ^5.0"
+        "phpunit/phpunit": "^5.7 || ^6.5"
     },
     "suggest": {
         "ext-soap": "Required if you want to check the VAT number via VIES"

diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -5,8 +5,9 @@
 use Ddeboer\Vatin\Validator;
 use Ddeboer\Vatin\Test\Mock\Vies\Response\CheckVatResponse;
 use Ddeboer\Vatin\Vies\Client;
+use PHPUnit\Framework\TestCase;
 
-class ValidatorTest extends \PHPUnit_Framework_TestCase
+class ValidatorTest extends TestCase
 {
     private $validator;
 
@@ -57,11 +58,11 @@ public function testInvalidWithVies()
         $this->assertFalse($this->validator->isValid('NL123456789B01', true));
     }
 
-
+    /**
+     * @expectedException \Ddeboer\Vatin\Exception\ViesException
+     */
     public function testWrongConnectionThrowsException()
     {
-        $this->setExpectedException('\Ddeboer\Vatin\Exception\ViesException');
-
         $this->validator = new Validator(new Client('meh'));
         $this->validator->isValid('NL002065538B01', true);
     }

diff --git a/tests/Vies/ClientTest.php b/tests/Vies/ClientTest.php
@@ -3,15 +3,17 @@
 namespace Ddeboer\Vatin\Test\Vies;
 
 use Ddeboer\Vatin\Vies\Client;
+use Ddeboer\Vatin\Vies\Response\CheckVatResponse;
+use PHPUnit\Framework\TestCase;
 
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {
     public function testCheckVat()
     {
         $client = new Client();
         $response = $client->checkVat('NL', '123456789B01');
 
-        $this->assertInstanceOf('\Ddeboer\Vatin\Vies\Response\CheckVatResponse', $response);
+        $this->assertInstanceOf(CheckVatResponse::class, $response);
         $this->assertFalse($response->isValid());
         $this->assertEquals('NL', $response->getCountryCode());
         $this->assertEquals('123456789B01', $response->getVatNumber());