Various test fixes

Author: grimzy

phpunit.xml.dist

@@ -16,6 +16,11 @@
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
     </testsuites>
+    <listeners>
+        <listener class="\Mockery\Adapter\Phpunit\TestListener"
+                  file="vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php">
+        </listener>
+    </listeners>
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="APP_DEBUG" value="true"/>

tests/Unit/Eloquent/BuilderTest.php

@@ -9,92 +9,83 @@
 use Grimzy\LaravelSpatial\Types\Polygon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as QueryBuilder;
-use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Query\Grammars\MySqlGrammar;
 use Mockery;
 
 class BuilderTest extends BaseTestCase
 {
     protected $builder;
-
-    /**
-     * @var \Mockery\MockInterface $queryBuilder
-     */
     protected $queryBuilder;
 
     protected function setUp()
     {
         $connection = Mockery::mock(MysqlConnection::class)->makePartial();
-        $this->queryBuilder = Mockery::mock(QueryBuilder::class, [$connection])->makePartial();
+        $grammar = Mockery::mock(MySqlGrammar::class)->makePartial();
+        $this->queryBuilder = Mockery::mock(QueryBuilder::class, [$connection, $grammar]);
 
         $this->queryBuilder
             ->shouldReceive('from')
+            ->once()
             ->andReturn($this->queryBuilder);
 
-        $this->queryBuilder
-            ->shouldReceive('take')
-            ->with(1)
-            ->andReturn($this->queryBuilder);
-
-        $this->queryBuilder
-            ->shouldReceive('get')
-            ->andReturn([]);
-
         $this->builder = new Builder($this->queryBuilder);
         $this->builder->setModel(new TestBuilderModel());
     }
 
-    public function testUpdate()
+    public function testUpdatePoint()
     {
         $this->queryBuilder
             ->shouldReceive('raw')
             ->with("GeomFromText('POINT(2 1)')")
-            ->andReturn(new Expression("GeomFromText('POINT(2 1)')"));
+            ->once();
 
         $this->queryBuilder
-            ->shouldReceive('update');
-
-        $builder = Mockery::mock(Builder::class, [$this->queryBuilder])->makePartial();
-        $builder->shouldAllowMockingProtectedMethods();
-        $builder
-            ->shouldReceive('addUpdatedAtColumn')
-            ->andReturn(['point' => new Point(1, 2)]);
+            ->shouldReceive('update')
+            ->once();
 
-        $builder->update(['point' => new Point(1, 3)]);
+        $this->builder->update(['point' => new Point(1, 2)]);
     }
 
     public function testUpdateLinestring()
     {
         $this->queryBuilder
             ->shouldReceive('raw')
-            ->with("ST_GeogFromText('LINESTRING(0 0, 1 1, 2 2)')")
-            ->andReturn(new Expression("ST_GeogFromText('LINESTRING(0 0, 1 1, 2 2)')"));
+            ->with("GeomFromText('LINESTRING(0 0,1 1,2 2)')")
+            ->once();
 
         $this->queryBuilder
             ->shouldReceive('update')
-            ->andReturn(1);
+            ->once();
 
         $linestring = new LineString([new Point(0, 0), new Point(1, 1), new Point(2, 2)]);
 
-        $builder = Mockery::mock(Builder::class, [$this->queryBuilder])->makePartial();
-        $builder->shouldAllowMockingProtectedMethods();
-        $builder
-            ->shouldReceive('addUpdatedAtColumn')
-            ->andReturn(['linestring' => $linestring]);
+        $this->builder->update(['linestring' => $linestring]);
+    }
+
+    public function testUpdatePolygon()
+    {
+        $this->queryBuilder
+            ->shouldReceive('raw')
+            ->with("GeomFromText('POLYGON((0 0,1 0),(1 0,1 1),(1 1,0 0))')")
+            ->once();
+
+        $this->queryBuilder
+            ->shouldReceive('update')
+            ->once();
 
-        $builder
-            ->shouldReceive('asWKT')->with($linestring)->once();
+        $linestrings[] = new LineString([new Point(0, 0), new Point(0, 1)]);
+        $linestrings[] = new LineString([new Point(0, 1), new Point(1, 1)]);
+        $linestrings[] = new LineString([new Point(1, 1), new Point(0, 0)]);
+        $polygon = new Polygon($linestrings);
 
-        $builder->update(['linestring' => $linestring]);
+        $this->builder->update(['polygon' => $polygon]);
     }
 }
 
 class TestBuilderModel extends Model
 {
     use SpatialTrait;
 
-    protected $spatialFields = [
-        'point' => Point::class,
-        'linestring' => LineString::class,
-        'polygon' => Polygon::class
-    ];
+    public $timestamps = false;
+    protected $spatialFields = ['point', 'linestring', 'polygon'];
 }

tests/Unit/Schema/BlueprintTest.php

@@ -20,71 +20,79 @@ public function setUp()
     public function testGeometry()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('geometry', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('geometry', 'col')
+            ->once();
 
         $this->blueprint->geometry('col');
     }
 
     public function testPoint()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('point', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('point', 'col')
+            ->once();
 
         $this->blueprint->point('col');
     }
 
     public function testLinestring()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('linestring', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('linestring', 'col')
+            ->once();
 
         $this->blueprint->linestring('col');
     }
 
     public function testPolygon()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('polygon', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('polygon', 'col')
+            ->once();
 
         $this->blueprint->polygon('col');
     }
 
     public function testMultiPoint()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('multipoint', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('multipoint', 'col')
+            ->once();
 
         $this->blueprint->multipoint('col');
     }
 
     public function testMultiLineString()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('multilinestring', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('multilinestring', 'col')
+            ->once();
 
         $this->blueprint->multilinestring('col');
     }
 
     public function testMulltiPolygon()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('multipolygon', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('multipolygon', 'col')
+            ->once();
 
         $this->blueprint->multipolygon('col');
     }
 
     public function testGeometryCollection()
     {
         $this->blueprint
-            ->shouldReceive('addCommand')
-            ->with('geometrycollection', ['col', null, 2, true]);
+            ->shouldReceive('addColumn')
+            ->with('geometrycollection', 'col')
+            ->once();
 
         $this->blueprint->geometrycollection('col');
     }