1 files changed, 37 insertions, 47 deletions

diff --git a/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/BoostingTest.php b/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/BoostingTest.php
index f5af8740..8133fd37 100644
--- a/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/BoostingTest.php
+++ b/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/BoostingTest.php
@@ -1,67 +1,54 @@
 <?php
-
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
 use Elastica\Query\Boosting;
+use Elastica\Query\Term;
 use Elastica\Test\Base as BaseTest;
 
 class BoostingTest extends BaseTest
 {
     /**
-     * @var \Elastica\Index
-     */
-    protected $index;
-
-    /**
-     * @var \Elastica\Type
-     */
-    protected $type;
-
-    /*
      * @var array
      */
-    protected $sampleData;
-
-    protected function setUp()
+    protected $sampleData = array(
+        array('name' => 'Vital Lama', 'price' => 5.2),
+        array('name' => 'Vital Match', 'price' => 2.1),
+        array('name' => 'Mercury Vital', 'price' => 7.5),
+        array('name' => 'Fist Mercury', 'price' => 3.8),
+        array('name' => 'Lama Vital 2nd', 'price' => 3.2),
+    );
+
+    protected function _getTestIndex()
     {
-        parent::setUp();
-        $this->index = $this->_createIndex('test_boostingquery');
-        $this->type = $this->index->getType('test');
-        $this->type->setMapping(array(
+        $index = $this->_createIndex();
+        $type = $index->getType('test');
+        $type->setMapping(array(
             'name' => array('type' => 'string', 'index' => 'analyzed'),
-            'price' => array('type' => 'float')
+            'price' => array('type' => 'float'),
         ));
-
-        $this->sampleData = array(
-            array("name" => "Vital Lama", "price" => 5.2),
-            array("name" => "Vital Match", "price" => 2.1),
-            array("name" => "Mercury Vital", "price" => 7.5),
-            array("name" => "Fist Mercury", "price" => 3.8),
-            array("name" => "Lama Vital 2nd", "price" => 3.2)
-        );
-
-        foreach($this->sampleData as $key => $value) {
-            $this->type->addDocument(new Document($key, $value));
+        $docs = array();
+        foreach ($this->sampleData as $key => $value) {
+            $docs[] = new Document($key, $value);
         }
+        $type->addDocuments($docs);
 
-        $this->index->refresh();
-    }
+        $index->refresh();
 
-    protected function tearDown()
-    {
-        $this->index->delete();
-        parent::tearDown();
+        return $index;
     }
 
+    /**
+     * @group unit
+     */
     public function testToArray()
     {
-        $keyword = "vital";
-        $negativeKeyword = "Mercury";
+        $keyword = 'vital';
+        $negativeKeyword = 'Mercury';
 
         $query = new Boosting();
-        $positiveQuery = new \Elastica\Query\Term(array('name' => $keyword));
-        $negativeQuery = new \Elastica\Query\Term(array('name' => $negativeKeyword));
+        $positiveQuery = new Term(array('name' => $keyword));
+        $negativeQuery = new Term(array('name' => $negativeKeyword));
         $query->setPositiveQuery($positiveQuery);
         $query->setNegativeQuery($negativeQuery);
         $query->setNegativeBoost(0.3);
@@ -70,25 +57,28 @@ class BoostingTest extends BaseTest
             'boosting' => array(
                 'positive' => $positiveQuery->toArray(),
                 'negative' => $negativeQuery->toArray(),
-                'negative_boost' => 0.3
-            )
+                'negative_boost' => 0.3,
+            ),
         );
         $this->assertEquals($expected, $query->toArray());
     }
 
+    /**
+     * @group functional
+     */
     public function testNegativeBoost()
     {
-        $keyword = "vital";
-        $negativeKeyword = "mercury";
+        $keyword = 'vital';
+        $negativeKeyword = 'mercury';
 
         $query = new Boosting();
-        $positiveQuery = new \Elastica\Query\Term(array('name' => $keyword));
-        $negativeQuery = new \Elastica\Query\Term(array('name' => $negativeKeyword));
+        $positiveQuery = new Term(array('name' => $keyword));
+        $negativeQuery = new Term(array('name' => $negativeKeyword));
         $query->setPositiveQuery($positiveQuery);
         $query->setNegativeQuery($negativeQuery);
         $query->setNegativeBoost(0.2);
 
-        $response = $this->type->search($query);
+        $response = $this->_getTestIndex()->search($query);
         $results = $response->getResults();
 
         $this->assertEquals($response->getTotalHits(), 4);