Updated DSL unit tests to meet improvements

Filter/AndFilterTest.php

@@ -20,7 +20,7 @@ class AndFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetType()
     {
-        $filter = new AndFilter('', []);
+        $filter = new AndFilter([], []);
         $result = $filter->getType();
         $this->assertEquals('and', $result);
     }
@@ -56,12 +56,10 @@ class AndFilterTest extends \PHPUnit_Framework_TestCase
                 [$mockBuildeFfirstFilter],
                 [],
                 [
-                    'filters' => [
-                        0 => [
-                            'term' => [
-                                'test_field' => [
-                                    'test_value' => 'test',
-                                ],
+                    [
+                        'term' => [
+                            'test_field' => [
+                                'test_value' => 'test',
                             ],
                         ],
                     ],
@@ -72,19 +70,17 @@ class AndFilterTest extends \PHPUnit_Framework_TestCase
                 [$mockBuildeFfirstFilter, $mockBuilderSecondFilter],
                 [],
                 [
-                    'filters' => [
-                        0 => [
-                            'term' => [
-                                'test_field' => [
-                                    'test_value' => 'test',
-                                ],
+                    [
+                        'term' => [
+                            'test_field' => [
+                                'test_value' => 'test',
                             ],
                         ],
-                        1 => [
-                            'prefix' => [
-                                'test_field' => [
-                                    'test_value' => 'test',
-                                ],
+                    ],
+                    [
+                        'prefix' => [
+                            'test_field' => [
+                                'test_value' => 'test',
                             ],
                         ],
                     ],

Filter/NotFilterTest.php

@@ -20,7 +20,7 @@ class NotFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetType()
     {
-        $filter = new NotFilter('', []);
+        $filter = new NotFilter();
         $this->assertEquals('not', $filter->getType());
     }
 

Filter/OrFilterTest.php

@@ -20,7 +20,7 @@ class OrFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetType()
     {
-        $filter = new OrFilter('', []);
+        $filter = new OrFilter();
         $result = $filter->getType();
         $this->assertEquals('or', $result);
     }
@@ -56,12 +56,10 @@ class OrFilterTest extends \PHPUnit_Framework_TestCase
                 [$mockBuilderFirstFilter],
                 [],
                 [
-                    'filters' => [
-                        0 => [
-                            'term' => [
-                                'test_field' => [
-                                    'test_value' => 'test',
-                                ],
+                    [
+                        'term' => [
+                            'test_field' => [
+                                'test_value' => 'test',
                             ],
                         ],
                     ],
@@ -72,19 +70,17 @@ class OrFilterTest extends \PHPUnit_Framework_TestCase
                 [$mockBuilderFirstFilter, $mockBuilderSecondFilter],
                 [],
                 [
-                    'filters' => [
-                        0 => [
-                            'term' => [
-                                'test_field' => [
-                                    'test_value' => 'test',
-                                ],
+                    [
+                        'term' => [
+                            'test_field' => [
+                                'test_value' => 'test',
                             ],
                         ],
-                        1 => [
-                            'prefix' => [
-                                'test_field' => [
-                                    'test_value' => 'test',
-                                ],
+                    ],
+                    [
+                        'prefix' => [
+                            'test_field' => [
+                                'test_value' => 'test',
                             ],
                         ],
                     ],

Filter/PostFilterTest.php

@@ -39,33 +39,19 @@ class PostFilterTest extends \PHPUnit_Framework_TestCase
     public function testAddFilter()
     {
         $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
-            ->setMethods(['addToBool'])
             ->disableOriginalConstructor()
             ->getMock();
-        $missingFilterMock->expects($this->once())
-            ->method('addToBool')
-            ->withAnyParameters();
+        $missingFilterMock
+            ->expects($this->once())
+            ->method('toArray')
+            ->willReturn([]);
+        $missingFilterMock
+            ->expects($this->once())
+            ->method('getType')
+            ->willReturn('test_type');
 
         $postFilter = new PostFilter();
         $postFilter->setFilter($missingFilterMock);
-        $postFilter->addFilter($missingFilterMock, 'test');
-    }
-
-    /**
-     * Test setBoolParameters method.
-     */
-    public function testSetBoolParameters()
-    {
-        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
-            ->setMethods(['setParameters'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $missingFilterMock->expects($this->once())
-            ->method('setParameters')
-            ->withAnyParameters();
-
-        $postFilter = new PostFilter();
-        $postFilter->setFilter($missingFilterMock);
-        $postFilter->setBoolParameters(['test_param']);
+        $this->assertEquals(['test_type' => []], $postFilter->toArray());
     }
 }

Query/QueryTest.php

@@ -36,14 +36,17 @@ class QueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testAddQuery()
     {
-        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+        $missingFilterMock = $this
+            ->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
             ->disableOriginalConstructor()
-            ->setMethods(['addToBool'])
+            ->setMethods(['add'])
             ->getMock();
-        $missingFilterMock->expects($this->once())
-            ->method('addToBool')
+        $missingFilterMock
+            ->expects($this->once())
+            ->method('add')
             ->withAnyParameters();
-        $postFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\PostFilter')
+        $postFilterMock = $this
+            ->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\PostFilter')
             ->disableOriginalConstructor()
             ->getMock();