- moved methods below vars

- fixed namespaces in testcases
- made morelikethis query test independent of select query test

library/Solarium/Query/MoreLikeThis/Query.php

@@ -61,6 +61,24 @@ use Solarium\Query\MoreLikeThis\RequestBuilder as RequestBuilder;
 class Query extends SelectQuery
 {
 
+    /**
+     * Default options
+     *
+     * @var array
+     */
+    protected $options = array(
+        'handler'       => 'mlt',
+        'resultclass'   => 'Solarium\Query\MoreLikeThis\Result',
+        'documentclass' => 'Solarium\Query\Select\Result\Document',
+        'query'         => '*:*',
+        'start'         => 0,
+        'rows'          => 10,
+        'fields'        => '*,score',
+        'interestingTerms' => 'none',
+        'matchinclude'  => false,
+        'stream'        => false
+    );
+
     /**
      * Get type for this query
      *
@@ -91,24 +109,6 @@ class Query extends SelectQuery
         return new ResponseParser;
     }
 
-    /**
-     * Default options
-     *
-     * @var array
-     */
-    protected $options = array(
-        'handler'       => 'mlt',
-        'resultclass'   => 'Solarium\Query\MoreLikeThis\Result',
-        'documentclass' => 'Solarium\Query\Select\Result\Document',
-        'query'         => '*:*',
-        'start'         => 0,
-        'rows'          => 10,
-        'fields'        => '*,score',
-        'interestingTerms' => 'none',
-        'matchinclude'  => false,
-        'stream'        => false
-    );
-
     /**
      * Set query stream option
      *

library/Solarium/Query/Select/ResponseParser/ResponseParser.php

@@ -47,7 +47,7 @@ use Solarium\Query\Select\Result\Result;
  * Parse select response data
  *
  * @package Solarium
- * @subpackage QueryType
+ * @subpackage Query
  */
 class ResponseParser extends BaseResponseParser
 {

library/Solarium/Query/Suggester/Query.php

@@ -56,6 +56,17 @@ use Solarium\Query\Suggester\ResponseParser;
 class Query extends BaseQuery
 {
 
+    /**
+     * Default options
+     *
+     * @var array
+     */
+    protected $options = array(
+        'handler'       => 'suggest',
+        'resultclass'   => 'Solarium\Query\Suggester\Result\Result',
+        'termclass'     => 'Solarium\Query\Suggester\Result\Term',
+    );
+
     /**
      * Get type for this query
      *
@@ -86,17 +97,6 @@ class Query extends BaseQuery
         return new ResponseParser;
     }
 
-    /**
-     * Default options
-     *
-     * @var array
-     */
-    protected $options = array(
-        'handler'       => 'suggest',
-        'resultclass'   => 'Solarium\Query\Suggester\Result\Result',
-        'termclass'     => 'Solarium\Query\Suggester\Result\Term',
-    );
-
     /**
      * Set query option
      *

library/Solarium/Query/Terms/Query.php

@@ -59,6 +59,16 @@ use Solarium\Query\Terms\ResponseParser;
 class Query extends BaseQuery
 {
 
+    /**
+     * Default options
+     *
+     * @var array
+     */
+    protected $options = array(
+        'resultclass' => 'Solarium\Query\Terms\Result',
+        'handler' => 'terms',
+    );
+
     /**
      * Get type for this query
      *
@@ -89,16 +99,6 @@ class Query extends BaseQuery
         return new ResponseParser;
     }
 
-    /**
-     * Default options
-     *
-     * @var array
-     */
-    protected $options = array(
-        'resultclass' => 'Solarium\Query\Terms\Result',
-        'handler' => 'terms',
-    );
-
     /**
      * Set the field name(s) to get the terms from
      *

tests/Solarium/Tests/Query/MoreLikeThis/QueryTest.php

@@ -33,8 +33,10 @@ namespace Solarium\Tests\Query\MoreLikeThis;
 use Solarium\Tests\Query\Select\Query\QueryTest as SelectQueryTest;
 use Solarium\Query\MoreLikeThis\Query;
 use Solarium\Core\Client\Client;
+use Solarium\Query\Select\Query\FilterQuery;
+use Solarium\Query\Select\Query\Component\MoreLikeThis;
 
-class QueryTest extends SelectQueryTest
+class QueryTest extends \PHPUnit_Framework_TestCase
 {
 
     protected $query;
@@ -59,6 +61,596 @@ class QueryTest extends SelectQueryTest
         $this->assertInstanceOf('Solarium\Query\MoreLikeThis\RequestBuilder', $this->query->getRequestBuilder());
     }
 
+    public function testSetAndGetStart()
+    {
+        $this->query->setStart(234);
+        $this->assertEquals(234, $this->query->getStart());
+    }
+
+    public function testSetAndGetQueryWithTrim()
+    {
+        $this->query->setQuery(' *:* ');
+        $this->assertEquals('*:*', $this->query->getQuery());
+    }
+
+    public function testSetAndGetQueryWithBind()
+    {
+        $this->query->setQuery('id:%1%', array(678));
+        $this->assertEquals('id:678', $this->query->getQuery());
+    }
+
+    public function testSetAndGetQueryDefaultOperator()
+    {
+        $value = Query::QUERY_OPERATOR_AND;
+
+        $this->query->setQueryDefaultOperator($value);
+        $this->assertEquals($value, $this->query->getQueryDefaultOperator());
+    }
+
+    public function testSetAndGetQueryDefaultField()
+    {
+        $value = 'mydefault';
+
+        $this->query->setQueryDefaultField($value);
+        $this->assertEquals($value, $this->query->getQueryDefaultField());
+    }
+
+    public function testSetAndGetResultClass()
+    {
+        $this->query->setResultClass('MyResult');
+        $this->assertEquals('MyResult', $this->query->getResultClass());
+    }
+
+    public function testSetAndGetDocumentClass()
+    {
+        $this->query->setDocumentClass('MyDocument');
+        $this->assertEquals('MyDocument', $this->query->getDocumentClass());
+    }
+
+    public function testSetAndGetRows()
+    {
+        $this->query->setRows(100);
+        $this->assertEquals(100, $this->query->getRows());
+    }
+
+    public function testAddField()
+    {
+        $expectedFields = $this->query->getFields();
+        $expectedFields[] = 'newfield';
+        $this->query->addField('newfield');
+        $this->assertEquals($expectedFields, $this->query->getFields());
+    }
+
+    public function testClearFields()
+    {
+        $this->query->addField('newfield');
+        $this->query->clearFields();
+        $this->assertEquals(array(), $this->query->getFields());
+    }
+
+    public function testAddFields()
+    {
+        $fields = array('field1','field2');
+
+        $this->query->clearFields();
+        $this->query->addFields($fields);
+        $this->assertEquals($fields, $this->query->getFields());
+    }
+
+    public function testAddFieldsAsStringWithTrim()
+    {
+        $this->query->clearFields();
+        $this->query->addFields('field1, field2');
+        $this->assertEquals(array('field1','field2'), $this->query->getFields());
+    }
+
+    public function testRemoveField()
+    {
+        $this->query->clearFields();
+        $this->query->addFields(array('field1','field2'));
+        $this->query->removeField('field1');
+        $this->assertEquals(array('field2'), $this->query->getFields());
+    }
+
+    public function testSetFields()
+    {
+        $this->query->clearFields();
+        $this->query->addFields(array('field1','field2'));
+        $this->query->setFields(array('field3','field4'));
+        $this->assertEquals(array('field3','field4'), $this->query->getFields());
+    }
+
+    public function testAddSort()
+    {
+        $this->query->addSort('field1', Query::SORT_DESC);
+        $this->assertEquals(
+            array('field1' => Query::SORT_DESC),
+            $this->query->getSorts()
+        );
+    }
+
+    public function testAddSorts()
+    {
+        $sorts = array(
+            'field1' => Query::SORT_DESC,
+            'field2' => Query::SORT_ASC
+        );
+
+        $this->query->addSorts($sorts);
+        $this->assertEquals(
+            $sorts,
+            $this->query->getSorts()
+        );
+    }
+
+    public function testRemoveSort()
+    {
+        $sorts = array(
+            'field1' => Query::SORT_DESC,
+            'field2' => Query::SORT_ASC
+        );
+
+        $this->query->addSorts($sorts);
+        $this->query->removeSort('field1');
+        $this->assertEquals(
+            array('field2' => Query::SORT_ASC),
+            $this->query->getSorts()
+        );
+    }
+
+    public function testRemoveInvalidSort()
+    {
+        $sorts = array(
+            'field1' => Query::SORT_DESC,
+            'field2' => Query::SORT_ASC
+        );
+
+        $this->query->addSorts($sorts);
+        $this->query->removeSort('invalidfield'); //continue silently
+        $this->assertEquals(
+            $sorts,
+            $this->query->getSorts()
+        );
+    }
+
+    public function testClearSorts()
+    {
+        $sorts = array(
+            'field1' => Query::SORT_DESC,
+            'field2' => Query::SORT_ASC
+        );
+
+        $this->query->addSorts($sorts);
+        $this->query->clearSorts();
+        $this->assertEquals(
+            array(),
+            $this->query->getSorts()
+        );
+    }
+
+    public function testSetSorts()
+    {
+        $sorts = array(
+            'field1' => Query::SORT_DESC,
+            'field2' => Query::SORT_ASC
+        );
+
+        $this->query->addSorts($sorts);
+        $this->query->setSorts(array('field3' => Query::SORT_ASC));
+        $this->assertEquals(
+            array('field3' => Query::SORT_ASC),
+            $this->query->getSorts()
+        );
+    }
+
+    public function testAddAndGetFilterQuery()
+    {
+        $fq = new FilterQuery;
+        $fq->setKey('fq1')->setQuery('category:1');
+        $this->query->addFilterQuery($fq);
+
+        $this->assertEquals(
+            $fq,
+            $this->query->getFilterQuery('fq1')
+        );
+    }
+
+    public function testAddAndGetFilterQueryWithKey()
+    {
+        $key = 'fq1';
+
+        $fq = $this->query->createFilterQuery($key, true);
+        $fq->setQuery('category:1');
+
+        $this->assertEquals(
+            $key,
+            $fq->getKey()
+        );
+
+        $this->assertEquals(
+            $fq,
+            $this->query->getFilterQuery('fq1')
+        );
+    }
+
+    public function testAddFilterQueryWithoutKey()
+    {
+        $fq = new FilterQuery;
+        $fq->setQuery('category:1');
+
+        $this->setExpectedException('Solarium\Core\Exception');
+        $this->query->addFilterQuery($fq);
+    }
+
+    public function testAddFilterQueryWithUsedKey()
+    {
+        $fq1 = new FilterQuery;
+        $fq1->setKey('fq1')->setQuery('category:1');
+
+        $fq2 = new FilterQuery;
+        $fq2->setKey('fq1')->setQuery('category:2');
+
+        $this->query->addFilterQuery($fq1);
+        $this->setExpectedException('Solarium\Core\Exception');
+        $this->query->addFilterQuery($fq2);
+    }
+
+    public function testGetInvalidFilterQuery()
+    {
+        $this->assertEquals(
+            null,
+            $this->query->getFilterQuery('invalidtag')
+        );
+    }
+
+    public function testAddFilterQueries()
+    {
+        $fq1 = new FilterQuery;
+        $fq1->setKey('fq1')->setQuery('category:1');
+
+        $fq2 = new FilterQuery;
+        $fq2->setKey('fq2')->setQuery('category:2');
+
+        $filterQueries = array('fq1' => $fq1, 'fq2' => $fq2);
+
+        $this->query->addFilterQueries($filterQueries);
+        $this->assertEquals(
+            $filterQueries,
+            $this->query->getFilterQueries()
+        );
+    }
+
+    public function testRemoveFilterQuery()
+    {
+        $fq1 = new FilterQuery;
+        $fq1->setKey('fq1')->setQuery('category:1');
+
+        $fq2 = new FilterQuery;
+        $fq2->setKey('fq2')->setQuery('category:2');
+
+        $filterQueries = array($fq1, $fq2);
+
+        $this->query->addFilterQueries($filterQueries);
+        $this->query->removeFilterQuery('fq1');
+        $this->assertEquals(
+            array('fq2' => $fq2),
+            $this->query->getFilterQueries()
+        );
+    }
+
+    public function testRemoveFilterQueryWithObjectInput()
+    {
+        $fq1 = new FilterQuery;
+        $fq1->setKey('fq1')->setQuery('category:1');
+
+        $fq2 = new FilterQuery;
+        $fq2->setKey('fq2')->setQuery('category:2');
+
+        $filterQueries = array($fq1, $fq2);
+
+        $this->query->addFilterQueries($filterQueries);
+        $this->query->removeFilterQuery($fq1);
+        $this->assertEquals(
+            array('fq2' => $fq2),
+            $this->query->getFilterQueries()
+        );
+    }
+
+    public function testRemoveInvalidFilterQuery()
+    {
+        $fq1 = new FilterQuery;
+        $fq1->setKey('fq1')->setQuery('category:1');
+
+        $fq2 = new FilterQuery;
+        $fq2->setKey('fq2')->setQuery('category:2');
+
+        $filterQueries = array('fq1' => $fq1, 'fq2' => $fq2);
+
+        $this->query->addFilterQueries($filterQueries);
+        $this->query->removeFilterQuery('fq3'); //continue silently
+        $this->assertEquals(
+            $filterQueries,
+            $this->query->getFilterQueries()
+        );
+    }
+
+    public function testClearFilterQueries()
+    {
+        $fq1 = new FilterQuery;
+        $fq1->setKey('fq1')->setQuery('category:1');
+
+        $fq2 = new FilterQuery;
+        $fq2->setKey('fq2')->setQuery('category:2');
+
+        $filterQueries = array($fq1, $fq2);
+
+        $this->query->addFilterQueries($filterQueries);
+        $this->query->clearFilterQueries();
+        $this->assertEquals(
+            array(),
+            $this->query->getFilterQueries()
+        );
+    }
+
+    public function testSetFilterQueries()
+    {
+        $fq1 = new FilterQuery;
+        $fq1->setKey('fq1')->setQuery('category:1');
+
+        $fq2 = new FilterQuery;
+        $fq2->setKey('fq2')->setQuery('category:2');
+
+        $filterQueries1 = array('fq1' => $fq1, 'fq2' => $fq2);
+
+        $this->query->addFilterQueries($filterQueries1);
+
+        $fq3 = new FilterQuery;
+        $fq3->setKey('fq3')->setQuery('category:3');
+
+        $fq4 = new FilterQuery;
+        $fq4->setKey('fq4')->setQuery('category:4');
+
+        $filterQueries2 = array('fq3' => $fq3, 'fq4' => $fq4);
+
+        $this->query->setFilterQueries($filterQueries2);
+
+        $this->assertEquals(
+            $filterQueries2,
+            $this->query->getFilterQueries()
+        );
+    }
+
+    public function testConfigMode()
+    {
+        $config = array(
+            'query'  => 'text:mykeyword',
+            'sort'   => array('score' => 'asc'),
+            'fields' => array('id','title','category'),
+            'rows'   => 100,
+            'start'  => 200,
+            'filterquery' => array(
+                array('key' => 'pub', 'tag' => array('pub'),'query' => 'published:true'),
+                'online' => array('tag' => 'onl','query' => 'online:true')
+            ),
+            'component' => array(
+                'facetset' => array(
+                    'facet' => array(
+                        array('type' => 'field', 'key' => 'categories', 'field' => 'category'),
+                        'category13' => array('type' => 'query', 'query' => 'category:13')
+                    )
+                ),
+            ),
+            'resultclass' => 'MyResultClass',
+            'documentclass' => 'MyDocumentClass',
+        );
+        $query = new Query($config);
+
+        $this->assertEquals($config['query'], $query->getQuery());
+        $this->assertEquals($config['sort'], $query->getSorts());
+        $this->assertEquals($config['fields'], $query->getFields());
+        $this->assertEquals($config['rows'], $query->getRows());
+        $this->assertEquals($config['start'], $query->getStart());
+        $this->assertEquals($config['documentclass'], $query->getDocumentClass());
+        $this->assertEquals($config['resultclass'], $query->getResultClass());
+        $this->assertEquals('published:true', $query->getFilterQuery('pub')->getQuery());
+        $this->assertEquals('online:true', $query->getFilterQuery('online')->getQuery());
+
+        $facets = $query->getFacetSet()->getFacets();
+        $this->assertEquals(
+            'category',
+            $facets['categories']->getField()
+        );
+        $this->assertEquals(
+            'category:13',
+            $facets['category13']->getQuery()
+        );
+
+        $components = $query->getComponents();
+        $this->assertEquals(1, count($components));
+        $this->assertThat(array_pop($components), $this->isInstanceOf('Solarium\Query\Select\Query\Component\FacetSet'));
+    }
+
+    public function testSetAndGetComponents()
+    {
+        $mlt = new MoreLikeThis;
+        $this->query->setComponent('mlt',$mlt);
+
+        $this->assertEquals(
+            array('mlt' => $mlt),
+            $this->query->getComponents()
+        );
+    }
+
+    public function testSetAndGetComponent()
+    {
+        $mlt = new MoreLikeThis;
+        $this->query->setComponent('mlt',$mlt);
+
+        $this->assertEquals(
+            $mlt,
+            $this->query->getComponent('mlt')
+        );
+    }
+
+    public function testGetInvalidComponent()
+    {
+        $this->assertEquals(
+            null,
+            $this->query->getComponent('invalid')
+        );
+    }
+
+    public function testGetInvalidComponentAutoload()
+    {
+        $this->setExpectedException('Solarium\Core\Exception');
+        $this->query->getComponent('invalid', true);
+    }
+
+    public function testRemoveComponent()
+    {
+        $mlt = new MoreLikeThis;
+        $this->query->setComponent('mlt',$mlt);
+
+        $this->assertEquals(
+            array('mlt' => $mlt),
+            $this->query->getComponents()
+        );
+
+        $this->query->removeComponent('mlt');
+
+        $this->assertEquals(
+            array(),
+            $this->query->getComponents()
+        );
+    }
+
+    public function testRemoveComponentWithObjectInput()
+    {
+        $mlt = new MoreLikeThis;
+        $this->query->setComponent('mlt',$mlt);
+
+        $this->assertEquals(
+            array('mlt' => $mlt),
+            $this->query->getComponents()
+        );
+
+        $this->query->removeComponent($mlt);
+
+        $this->assertEquals(
+            array(),
+            $this->query->getComponents()
+        );
+    }
+
+    public function testGetMoreLikeThis()
+    {
+        $mlt = $this->query->getMoreLikeThis();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\MoreLikeThis',
+            get_class($mlt)
+        );
+    }
+
+    public function testGetDisMax()
+    {
+        $dismax = $this->query->getDisMax();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\DisMax',
+            get_class($dismax)
+        );
+    }
+
+    public function testGetHighlighting()
+    {
+        $hlt = $this->query->getHighlighting();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\Highlighting\Highlighting',
+            get_class($hlt)
+        );
+    }
+
+    public function testGetGrouping()
+    {
+        $grouping = $this->query->getGrouping();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\Grouping',
+            get_class($grouping)
+        );
+    }
+
+    public function testRegisterComponentType()
+    {
+        $components = $this->query->getComponentTypes();
+        $components['mykey'] = 'mycomponent';
+
+        $this->query->registerComponentType('mykey','mycomponent','mybuilder','myparser');
+
+        $this->assertEquals(
+            $components,
+            $this->query->getComponentTypes()
+        );
+    }
+
+    public function testCreateFilterQuery()
+    {
+        $options = array('optionA' => 1, 'optionB' => 2);
+        $fq = $this->query->createFilterQuery($options);
+
+        // check class
+       $this->assertThat($fq, $this->isInstanceOf('Solarium\Query\Select\Query\FilterQuery'));
+
+        // check option forwarding
+        $fqOptions = $fq->getOptions();
+        $this->assertEquals(
+            $options['optionB'],
+            $fqOptions['optionB']
+        );
+    }
+
+    public function testGetSpellcheck()
+    {
+        $spellcheck = $this->query->getSpellcheck();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\Spellcheck',
+            get_class($spellcheck)
+        );
+    }
+
+    public function testGetDistributedSearch()
+    {
+        $spellcheck = $this->query->getDistributedSearch();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\DistributedSearch',
+            get_class($spellcheck)
+        );
+    }
+
+    public function testGetStats()
+    {
+        $stats = $this->query->getStats();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\Stats\Stats',
+            get_class($stats)
+        );
+    }
+
+    public function testGetDebug()
+    {
+        $stats = $this->query->getDebug();
+
+        $this->assertEquals(
+            'Solarium\Query\Select\Query\Component\Debug',
+            get_class($stats)
+        );
+    }
+
     public function testSetAndGetMatchInclude()
     {
         $value = true;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/DisMaxTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\DisMax as RequestBuilder;
 use Solarium\Query\Select\Query\Component\DisMax as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/DistributedSearchTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\DistributedSearch as RequestBuilder;
 use Solarium\Query\Select\Query\Component\DistributedSearch as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/FacetSetTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\FacetSet as RequestBuilder;
 use Solarium\Query\Select\Query\Component\FacetSet as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/GroupingTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\Grouping as RequestBuilder;
 use Solarium\Query\Select\Query\Component\Grouping as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/HighlightingTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\Highlighting as RequestBuilder;
 use Solarium\Query\Select\Query\Component\Highlighting\Highlighting as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/MoreLikeThisTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\MoreLikeThis as RequestBuilder;
 use Solarium\Query\Select\Query\Component\MoreLikeThis as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/SpellcheckTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\Spellcheck as RequestBuilder;
 use Solarium\Query\Select\Query\Component\Spellcheck as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/Component/StatsTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
+namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
 use Solarium\Query\Select\RequestBuilder\Component\Stats as RequestBuilder;
 use Solarium\Query\Select\Query\Component\Stats\Stats as Component;
 use Solarium\Core\Client\Request;

tests/Solarium/Tests/Query/Select/RequestBuilder/RequestBuilderTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\RequestBuilder;
+namespace Solarium\Tests\Query\Select\RequestBuilder;
 use Solarium\Core\Client\Request;
 use Solarium\Query\Select\Query\Query;
 use Solarium\Query\Select\Query\FilterQuery;

tests/Solarium/Tests/Query/Select/ResponseParser/Component/DebugTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
+namespace Solarium\Tests\Query\Select\ResponseParser\Component;
 use Solarium\Query\Select\ResponseParser\Component\Debug as Parser;
 use Solarium\Query\Select\Result\Debug\Detail;
 

tests/Solarium/Tests/Query/Select/ResponseParser/Component/FacetSetTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
+namespace Solarium\Tests\Query\Select\ResponseParser\Component;
 use Solarium\Query\Select\ResponseParser\Component\FacetSet as Parser;
 use Solarium\Query\Select\Query\Component\FacetSet;
 

tests/Solarium/Tests/Query/Select/ResponseParser/Component/GroupingTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
+namespace Solarium\Tests\Query\Select\ResponseParser\Component;
 use Solarium\Query\Select\Query\Component\Grouping as Component;
 use Solarium\Query\Select\Result\Grouping\Result as Result;
 use Solarium\Query\Select\ResponseParser\Component\Grouping as Parser;

tests/Solarium/Tests/Query/Select/ResponseParser/Component/HighlightingTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
+namespace Solarium\Tests\Query\Select\ResponseParser\Component;
 use Solarium\Query\Select\ResponseParser\Component\Highlighting as Parser;
 use Solarium\Query\Select\Result\Highlighting\Result;
 

tests/Solarium/Tests/Query/Select/ResponseParser/Component/MoreLikeThisTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
+namespace Solarium\Tests\Query\Select\ResponseParser\Component;
 use Solarium\Query\Select\ResponseParser\Component\MoreLikeThis as Parser;
 use Solarium\Query\Select\Query\Query;
 use Solarium\Query\Select\Result\Document;

tests/Solarium/Tests/Query/Select/ResponseParser/Component/SpellcheckTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
+namespace Solarium\Tests\Query\Select\ResponseParser\Component;
 use Solarium\Query\Select\ResponseParser\Component\Spellcheck as Parser;
 
 class SpellcheckTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/ResponseParser/Component/StatsTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
+namespace Solarium\Tests\Query\Select\ResponseParser\Component;
 use Solarium\Query\Select\ResponseParser\Component\Stats as Parser;
 
 class StatsTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/ResponseParser/ResponseParserTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\ResponseParser;
+namespace Solarium\Tests\Query\Select\ResponseParser;
 use Solarium\Query\Select\Query\Query;
 use Solarium\Query\Select\Result\FacetSet;
 use Solarium\Query\Select\ResponseParser\ResponseParser;

tests/Solarium/Tests/Query/Select/Result/Debug/DebugTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Debug;
+namespace Solarium\Tests\Query\Select\Result\Debug;
 use Solarium\Query\Select\Result\Debug\Result;
 
 class DebugTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Debug/DetailTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Debug;
+namespace Solarium\Tests\Query\Select\Result\Debug;
 use Solarium\Query\Select\Result\Debug\Detail;
 
 class DetailTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Debug/DocumentSetTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Debug;
+namespace Solarium\Tests\Query\Select\Result\Debug;
 use Solarium\Query\Select\Result\Debug\DocumentSet;
 
 class DocumentSetTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Debug/DocumentTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Debug;
+namespace Solarium\Tests\Query\Select\Result\Debug;
 use Solarium\Query\Select\Result\Debug\Document;
 
 class DocumentTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Debug/TimingPhaseTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Debug;
+namespace Solarium\Tests\Query\Select\Result\Debug;
 use Solarium\Query\Select\Result\Debug\TimingPhase;
 
 class TimingPhaseTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Debug/TimingTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Debug;
+namespace Solarium\Tests\Query\Select\Result\Debug;
 use Solarium\Query\Select\Result\Debug\Timing;
 
 class TimingTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Facet/FieldTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Facet;
+namespace Solarium\Tests\Query\Select\Result\Facet;
 use Solarium\Query\Select\Result\Facet\Field;
 
 class FieldTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Facet/MultiQueryTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Facet;
+namespace Solarium\Tests\Query\Select\Result\Facet;
 use Solarium\Query\Select\Result\Facet\MultiQuery;
 
 class MultiQueryTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Facet/QueryTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Facet;
+namespace Solarium\Tests\Query\Select\Result\Facet;
 use Solarium\Query\Select\Result\Facet\Query;
 
 class QueryTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Facet/RangeTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Facet;
+namespace Solarium\Tests\Query\Select\Result\Facet;
 use Solarium\Query\Select\Result\Facet\Range;
 
 class RangeTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/FacetSetTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result;
+namespace Solarium\Tests\Query\Select\Result;
 use Solarium\Query\Select\Result\FacetSet;
 
 class FacetSetTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Grouping/FieldGroupTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
+namespace Solarium\Tests\Query\Select\Result\Grouping;
 use Solarium\Query\Select\Result\Grouping\FieldGroup;
 
 class FieldGroupTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Grouping/GroupingTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
+namespace Solarium\Tests\Query\Select\Result\Grouping;
 use Solarium\Query\Select\Result\Grouping\Result;
 
 class GroupingTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Grouping/QueryGroupTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
+namespace Solarium\Tests\Query\Select\Result\Grouping;
 use Solarium\Query\Select\Result\Grouping\QueryGroup;
 
 class QueryGroupTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Grouping/ValueGroupTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
+namespace Solarium\Tests\Query\Select\Result\Grouping;
 use Solarium\Query\Select\Result\Grouping\ValueGroup;
 
 class ValueGroupTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Highlighting/HighlightingTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Highlighting;
+namespace Solarium\Tests\Query\Select\Result\Highlighting;
 use Solarium\Query\Select\Result\Highlighting\Highlighting;
 
 class HighlightingTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Highlighting/ResultTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Highlighting;
+namespace Solarium\Tests\Query\Select\Result\Highlighting;
 use Solarium\Query\Select\Result\Highlighting\Result;
 
 class ResultTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/MoreLikeThis/MoreLikeThisTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\MoreLikeThis;
+namespace Solarium\Tests\Query\Select\Result\MoreLikeThis;
 use Solarium\Query\Select\Result\Document;
 use Solarium\Query\Select\Result\MoreLikeThis\Result;
 use Solarium\Query\Select\Result\MoreLikeThis\MoreLikeThis;

tests/Solarium/Tests/Query/Select/Result/MoreLikeThis/ResultTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\MoreLikeThis;
+namespace Solarium\Tests\Query\Select\Result\MoreLikeThis;
 use Solarium\Query\Select\Result\Document;
 use Solarium\Query\Select\Result\MoreLikeThis\Result;
 

tests/Solarium/Tests/Query/Select/Result/ResultTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result;
+namespace Solarium\Tests\Query\Select\Result;
 use Solarium\Query\Select\Result\Document;
 use Solarium\Query\Select\Query\Query;
 use Solarium\Query\Select\Result\Result;

tests/Solarium/Tests/Query/Select/Result/Spellcheck/CollationTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Spellcheck;
+namespace Solarium\Tests\Query\Select\Result\Spellcheck;
 use Solarium\Query\Select\Result\Spellcheck\Collation;
 
 class CollationTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Spellcheck/SpellcheckTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Spellcheck;
+namespace Solarium\Tests\Query\Select\Result\Spellcheck;
 use Solarium\Query\Select\Result\Spellcheck\Result;
 
 class SpellcheckTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Spellcheck/SuggestionTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Spellcheck;
+namespace Solarium\Tests\Query\Select\Result\Spellcheck;
 use Solarium\Query\Select\Result\Spellcheck\Suggestion;
 
 class SuggestionTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Stats/FacetValueTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Stats;
+namespace Solarium\Tests\Query\Select\Result\Stats;
 use Solarium\Query\Select\Result\Stats\FacetValue;
 
 class FacetValueTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Stats/ResultTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Stats;
+namespace Solarium\Tests\Query\Select\Result\Stats;
 use Solarium\Query\Select\Result\Stats\Result;
 
 class ResultTest extends \PHPUnit_Framework_TestCase

tests/Solarium/Tests/Query/Select/Result/Stats/StatsTest.php

@@ -29,7 +29,7 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Query\Select\Query\Result\Stats;
+namespace Solarium\Tests\Query\Select\Result\Stats;
 use Solarium\Query\Select\Result\Stats\Stats;
 
 class StatsTest extends \PHPUnit_Framework_TestCase