Rest of tests

Author: davidpiesse

tests/Unit/Eloquent/SpatialTraitTest.php

@@ -289,8 +289,7 @@ public function testScopeDistanceSphereValueWithSelect()
         $this->assertContains("st_distance_sphere(`point`, GeomFromText('POINT(2 1)')) as distance", $q->columns[1]->getValue());
     }
 
-    public function testScopeBounding()
-    {
+    private function buildTestPolygon(){
         $point1 = new Point(1, 1);
         $point2 = new Point(1, 2);
         $linestring1 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
@@ -300,36 +299,107 @@ public function testScopeBounding()
         $point5 = new Point(2, 2);
         $point6 = new Point(1, 1);
         $linestring3 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point5, $point6]);
+        return new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2, $linestring3]);
+    }
 
-        $polygon = new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2, $linestring3]);
-        $query = TestModel::Bounding($polygon, 'point');
-
+    public function testScopeBounding()
+    {
+        $query = TestModel::Bounding($this->buildTestPolygon(), 'point');
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $this->assertContains("st_intersects(GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'), `point`)", $q->wheres[0]['sql']);
     }
 
-    public function testScopeWithin()
+    public function testScopeComparison()
     {
-        $point1 = new Point(1, 1);
-        $point2 = new Point(1, 2);
-        $linestring1 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point1, $point2]);
-        $point3 = new Point(1, 2);
-        $point4 = new Point(2, 2);
-        $linestring2 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point3, $point4]);
-        $point5 = new Point(2, 2);
-        $point6 = new Point(1, 1);
-        $linestring3 = new \Grimzy\LaravelMysqlSpatial\Types\LineString([$point5, $point6]);
+        $query = TestModel::Comparison('point',$this->buildTestPolygon(),'within');
 
-        $polygon = new \Grimzy\LaravelMysqlSpatial\Types\Polygon([$linestring1, $linestring2, $linestring3]);
-        $query = TestModel::Within('point',$polygon);
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_within(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
+
+    public function testScopeWithin()
+    {
+        $query = TestModel::Within('point',$this->buildTestPolygon());
 
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
         $this->assertNotEmpty($q->wheres);
         $this->assertContains("st_within(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
     }
+
+    public function testScopeCrosses()
+    {
+        $query = TestModel::Crosses('point',$this->buildTestPolygon());
+
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_crosses(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
+
+    public function testScopeContains()
+    {
+        $query = TestModel::Contains('point',$this->buildTestPolygon());
+
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_contains(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
+
+    public function testScopeDisjoint()
+    {
+        $query = TestModel::Disjoint('point',$this->buildTestPolygon());
+
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_disjoint(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
+
+    public function testScopeEquals()
+    {
+        $query = TestModel::Equals('point',$this->buildTestPolygon());
+
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_equals(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
+
+    public function testScopeIntersects()
+    {
+        $query = TestModel::Intersects('point',$this->buildTestPolygon());
+
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_intersects(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
+
+    public function testScopeOverlaps()
+    {
+        $query = TestModel::Overlaps('point',$this->buildTestPolygon());
+
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_overlaps(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
+
+    public function testScopeTouches()
+    {
+        $query = TestModel::Touches('point',$this->buildTestPolygon());
+
+        $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
+        $q = $query->getQuery();
+        $this->assertNotEmpty($q->wheres);
+        $this->assertContains("st_touches(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
+    }
 }
 
 class TestModel extends Model