Improve assertions and TestCase class

Author: peter279k

tests/Exceptions/OpenWeatherMapExceptionTest.php

@@ -22,7 +22,7 @@
 use Cmfcmf\OpenWeatherMap\Tests\TestHttpClient;
 use Http\Factory\Guzzle\RequestFactory;
 
-class OpenWeatherMapExceptionTest extends \PHPUnit_Framework_TestCase
+class OpenWeatherMapExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string

tests/OpenWeatherMap/CurrentWeatherGroupTest.php

@@ -21,7 +21,7 @@
 use Cmfcmf\OpenWeatherMap\CurrentWeatherGroup;
 use Cmfcmf\OpenWeatherMap\Tests\FakeData;
 
-class CurrentWeatherGroupTest extends \PHPUnit_Framework_TestCase
+class CurrentWeatherGroupTest extends \PHPUnit\Framework\TestCase
 {
     protected $fakeJson;
     protected $currentWeatherGroup;

tests/OpenWeatherMap/CurrentWeatherTest.php

@@ -21,7 +21,7 @@
 use Cmfcmf\OpenWeatherMap\CurrentWeather;
 use Cmfcmf\OpenWeatherMap\Tests\FakeData;
 
-class CurrentWeatherTest extends \PHPUnit_Framework_TestCase
+class CurrentWeatherTest extends \PHPUnit\Framework\TestCase
 {
     public function testWindDirection()
     {

tests/OpenWeatherMap/WeatherForecastTest.php

@@ -21,7 +21,7 @@
 use Cmfcmf\OpenWeatherMap\Tests\FakeData;
 use Cmfcmf\OpenWeatherMap\WeatherForecast;
 
-class WeatherForecastTest extends \PHPUnit_Framework_TestCase
+class WeatherForecastTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string

tests/OpenWeatherMapTest.php

@@ -26,7 +26,7 @@
 use Http\Adapter\Guzzle6\Client as GuzzleAdapter;
 use Psr\SimpleCache\CacheInterface;
 
-class OpenWeatherMapTest extends \PHPUnit_Framework_TestCase
+class OpenWeatherMapTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string

tests/Util/CityTest.php

@@ -20,7 +20,7 @@
 
 use Cmfcmf\OpenWeatherMap\Util\City;
 
-class CityTest extends \PHPUnit_Framework_TestCase
+class CityTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider timezoneDataProvider

tests/Util/SunTest.php

@@ -20,7 +20,7 @@
 
 use Cmfcmf\OpenWeatherMap\Util\Sun;
 
-class SunTest extends \PHPUnit_Framework_TestCase
+class SunTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Sun

tests/Util/TemperatureTest.php

@@ -21,7 +21,7 @@
 use Cmfcmf\OpenWeatherMap\Util\Unit;
 use Cmfcmf\OpenWeatherMap\Util\Temperature;
 
-class TemperatureTest extends \PHPUnit_Framework_TestCase
+class TemperatureTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string

tests/Util/TimeTest.php

@@ -20,7 +20,7 @@
 
 use Cmfcmf\OpenWeatherMap\Util\Time;
 
-class TimeTest extends \PHPUnit_Framework_TestCase
+class TimeTest extends \PHPUnit\Framework\TestCase
 {
     private function createDateTime($time)
     {

tests/Util/UnitTest.php

@@ -20,7 +20,7 @@
 
 use Cmfcmf\OpenWeatherMap\Util\Unit;
 
-class UnitTest extends \PHPUnit_Framework_TestCase
+class UnitTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Unit
@@ -149,7 +149,7 @@ public function testGetFormattedWithoutUnit()
     {
         $this->givenThereIsAUnitWithValue(self::POSITIVE_INT_VALUE);
 
-        $this->assertEquals(self::POSITIVE_INT_VALUE, $this->unit->getFormatted());
+        $this->assertSame((string)self::POSITIVE_INT_VALUE, $this->unit->getFormatted());
         $this->assertEquals($this->unit->getValue(), $this->unit->getFormatted());
     }
 

tests/Util/WeatherTest.php

@@ -20,7 +20,7 @@
 
 use Cmfcmf\OpenWeatherMap\Util\Weather;
 
-class WeatherTest extends \PHPUnit_Framework_TestCase
+class WeatherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Weather