1 files changed, 40 insertions, 33 deletions

diff --git a/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/MaxTest.php b/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/MaxTest.php
index 0f5475b3..f057b81d 100644
--- a/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/MaxTest.php
+++ b/vendor/ruflin/elastica/test/lib/Elastica/Test/Aggregation/MaxTest.php
@@ -1,8 +1,6 @@
 <?php
-
 namespace Elastica\Test\Aggregation;
 
-
 use Elastica\Aggregation\Max;
 use Elastica\Document;
 use Elastica\Query;
@@ -10,63 +8,72 @@ use Elastica\Script;
 
 class MaxTest extends BaseAggregationTest
 {
-    protected function setUp()
+    protected function _getIndexForTest()
     {
-        parent::setUp();
-        $this->_index = $this->_createIndex('max');
-        $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)),
-        );
-        $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)),
+        ));
+
+        $index->refresh();
+
+        return $index;
     }
 
+    /**
+     * @group unit
+     */
     public function testToArray()
     {
         $expected = array(
-            "max" => array(
-                "field" => "price",
-                "script" => "_value * conversion_rate",
-                "params" => array(
-                    "conversion_rate" => 1.2
-                )
+            'max' => array(
+                'field' => 'price',
+                'script' => '_value * conversion_rate',
+                'params' => array(
+                    'conversion_rate' => 1.2,
+                ),
+            ),
+            'aggs' => array(
+                'subagg' => array('max' => array('field' => 'foo')),
             ),
-            "aggs" => array(
-                "subagg" => array("max" => array("field" => "foo"))
-            )
         );
 
-        $agg = new Max("min_price_in_euros");
-        $agg->setField("price");
-        $agg->setScript(new Script("_value * conversion_rate", array('conversion_rate' => 1.2)));
-        $max = new Max("subagg");
-        $max->setField("foo");
+        $agg = new Max('min_price_in_euros');
+        $agg->setField('price');
+        $agg->setScript(new Script('_value * conversion_rate', array('conversion_rate' => 1.2)));
+        $max = new Max('subagg');
+        $max->setField('foo');
         $agg->addAggregation($max);
 
         $this->assertEquals($expected, $agg->toArray());
     }
 
+    /**
+     * @group functional
+     */
     public function testMaxAggregation()
     {
-        $agg = new Max("min_price");
-        $agg->setField("price");
+        $index = $this->_getIndexForTest();
+
+        $agg = new Max('min_price');
+        $agg->setField('price');
 
         $query = new Query();
         $query->addAggregation($agg);
-        $results = $this->_index->search($query)->getAggregation("min_price");
+        $results = $index->search($query)->getAggregation('min_price');
 
         $this->assertEquals(8, $results['value']);
 
         // test using a script
-        $agg->setScript(new Script("_value * conversion_rate", array("conversion_rate" => 1.2)));
+        $agg->setScript(new Script('_value * conversion_rate', array('conversion_rate' => 1.2)));
         $query = new Query();
         $query->addAggregation($agg);
-        $results = $this->_index->search($query)->getAggregation("min_price");
+        $results = $index->search($query)->getAggregation('min_price');
 
         $this->assertEquals(8 * 1.2, $results['value']);
     }
 }
- 
\ No newline at end of file