Merge branch 'mw-1.26'

1 files changed, 34 insertions, 12 deletions

diff --git a/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/IdsTest.php b/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/IdsTest.php
index d1bf901e..7b39020f 100644
--- a/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/IdsTest.php
+++ b/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/IdsTest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
@@ -11,11 +10,11 @@ class IdsTest extends BaseTest
     protected $_index;
     protected $_type;
 
-    public function setUp()
+    protected function setUp()
     {
-        $client = $this->_getClient();
-        $index = $client->getIndex('test');
-        $index->create(array(), true);
+        parent::setUp();
+
+        $index = $this->_createIndex();
 
         $type1 = $index->getType('helloworld1');
         $type2 = $index->getType('helloworld2');
@@ -38,13 +37,9 @@ class IdsTest extends BaseTest
         $this->_index = $index;
     }
 
-    public function tearDown()
-    {
-        $client = $this->_getClient();
-        $index = $client->getIndex('test');
-        $index->delete();
-    }
-
+    /**
+     * @group functional
+     */
     public function testSetIdsSearchSingle()
     {
         $query = new Ids();
@@ -55,6 +50,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(1, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testSetIdsSearchArray()
     {
         $query = new Ids();
@@ -65,6 +63,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(2, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testAddIdsSearchSingle()
     {
         $query = new Ids();
@@ -75,6 +76,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(1, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testComboIdsSearchArray()
     {
         $query = new Ids();
@@ -87,6 +91,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(3, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testSetTypeSingleSearchSingle()
     {
         $query = new Ids();
@@ -99,6 +106,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(1, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testSetTypeSingleSearchArray()
     {
         $query = new Ids();
@@ -111,6 +121,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(2, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testSetTypeSingleSearchSingleDocInOtherType()
     {
         $query = new Ids();
@@ -125,6 +138,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(0, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testSetTypeSingleSearchArrayDocInOtherType()
     {
         $query = new Ids();
@@ -139,6 +155,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(1, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testSetTypeArraySearchArray()
     {
         $query = new Ids();
@@ -151,6 +170,9 @@ class IdsTest extends BaseTest
         $this->assertEquals(2, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
     public function testSetTypeArraySearchSingle()
     {
         $query = new Ids();