1 files changed, 37 insertions, 27 deletions

diff --git a/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/HasChildTest.php b/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/HasChildTest.php
index bb1b5b96..a717b1ab 100644
--- a/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/HasChildTest.php
+++ b/vendor/ruflin/elastica/test/lib/Elastica/Test/Query/HasChildTest.php
@@ -1,14 +1,19 @@
 <?php
-
 namespace Elastica\Test\Query;
 
 use Elastica\Document;
+use Elastica\Query;
 use Elastica\Query\HasChild;
+use Elastica\Query\Match;
 use Elastica\Query\MatchAll;
 use Elastica\Test\Base as BaseTest;
+use Elastica\Type\Mapping;
 
 class HasChildTest extends BaseTest
 {
+    /**
+     * @group unit
+     */
     public function testToArray()
     {
         $q = new MatchAll();
@@ -20,13 +25,16 @@ class HasChildTest extends BaseTest
         $expectedArray = array(
             'has_child' => array(
                 'query' => $q->toArray(),
-                'type' => $type
-            )
+                'type' => $type,
+            ),
         );
 
         $this->assertEquals($expectedArray, $query->toArray());
     }
 
+    /**
+     * @group unit
+     */
     public function testSetScope()
     {
         $q = new MatchAll();
@@ -42,55 +50,56 @@ class HasChildTest extends BaseTest
             'has_child' => array(
                 'query' => $q->toArray(),
                 'type' => $type,
-                '_scope' => $scope
-            )
+                '_scope' => $scope,
+            ),
         );
 
         $this->assertEquals($expectedArray, $query->toArray());
     }
-    
+
+    /**
+     * @group functional
+     */
     public function testTypeInsideHasChildSearch()
     {
-        $index = $this->prepareSearchData();
-    
-        $f = new \Elastica\Query\Match();
+        $index = $this->_getTestIndex();
+
+        $f = new Match();
         $f->setField('alt.name', 'testname');
         $query = new HasChild($f, 'child');
-    
-        $searchQuery = new \Elastica\Query();
+
+        $searchQuery = new Query();
         $searchQuery->setQuery($query);
         $searchResults = $index->search($searchQuery);
-    
+
         $this->assertEquals(1, $searchResults->count());
-    
+
         $result = $searchResults->current()->getData();
         $expected = array('id' => 'parent2', 'user' => 'parent2', 'email' => 'parent2@test.com');
-    
+
         $this->assertEquals($expected, $result);
-    }    
-    
-    private function prepareSearchData()
+    }
+
+    protected function _getTestIndex()
     {
-        $client = $this->_getClient();
-        $index = $client->getIndex('has_child_test');
-        $index->create(array(), true);
-    
+        $index = $this->_createIndex('has_child_test');
+
         $parentType = $index->getType('parent');
-    
+
         $childType = $index->getType('child');
-        $childMapping = new \Elastica\Type\Mapping($childType);
+        $childMapping = new Mapping($childType);
         $childMapping->setParent('parent');
         $childMapping->send();
-    
+
         $altType = $index->getType('alt');
         $altDoc = new Document('alt1', array('name' => 'altname'));
         $altType->addDocument($altDoc);
-    
+
         $parent1 = new Document('parent1', array('id' => 'parent1', 'user' => 'parent1', 'email' => 'parent1@test.com'));
         $parentType->addDocument($parent1);
         $parent2 = new Document('parent2', array('id' => 'parent2', 'user' => 'parent2', 'email' => 'parent2@test.com'));
         $parentType->addDocument($parent2);
-    
+
         $child1 = new Document('child1', array('id' => 'child1', 'user' => 'child1', 'email' => 'child1@test.com'));
         $child1->setParent('parent1');
         $childType->addDocument($child1);
@@ -100,8 +109,9 @@ class HasChildTest extends BaseTest
         $child3 = new Document('child3', array('id' => 'child3', 'user' => 'child3', 'email' => 'child3@test.com', 'alt' => array(array('name' => 'testname'))));
         $child3->setParent('parent2');
         $childType->addDocument($child3);
-    
+
         $index->refresh();
+
         return $index;
     }
 }