1 files changed, 56 insertions, 19 deletions

diff --git a/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/RangeTest.php b/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/RangeTest.php
index fb5ca2fe..f96e4096 100644
--- a/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/RangeTest.php
+++ b/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/RangeTest.php
@@ -1,41 +1,78 @@
 <?php
-
 namespace Elastica\Test\Aggregation;
 
-
 use Elastica\Aggregation\Range;
 use Elastica\Document;
 use Elastica\Query;
 
 class RangeTest extends BaseAggregationTest
 {
-    protected function setUp()
+    protected function _getIndexForTest()
     {
-        parent::setUp();
-        $this->_index = $this->_createIndex('range');
-        $docs = array(
-            new Document('1', array('price' => 5)),
-            new Document('2', array('price' => 8)),
-            new Document('3', array('price' => 1)),
-            new Document('4', array('price' => 3)),
-            new Document('5', array('price' => 1.5)),
-            new Document('6', array('price' => 2)),
-        );
-        $this->_index->getType('test')->addDocuments($docs);
-        $this->_index->refresh();
+        $index = $this->_createIndex();
+
+        $index->getType('test')->addDocuments(array(
+            new Document(1, array('price' => 5)),
+            new Document(2, array('price' => 8)),
+            new Document(3, array('price' => 1)),
+            new Document(4, array('price' => 3)),
+            new Document(5, array('price' => 1.5)),
+            new Document(6, array('price' => 2)),
+        ));
+
+        $index->refresh();
+
+        return $index;
     }
 
+    /**
+     * @group functional
+     */
     public function testRangeAggregation()
     {
-        $agg = new Range("range");
-        $agg->setField("price");
+        $agg = new Range('range');
+        $agg->setField('price');
         $agg->addRange(1.5, 5);
 
         $query = new Query();
         $query->addAggregation($agg);
-        $results = $this->_index->search($query)->getAggregation("range");
+        $results = $this->_getIndexForTest()->search($query)->getAggregation('range');
 
         $this->assertEquals(2, $results['buckets'][0]['doc_count']);
     }
+
+    /**
+     * @group unit
+     */
+    public function testRangeAggregationWithKey()
+    {
+        $agg = new Range('range');
+        $agg->setField('price');
+        $agg->addRange(null, 50, 'cheap');
+        $agg->addRange(50, 100, 'average');
+        $agg->addRange(100, null, 'expensive');
+
+        $expected = array(
+            'range' => array(
+                'field' => 'price',
+                'ranges' => array(
+                    array(
+                        'to' => 50,
+                        'key' => 'cheap',
+                    ),
+                    array(
+                        'from' => 50,
+                        'to' => 100,
+                        'key' => 'average',
+                    ),
+                    array(
+                        'from' => 100,
+                        'key' => 'expensive',
+                    ),
+                ),
+            ),
+        );
+
+        $this->assertEquals($expected, $agg->toArray());
+    }
 }
- 
\ No newline at end of file