adding test cases

Author: basemkhirat

tests/ESQueryTest.php renamed to ESQueryTest.php

@@ -17,7 +17,7 @@ class ESQueryTest extends PHPUnit_Framework_TestCase
     protected function defaultQueryTemplate() {
         return [
             'index' => $this->index,
-            'type' => $this->type,
+
             'body' => [
                 '_source' => [],
                 'query' => [
@@ -33,7 +33,8 @@ protected function defaultQueryTemplate() {
             'size' => 10,
             'client' => [
                 'ignore' => []
-            ]
+            ],
+            'type' => $this->type,
         ];
     }
 

tests/ESTest.php renamed to ESTest.php

@@ -1,48 +1,49 @@
 {
     "name": "basemkhirat/elasticsearch",
-
     "description": "Laravel, Lumen and Native php elasticseach query builder to build complex queries using an elegant syntax",
-
-    "keywords": ["elasticsearch", "php", "laravel", "lumen", "scout", "fulltext", "indexing",  "builder"],
-
+    "keywords": [
+        "elasticsearch",
+        "php",
+        "laravel",
+        "lumen",
+        "scout",
+        "fulltext",
+        "indexing",
+        "builder"
+    ],
     "license": "MIT",
-
     "type": "package",
-
     "homepage": "http://basemkhirat.com",
-
     "support": {
         "issues": "https://github.com/basemkhirat/elasticsearch/issues",
         "source": "http://basemkhirat.com/indexing/2016/01/07/laravel-elasticseach-query-builder.html"
     },
-
     "authors": [
         {
             "name": "basemkhirat",
             "email": "basemkhirat@gmail.com"
         }
     ],
-
     "autoload": {
-
-        "psr-4" : {
+        "psr-4": {
             "Basemkhirat\\Elasticsearch\\": "src/"
         },
-
         "files": [
             "src/helpers.php"
         ]
     },
-
+    "autoload-dev": {
+        "psr-4": {
+            "Basemkhirat\\Elasticsearch\\Tests\\": "tests/"
+        }
+    },
     "require": {
         "php": ">=5.6.6",
         "elasticsearch/elasticsearch": "^5.0",
         "illuminate/pagination": "*",
         "illuminate/support": "*"
     },
-
     "require-dev": {
         "phpunit/phpunit": "*"
     }
-
 }

composer.json

@@ -12,7 +12,7 @@
 >
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix=".php">./tests</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>

phpunit.xml

@@ -350,33 +350,37 @@ protected function getSkip()
     protected function getBody()
     {
 
-        if (count($this->must) || count($this->must_not) || count($this->filter) || count($this->sort) || count($this->_source)) {
+        $body = [];
 
-            $this->body = [
-
-                "_source" => $this->_source,
-
-                "query" => [
-
-                    "bool" => [
-
-                        "must" => $this->must,
+        if (count($this->_source)) {
+            $body["_source"] = $this->_source;
+        }
 
-                        "must_not" => $this->must_not,
+        $bool = [];
 
-                        "filter" => $this->filter
+        if (count($this->must)) {
+            $bool["must"] = $this->must;
+        }
 
-                    ]
-                ],
+        if (count($this->must_not)) {
+            $bool["must_not"] = $this->must_not;
+        }
 
-                "sort" => $this->sort,
+        if (count($this->filter)) {
+            $bool["filter"] = $this->filter;
+        }
 
-            ];
+        if (count($bool)) {
+            $body["query"]["bool"] = $bool;
+        }
 
+        if (count($this->sort)) {
+            $body["sort"] = $this->sort;
         }
 
-        return $this->body;
+        $this->body = $body;
 
+        return $body;
     }
 
 
@@ -577,7 +581,7 @@ public function whereNot($name, $operator = "=", $value = NULL)
      * @param $last_value
      * @return $this
      */
-    public function whereBetween($name, $first_value, $last_value)
+    public function whereBetween($name, $first_value, $last_value = null)
     {
 
         if (is_array($first_value) && count($first_value) == 2) {
@@ -598,7 +602,7 @@ public function whereBetween($name, $first_value, $last_value)
      * @param $last_value
      * @return $this
      */
-    public function whereNotBetween($name, $first_value, $last_value)
+    public function whereNotBetween($name, $first_value, $last_value = null)
     {
 
         if (is_array($first_value) && count($first_value) == 2) {

src/Query.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Basemkhirat\Elasticsearch\Tests;
+
+use Basemkhirat\Elasticsearch\Tests\Traits\ESQueryTrait;
+
+class DistanceTest extends \PHPUnit_Framework_TestCase
+{
+
+    use ESQueryTrait;
+
+    /**
+     * Test the distance() method.
+     * @return void
+     */
+    public function testDistanceMethod()
+    {
+        $this->assertEquals(
+            $this->getExpected("location", ['lat' => -33.8688197, 'lon' => 151.20929550000005], "10km"),
+            $this->getActual("location", ['lat' => -33.8688197, 'lon' => 151.20929550000005], "10km")
+        );
+
+        $this->assertNotEquals(
+            $this->getExpected("location", ['lat' => -33.8688197, 'lon' => 151.20929550000005], "10km"),
+            $this->getActual("location", ['lat' => -33.8688197, 'lon' => 151.20929550000005], "15km")
+        );
+    }
+
+
+    /**
+     * Get The expected results.
+     * @param $field
+     * @param $geo_point
+     * @param $distance
+     * @return array
+     */
+    protected function getExpected($field, $geo_point, $distance)
+    {
+        $query = $this->getQueryArray();
+
+        $query['body']['query']['bool']['filter'][] = [
+            'geo_distance' => [
+                $field => $geo_point,
+                'distance' => $distance
+            ]
+        ];
+
+        return $query;
+    }
+
+
+    /**
+     * Get The actual results.
+     * @param $field
+     * @param $geo_point
+     * @param $distance
+     * @return mixed
+     */
+    protected function getActual($field, $geo_point, $distance)
+    {
+        return $this->getQueryObject()->distance($field, $geo_point, $distance)->query();
+    }
+}

tests/DistanceTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Basemkhirat\Elasticsearch\Tests;
+
+use Basemkhirat\Elasticsearch\Tests\Traits\ESQueryTrait;
+
+class IgnoreTest extends \PHPUnit_Framework_TestCase
+{
+
+    use ESQueryTrait;
+
+    /**
+     * Test the ignore() method.
+     * @return void
+     */
+    public function testIgnoreMethod()
+    {
+        $this->assertEquals($this->getExpected(404), $this->getActual(404));
+        $this->assertEquals($this->getExpected(500, 404), $this->getActual(500, 404));
+    }
+
+    /**
+     * Get The expected results.
+     * @return array
+     */
+    protected function getExpected()
+    {
+        $query = $this->getQueryArray();
+
+        $query["client"]["ignore"] = func_get_args();
+
+        return $query;
+    }
+
+    /**
+     * Get The actual results.
+     * @return mixed
+     */
+    protected function getActual()
+    {
+        return $this->getQueryObject()->ignore(func_get_args())->query();
+    }
+}

tests/IgnoreTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Basemkhirat\Elasticsearch\Tests;
+
+use Basemkhirat\Elasticsearch\Tests\Traits\ESQueryTrait;
+
+class IndexTest extends \PHPUnit_Framework_TestCase
+{
+
+    use ESQueryTrait;
+
+    /**
+     * Test the index() method.
+     * @return void
+     */
+    public function testIndexMethod()
+    {
+        $this->assertEquals($this->getExpected("index_1"), $this->getActual("index_1"));
+    }
+
+
+    /**
+     * Get The expected results.
+     * @param $index
+     * @return array
+     */
+    protected function getExpected($index)
+    {
+        $query = $this->getQueryArray();
+
+        $query["index"] = $index;
+
+        return $query;
+    }
+
+
+    /**
+     * Get The actual results.
+     * @param $index
+     * @return mixed
+     */
+    protected function getActual($index)
+    {
+        return $this->getQueryObject()->index($index)->query();
+    }
+}

tests/IndexTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Basemkhirat\Elasticsearch\Tests;
+
+use Basemkhirat\Elasticsearch\Tests\Traits\ESQueryTrait;
+
+class OrderTest extends \PHPUnit_Framework_TestCase
+{
+
+    use ESQueryTrait;
+
+    /**
+     * Test the orderBy() method.
+     * @return void
+     */
+    public function testOrderByMethod()
+    {
+        $this->assertEquals($this->getExpected("created_at", "asc"), $this->getActual("created_at", "asc"));
+        $this->assertEquals($this->getExpected("_score"), $this->getActual("_score"));
+    }
+
+
+    /**
+     * Get The expected results.
+     * @param $field
+     * @param $direction
+     * @return array
+     */
+    protected function getExpected($field, $direction = "desc")
+    {
+        $query = $this->getQueryArray();
+
+        $query["body"]["sort"][] = [$field => $direction];
+
+        return $query;
+    }
+
+
+    /**
+     * Get The actual results.
+     * @param $field
+     * @param $direction
+     * @return mixed
+     */
+    protected function getActual($field, $direction = "desc")
+    {
+        return $this->getQueryObject()->orderBy($field, $direction)->query();
+    }
+}