Update test to work with phpunit 8

Author: jimmypuckett

tests/Geometries/GeometryCollectionTest.php

@@ -23,7 +23,7 @@ class GeometryCollectionTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Geometries/LineStringTest.php

@@ -23,7 +23,7 @@ class LineStringTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Geometries/MultiLineStringTest.php

@@ -23,7 +23,7 @@ class MultiLineStringTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Geometries/MultiPointTest.php

@@ -23,7 +23,7 @@ class MultiPointTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Geometries/MultiPolygonTest.php

@@ -23,7 +23,7 @@ class MultiPolygonTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Geometries/PointTest.php

@@ -23,7 +23,7 @@ class PointTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Geometries/PolygonTest.php

@@ -23,7 +23,7 @@ class PolygonTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/GeometryFacadeTest.php

@@ -12,7 +12,7 @@ class GeometryFacadeTest extends TestCase
      */
     protected $facade;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/GeometryServiceProviderTest.php

@@ -41,7 +41,7 @@ class GeometryServiceProviderTest extends TestCase
      */
     protected $service_provider;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/GeometryTest.php

@@ -32,7 +32,7 @@ class GeometryTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -291,21 +291,22 @@ public function it_returns_the_wrapped_point_class_for_geoPHPs_point()
 
     /**
      * @test
-     * @group                    unit
-     * @expectedException RuntimeException
-     * @expectedExceptionMessage Call to undefined method Spinen\Geometry\Geometry::invalidMethod().
      */
     public function it_raises_exception_for_undefined_method()
     {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Call to undefined method Spinen\Geometry\Geometry::invalidMethod().');
+
         $this->geometry->invalidMethod('data');
     }
 
     /**
      * @test
-     * @expectedException InvalidArgumentException
      */
     public function it_raises_exception_when_the_data_cannot_be_converted()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $this->geo_php_mock->shouldReceive('load')
                            ->once()
                            ->withArgs([
@@ -324,19 +325,21 @@ public function it_raises_exception_when_the_data_cannot_be_converted()
 
     /**
      * @test
-     * @expectedException InvalidArgumentException
      */
     public function it_raises_exception_when_building_name_to_proxy_class_for_null_geometry()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $this->geometry->buildGeometryClassName(null);
     }
 
     /**
      * @test
-     * @expectedException RuntimeException
      */
     public function it_raises_exception_when_building_name_to_proxy_class_that_does_not_exist()
     {
+        $this->expectException(RuntimeException::class);
+
         $this->geometry->buildGeometryClassName($this->geometry);
     }
 }

tests/Support/GeometryProxyTest.php

@@ -3,6 +3,7 @@
 namespace Spinen\Geometry\Support;
 
 use Mockery;
+use RuntimeException;
 use Spinen\Geometry\TestCase;
 use stdClass;
 
@@ -23,7 +24,7 @@ class GeometryProxyTest extends TestCase
      */
     protected $mapper_mock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -41,7 +42,6 @@ private function setUpMocks()
 
     /**
      * @test
-     * @group unit
      */
     public function it_can_be_constructed()
     {
@@ -50,7 +50,6 @@ public function it_can_be_constructed()
 
     /**
      * @test
-     * @group unit
      */
     public function it_calls_count_on_geoPHP_geometry_with_the_correct_type_for_the_dynamic_to_methods()
     {
@@ -85,7 +84,6 @@ public function it_calls_count_on_geoPHP_geometry_with_the_correct_type_for_the_
 
     /**
      * @test
-     * @group
      */
     public function it_returns_the_results_of_a_method_on_the_geometry_if_method_is_not_on_proxy()
     {
@@ -101,7 +99,6 @@ public function it_returns_the_results_of_a_method_on_the_geometry_if_method_is_
 
     /**
      * @test
-     * @group unit
      */
     public function it_uses_the_geometry_when_available()
     {
@@ -117,18 +114,19 @@ public function it_uses_the_geometry_when_available()
 
     /**
      * @test
-     * @group                    unit
-     * @expectedException RuntimeException
-     * @expectedExceptionMessage Call to undefined method Spinen\Geometry\Support\GeometryProxy::invalidMethod().
      */
     public function it_raises_exception_for_undefined_method()
     {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage(
+            'Call to undefined method Spinen\Geometry\Support\GeometryProxy::invalidMethod().'
+        );
+
         $this->geometry_proxy->invalidMethod();
     }
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_json_when_casted_as_a_string()
     {
@@ -149,7 +147,6 @@ public function it_returns_the_json_when_casted_as_a_string()
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_a_cached_array()
     {
@@ -171,7 +168,6 @@ public function it_returns_a_cached_array()
 
     /**
      * @test
-     * @group unit
      */
     public function it_exposes_the_geometry_properties_as_its_own()
     {
@@ -192,11 +188,11 @@ public function it_exposes_the_geometry_properties_as_its_own()
 
     /**
      * @test
-     * @group unit
-     * @expectedException RuntimeException
      */
     public function it_raises_exception_getting_non_existing_property()
     {
+        $this->expectException(RuntimeException::class);
+
         $this->geometry_mock->shouldReceive('out')
                             ->once()
                             ->with('json')
@@ -212,7 +208,6 @@ public function it_raises_exception_getting_non_existing_property()
 
     /**
      * @test
-     * @group unit
      */
     public function it_calculates_the_acres_of_a_polygon()
     {
@@ -257,7 +252,6 @@ public function it_calculates_the_acres_of_a_polygon()
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_zero_if_polygon_does_not_have_three_points()
     {
@@ -278,7 +272,6 @@ public function it_returns_zero_if_polygon_does_not_have_three_points()
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_raw_geometry()
     {

tests/Support/TypeMapperTest.php

@@ -2,6 +2,7 @@
 
 namespace Spinen\Geometry\Support;
 
+use InvalidArgumentException;
 use Mockery;
 use Spinen\Geometry\TestCase;
 
@@ -12,7 +13,7 @@ class TypeMapperTest extends TestCase
      */
     protected $mapper;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -21,7 +22,6 @@ public function setUp()
 
     /**
      * @test
-     * @group unit
      */
     public function it_can_be_constructed()
     {
@@ -30,7 +30,6 @@ public function it_can_be_constructed()
 
     /**
      * @test
-     * @group
      */
     public function it_returns_the_expected_types()
     {
@@ -55,12 +54,12 @@ public function it_returns_the_expected_types()
 
     /**
      * @test
-     * @group                    unit
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Unknown geometry type of [InvalidType] was provided.
      */
     public function it_raises_exception_for_undefined_parse_type()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Unknown geometry type of [InvalidType] was provided.');
+
         $this->mapper->map('InvalidType');
     }
 }