1 files changed, 22 insertions, 21 deletions

diff --git a/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/GeoDistanceTest.php b/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/GeoDistanceTest.php
index 7fd677b1..f8a02d1d 100644
--- a/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/GeoDistanceTest.php
+++ b/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/GeoDistanceTest.php
@@ -1,8 +1,6 @@
 <?php
-
 namespace Elastica\Test\Aggregation;
 
-
 use Elastica\Aggregation\GeoDistance;
 use Elastica\Document;
 use Elastica\Query;
@@ -10,36 +8,39 @@ use Elastica\Type\Mapping;
 
 class GeoDistanceTest extends BaseAggregationTest
 {
-    protected function setUp()
+    protected function _getIndexForTest()
     {
-        parent::setUp();
-        $this->_index = $this->_createIndex("geo_distance");
-        $mapping = new Mapping();
-        $mapping->setProperties(array(
-            "location" => array("type" => "geo_point")
+        $index = $this->_createIndex();
+        $type = $index->getType('test');
+
+        $type->setMapping(new Mapping(null, array(
+            'location' => array('type' => 'geo_point'),
+        )));
+
+        $type->addDocuments(array(
+            new Document(1, array('location' => array('lat' => 32.849437, 'lon' => -117.271732))),
+            new Document(2, array('location' => array('lat' => 32.798320, 'lon' => -117.246648))),
+            new Document(3, array('location' => array('lat' => 37.782439, 'lon' => -122.392560))),
         ));
-        $type = $this->_index->getType("test");
-        $type->setMapping($mapping);
-        $docs = array(
-            new Document("1", array("location" => array("lat" => 32.849437, "lon" => -117.271732))),
-            new Document("2", array("location" => array("lat" => 32.798320, "lon" => -117.246648))),
-            new Document("3", array("location" => array("lat" => 37.782439, "lon" => -122.392560))),
-        );
-        $type->addDocuments($docs);
-        $this->_index->refresh();
+
+        $index->refresh();
+
+        return $index;
     }
 
+    /**
+     * @group functional
+     */
     public function testGeoDistanceAggregation()
     {
-        $agg = new GeoDistance("geo", "location", array("lat" => 32.804654, "lon" => -117.242594));
+        $agg = new GeoDistance('geo', 'location', array('lat' => 32.804654, 'lon' => -117.242594));
         $agg->addRange(null, 100);
-        $agg->setUnit("mi");
+        $agg->setUnit('mi');
 
         $query = new Query();
         $query->addAggregation($agg);
-        $results = $this->_index->search($query)->getAggregation("geo");
+        $results = $this->_getIndexForTest()->search($query)->getAggregation('geo');
 
         $this->assertEquals(2, $results['buckets'][0]['doc_count']);
     }
 }
- 
\ No newline at end of file