Fixed up tests

duxthefux · duxthefux · commit aac0a133e861 · 2021-01-07T11:19:00.000+01:00
diff --git a/phpunit.xml b/phpunit.xml
@@ -8,8 +8,7 @@
     stopOnFailure="false"
     processIsolation="false"
     backupGlobals="false"
-    syntaxCheck="true"
->   
+>
     <testsuites>
         <testsuite name="UnitTests">
             <directory suffix="Test.php">tests/unit</directory>
@@ -20,14 +19,6 @@
         </testsuite>
     </testsuites>
     
-	<filter>
-	   <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-	</filter>
 
-    <logging>
-        <log type="coverage-html" target="./build" charset="UTF-8" highlight="false" lowUpperBound="35" highLowerBound="70"/>
-    </logging>
     
 </phpunit>
diff --git a/tests/integration/Provider/AbstractProviderTestCase.php b/tests/integration/Provider/AbstractProviderTestCase.php
@@ -2,12 +2,12 @@
 
 namespace UserAgentParserTest\Integration\Provider;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Martin Keckeis <martin.keckeis1@gmail.com>
  * @license MIT
  */
-abstract class AbstractProviderTestCase extends PHPUnit_Framework_TestCase
+abstract class AbstractProviderTestCase extends TestCase
 {
 }
diff --git a/tests/integration/Provider/Http/AbstractHttpProviderTestCase.php b/tests/integration/Provider/Http/AbstractHttpProviderTestCase.php
@@ -11,7 +11,7 @@ abstract class AbstractHttpProviderTestCase extends AbstractProviderTestCase
 {
     private $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // move tests/credentials.php.dist to tests/credentials.php
         if (!\defined('CREDENTIALS_FILE_LOADED') && file_exists('tests/credentials.php')) {
diff --git a/tests/unit/Model/BotTest.php b/tests/unit/Model/BotTest.php
@@ -2,7 +2,7 @@
 
 namespace UserAgentParserTest;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use UserAgentParser\Model\Bot;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @internal
  */
-class BotTest extends PHPUnit_Framework_TestCase
+class BotTest extends TestCase
 {
     public function testIsBot()
     {
diff --git a/tests/unit/Model/BrowserTest.php b/tests/unit/Model/BrowserTest.php
@@ -2,7 +2,7 @@
 
 namespace UserAgentParserTest;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use UserAgentParser\Model\Browser;
 use UserAgentParser\Model\Version;
 
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-class BrowserTest extends PHPUnit_Framework_TestCase
+class BrowserTest extends TestCase
 {
     public function testName()
     {
diff --git a/tests/unit/Model/DeviceTest.php b/tests/unit/Model/DeviceTest.php
@@ -2,7 +2,7 @@
 
 namespace UserAgentParserTest;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use UserAgentParser\Model\Device;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @internal
  */
-class DeviceTest extends PHPUnit_Framework_TestCase
+class DeviceTest extends TestCase
 {
     public function testModel()
     {
diff --git a/tests/unit/Model/OperatingSystemTest.php b/tests/unit/Model/OperatingSystemTest.php
@@ -2,7 +2,7 @@
 
 namespace UserAgentParserTest;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use UserAgentParser\Model\OperatingSystem;
 use UserAgentParser\Model\Version;
 
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-class OperatingSystemTest extends PHPUnit_Framework_TestCase
+class OperatingSystemTest extends TestCase
 {
     public function testName()
     {
diff --git a/tests/unit/Model/RenderingEngineTest.php b/tests/unit/Model/RenderingEngineTest.php
@@ -2,7 +2,7 @@
 
 namespace UserAgentParserTest;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use UserAgentParser\Model\RenderingEngine;
 use UserAgentParser\Model\Version;
 
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-class RenderingEngineTest extends PHPUnit_Framework_TestCase
+class RenderingEngineTest extends TestCase
 {
     public function testName()
     {
diff --git a/tests/unit/Model/UserAgentTest.php b/tests/unit/Model/UserAgentTest.php
@@ -2,7 +2,7 @@
 
 namespace UserAgentParserTest;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use UserAgentParser\Model\UserAgent;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @internal
  */
-class UserAgentTest extends PHPUnit_Framework_TestCase
+class UserAgentTest extends TestCase
 {
     public function testBrowser()
     {
diff --git a/tests/unit/Model/VersionTest.php b/tests/unit/Model/VersionTest.php
@@ -2,7 +2,7 @@
 
 namespace UserAgentParserTest;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use UserAgentParser\Model\Version;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @internal
  */
-class VersionTest extends PHPUnit_Framework_TestCase
+class VersionTest extends TestCase
 {
     public function testMajorMinorPatch()
     {
diff --git a/tests/unit/Provider/AbstractBrowscapTest.php b/tests/unit/Provider/AbstractBrowscapTest.php
@@ -273,7 +273,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('Browscap', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}$/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}$/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/AbstractProviderTestCase.php b/tests/unit/Provider/AbstractProviderTestCase.php
@@ -5,7 +5,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use UserAgentParser\Model\UserAgent;
 use UserAgentParser\Provider\AbstractProvider;
@@ -14,7 +14,7 @@
  * @author Martin Keckeis <martin.keckeis1@gmail.com>
  * @license MIT
  */
-abstract class AbstractProviderTestCase extends PHPUnit_Framework_TestCase
+abstract class AbstractProviderTestCase extends TestCase
 {
     protected function assertProviderResult($result, array $expectedResult)
     {
diff --git a/tests/unit/Provider/ChainTest.php b/tests/unit/Provider/ChainTest.php
@@ -20,14 +20,14 @@ class ChainTest extends AbstractProviderTestCase implements RequiredProviderTest
      */
     private $provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->provider = $this->getMockForAbstractClass('UserAgentParser\Provider\AbstractProvider');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 
@@ -206,6 +206,6 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('SomeProvider', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 }
diff --git a/tests/unit/Provider/DonatjUAParserTest.php b/tests/unit/Provider/DonatjUAParserTest.php
@@ -158,7 +158,7 @@ public function testProviderNameAndVersionIsInResult()
             self::$version = null;
 
             $this->assertEquals('DonatjUAParser', $result->getProviderName());
-            $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+            $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
         }
 
         /**
diff --git a/tests/unit/Provider/EndorphinTest.php b/tests/unit/Provider/EndorphinTest.php
@@ -142,7 +142,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('Endorphin', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/HandsetDetectionTest.php b/tests/unit/Provider/HandsetDetectionTest.php
@@ -179,7 +179,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('HandsetDetection', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/JenssegersAgentTest.php b/tests/unit/Provider/JenssegersAgentTest.php
@@ -145,7 +145,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('JenssegersAgent', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/PiwikDeviceDetectorTest.php b/tests/unit/Provider/PiwikDeviceDetectorTest.php
@@ -168,7 +168,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('PiwikDeviceDetector', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/SinergiBrowserDetectorTest.php b/tests/unit/Provider/SinergiBrowserDetectorTest.php
@@ -225,7 +225,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('SinergiBrowserDetector', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/UAParserTest.php b/tests/unit/Provider/UAParserTest.php
@@ -234,7 +234,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('UAParser', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/WhichBrowserTest.php b/tests/unit/Provider/WhichBrowserTest.php
@@ -146,7 +146,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('WhichBrowser', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/WootheeTest.php b/tests/unit/Provider/WootheeTest.php
@@ -189,7 +189,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('Woothee', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**
diff --git a/tests/unit/Provider/ZsxsoftTest.php b/tests/unit/Provider/ZsxsoftTest.php
@@ -185,7 +185,7 @@ public function testProviderNameAndVersionIsInResult()
         $result = $provider->parse('A real user agent...');
 
         $this->assertEquals('Zsxsoft', $result->getProviderName());
-        $this->assertRegExp('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
+        $this->assertMatchesRegularExpression('/\d{1,}\.\d{1,}/', $result->getProviderVersion());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`
`3`	`3`	`namespace UserAgentParserTest\Integration\Provider;`
`4`	`4`
`5`		`-use PHPUnit_Framework_TestCase;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* @author Martin Keckeis <martin.keckeis1@gmail.com>`
`9`	`9`	`* @license MIT`
`10`	`10`	`*/`
`11`		`-abstract class AbstractProviderTestCase extends PHPUnit_Framework_TestCase`
	`11`	`+abstract class AbstractProviderTestCase extends TestCase`
`12`	`12`	`{`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ abstract class AbstractHttpProviderTestCase extends AbstractProviderTestCase`
`11`	`11`	`{`
`12`	`12`	`private $client;`
`13`	`13`
`14`		`- protected function setUp()`
	`14`	`+ protected function setUp(): void`
`15`	`15`	`{`
`16`	`16`	`// move tests/credentials.php.dist to tests/credentials.php`
`17`	`17`	`if (!\defined('CREDENTIALS_FILE_LOADED') && file_exists('tests/credentials.php')) {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace UserAgentParserTest;`
`4`	`4`
`5`		`-use PHPUnit_Framework_TestCase;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`6`	`6`	`use UserAgentParser\Model\Bot;`
`7`	`7`
`8`	`8`	`/**`
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* @internal`
`15`	`15`	`*/`
`16`		`-class BotTest extends PHPUnit_Framework_TestCase`
	`16`	`+class BotTest extends TestCase`
`17`	`17`	`{`
`18`	`18`	`public function testIsBot()`
`19`	`19`	`{`