Merge pull request #297 from robinkunde/develop

rewrote tests that inherited from other tests

library/Solarium/Plugin/MinimumScoreFilter/Document.php

@@ -104,6 +104,17 @@ class Document implements \IteratorAggregate, \Countable, \ArrayAccess
         return $this->document->__get($name);
     }
 
+    /**
+     * Forward isset call to the original document
+     *
+     * @param string $name
+     * @return boolean
+     */
+    public function __isset($name)
+    {
+        return $this->document->__isset($name);
+    }
+
     /**
      * IteratorAggregate implementation
      *

library/Solarium/QueryType/Select/Result/AbstractDocument.php

@@ -78,6 +78,20 @@ abstract class AbstractDocument implements \IteratorAggregate, \Countable, \Arra
         return $this->fields[$name];
     }
 
+    /**
+     * Check if field is set by name
+     *
+     * Magic method for checking if fields are set as properties of this document
+     * object, by field name. Also used by empty().
+     *
+     * @param  string $name
+     * @return boolean
+     */
+    public function __isset($name)
+    {
+        return isset($this->fields[$name]);
+    }
+
     /**
      * IteratorAggregate implementation
      *

tests/Solarium/Tests/Plugin/MinimumScoreFilter/DocumentTest.php

@@ -33,9 +33,9 @@ namespace Solarium\Tests\Plugin\MinimumScoreFilter;
 
 use Solarium\QueryType\Select\Result\Document;
 use Solarium\Plugin\MinimumScoreFilter\Document as FilterDocument;
-use Solarium\Tests\QueryType\Select\Result\DocumentTest as SelectDocumentTest;
+use Solarium\Tests\QueryType\Select\Result\AbstractDocumentTest;
 
-class DocumentTest extends SelectDocumentTest
+class DocumentTest extends AbstractDocumentTest
 {
     protected function setUp()
     {

tests/Solarium/Tests/Plugin/MinimumScoreFilter/QueryTest.php

@@ -32,11 +32,10 @@
 namespace Solarium\Tests\Plugin\MinimumScoreFilter;
 
 use Solarium\Plugin\MinimumScoreFilter\Query;
-use Solarium\Tests\QueryType\Select\Query\QueryTest as SelectQueryTest;
+use Solarium\Tests\QueryType\Select\Query\AbstractQueryTest;
 
-class QueryTest extends SelectQueryTest
+class QueryTest extends AbstractQueryTest
 {
-
     public function setUp()
     {
         $this->query = new Query;

tests/Solarium/Tests/Plugin/MinimumScoreFilter/ResultTest.php

@@ -34,9 +34,9 @@ namespace Solarium\Tests\Plugin\MinimumScoreFilter;
 use Solarium\Plugin\MinimumScoreFilter\Query;
 use Solarium\Plugin\MinimumScoreFilter\Result;
 use Solarium\QueryType\Select\Result\Document;
-use Solarium\Tests\QueryType\Select\Result\ResultTest as SelectResultTest;
+use Solarium\Tests\QueryType\Select\Result\AbstractResultTest;
 
-class ResultTest extends SelectResultTest
+class ResultTest extends AbstractResultTest
 {
     public function setUp()
     {

tests/Solarium/Tests/QueryType/Extract/ResultTest.php

@@ -31,10 +31,10 @@
 
 namespace Solarium\Tests\QueryType\Extract;
 
-use Solarium\Tests\QueryType\Update\ResultTest as UpdateResultTest;
 use Solarium\QueryType\Extract\Result as ExtractResult;
+use Solarium\Tests\QueryType\Update\AbstractResultTest;
 
-class ResultTest extends UpdateResultTest
+class ResultTest extends AbstractResultTest
 {
     public function setUp()
     {

tests/Solarium/Tests/QueryType/Select/Query/AbstractQueryTest.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ */
+
+namespace Solarium\Tests\QueryType\Select\Query;
+
+use Solarium\QueryType\Select\Query\Query;
+use Solarium\QueryType\Select\Query\FilterQuery;
+use Solarium\Core\Client\Client;
+use Solarium\QueryType\Select\Query\Component\MoreLikeThis;
+
+abstract class AbstractQueryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Query
+     */
+    protected $query;
+
+    public function testGetType()
+    {
+        $this->assertEquals(Client::QUERY_SELECT, $this->query->getType());
+    }
+
+    public function testGetResponseParser()
+    {
+        $this->assertInstanceOf(
+            'Solarium\QueryType\Select\ResponseParser\ResponseParser',
+            $this->query->getResponseParser()
+        );
+    }
+
+    public function testGetRequestBuilder()
+    {
+        $this->assertInstanceOf(
+            'Solarium\QueryType\Select\RequestBuilder\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\Exception\InvalidArgumentException');
+        $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\Exception\InvalidArgumentException');
+        $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',
+            'tag' => array('t1', 't2'),
+        );
+        $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\QueryType\Select\Query\Component\FacetSet')
+        );
+        $this->assertEquals(array('t1', 't2'), $query->getTags());
+    }
+
+    public function testConfigModeWithSingleValueTag()
+    {
+        $query = $query = new Query(array('tag' => 't1'));
+        $this->assertEquals(array('t1'), $query->getTags());
+    }
+
+    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 testSetAndGetComponentQueryInstance()
+    {
+        $mlt = new MoreLikeThis;
+        $this->query->setComponent('mlt', $mlt);
+
+        $this->assertEquals(
+            $this->query,
+            $this->query->getComponent('mlt')->getQueryInstance()
+        );
+    }
+
+    public function testGetInvalidComponent()
+    {
+        $this->assertEquals(
+            null,
+            $this->query->getComponent('invalid')
+        );
+    }
+
+    public function testGetInvalidComponentAutoload()
+    {
+        $this->setExpectedException('Solarium\Exception\OutOfBoundsException');
+        $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\QueryType\Select\Query\Component\MoreLikeThis',
+            get_class($mlt)
+        );
+    }
+
+    public function testGetDisMax()
+    {
+        $dismax = $this->query->getDisMax();
+
+        $this->assertEquals(
+            'Solarium\QueryType\Select\Query\Component\DisMax',
+            get_class($dismax)
+        );
+    }
+
+    public function testGetHighlighting()
+    {
+        $hlt = $this->query->getHighlighting();
+
+        $this->assertEquals(
+            'Solarium\QueryType\Select\Query\Component\Highlighting\Highlighting',
+            get_class($hlt)
+        );
+    }
+
+    public function testGetGrouping()
+    {
+        $grouping = $this->query->getGrouping();
+
+        $this->assertEquals(
+            'Solarium\QueryType\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\QueryType\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\QueryType\Select\Query\Component\Spellcheck',
+            get_class($spellcheck)
+        );
+    }
+
+    public function testGetDistributedSearch()
+    {
+        $spellcheck = $this->query->getDistributedSearch();
+
+        $this->assertEquals(
+            'Solarium\QueryType\Select\Query\Component\DistributedSearch',
+            get_class($spellcheck)
+        );
+    }
+
+    public function testGetStats()
+    {
+        $stats = $this->query->getStats();
+
+        $this->assertEquals(
+            'Solarium\QueryType\Select\Query\Component\Stats\Stats',
+            get_class($stats)
+        );
+    }
+
+    public function testGetDebug()
+    {
+        $stats = $this->query->getDebug();
+
+        $this->assertEquals(
+            'Solarium\QueryType\Select\Query\Component\Debug',
+            get_class($stats)
+        );
+    }
+
+    public function testAddTag()
+    {
+        $this->query->addTag('testtag');
+        $this->assertEquals(array('testtag'), $this->query->getTags());
+    }
+
+    public function testAddTags()
+    {
+        $this->query->addTags(array('t1', 't2'));
+        $this->assertEquals(array('t1', 't2'), $this->query->getTags());
+    }
+
+    public function testRemoveTag()
+    {
+        $this->query->addTags(array('t1', 't2'));
+        $this->query->removeTag('t1');
+        $this->assertEquals(array('t2'), $this->query->getTags());
+    }
+
+    public function testClearTags()
+    {
+        $this->query->addTags(array('t1', 't2'));
+        $this->query->clearTags();
+        $this->assertEquals(array(), $this->query->getTags());
+    }
+
+    public function testSetTags()
+    {
+        $this->query->addTags(array('t1', 't2'));
+        $this->query->setTags(array('t3', 't4'));
+        $this->assertEquals(array('t3', 't4'), $this->query->getTags());
+    }
+}

tests/Solarium/Tests/QueryType/Select/Query/QueryTest.php

@@ -32,685 +32,11 @@
 namespace Solarium\Tests\QueryType\Select\Query;
 
 use Solarium\QueryType\Select\Query\Query;
-use Solarium\QueryType\Select\Query\FilterQuery;
-use Solarium\Core\Client\Client;
-use Solarium\QueryType\Select\Query\Component\MoreLikeThis;
 
-class QueryTest extends \PHPUnit_Framework_TestCase
+class QueryTest extends AbstractQueryTest
 {
-    /**
-     * @var Query
-     */
-    protected $query;
-
     public function setUp()
     {
         $this->query = new Query;
     }
-
-    public function testGetType()
-    {
-        $this->assertEquals(Client::QUERY_SELECT, $this->query->getType());
-    }
-
-    public function testGetResponseParser()
-    {
-        $this->assertInstanceOf(
-            'Solarium\QueryType\Select\ResponseParser\ResponseParser',
-            $this->query->getResponseParser()
-        );
-    }
-
-    public function testGetRequestBuilder()
-    {
-        $this->assertInstanceOf(
-            'Solarium\QueryType\Select\RequestBuilder\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\Exception\InvalidArgumentException');
-        $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\Exception\InvalidArgumentException');
-        $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',
-            'tag' => array('t1', 't2'),
-        );
-        $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\QueryType\Select\Query\Component\FacetSet')
-        );
-        $this->assertEquals(array('t1', 't2'), $query->getTags());
-    }
-
-    public function testConfigModeWithSingleValueTag()
-    {
-        $query = $query = new Query(array('tag' => 't1'));
-        $this->assertEquals(array('t1'), $query->getTags());
-    }
-
-    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 testSetAndGetComponentQueryInstance()
-    {
-        $mlt = new MoreLikeThis;
-        $this->query->setComponent('mlt', $mlt);
-
-        $this->assertEquals(
-            $this->query,
-            $this->query->getComponent('mlt')->getQueryInstance()
-        );
-    }
-
-    public function testGetInvalidComponent()
-    {
-        $this->assertEquals(
-            null,
-            $this->query->getComponent('invalid')
-        );
-    }
-
-    public function testGetInvalidComponentAutoload()
-    {
-        $this->setExpectedException('Solarium\Exception\OutOfBoundsException');
-        $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\QueryType\Select\Query\Component\MoreLikeThis',
-            get_class($mlt)
-        );
-    }
-
-    public function testGetDisMax()
-    {
-        $dismax = $this->query->getDisMax();
-
-        $this->assertEquals(
-            'Solarium\QueryType\Select\Query\Component\DisMax',
-            get_class($dismax)
-        );
-    }
-
-    public function testGetHighlighting()
-    {
-        $hlt = $this->query->getHighlighting();
-
-        $this->assertEquals(
-            'Solarium\QueryType\Select\Query\Component\Highlighting\Highlighting',
-            get_class($hlt)
-        );
-    }
-
-    public function testGetGrouping()
-    {
-        $grouping = $this->query->getGrouping();
-
-        $this->assertEquals(
-            'Solarium\QueryType\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\QueryType\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\QueryType\Select\Query\Component\Spellcheck',
-            get_class($spellcheck)
-        );
-    }
-
-    public function testGetDistributedSearch()
-    {
-        $spellcheck = $this->query->getDistributedSearch();
-
-        $this->assertEquals(
-            'Solarium\QueryType\Select\Query\Component\DistributedSearch',
-            get_class($spellcheck)
-        );
-    }
-
-    public function testGetStats()
-    {
-        $stats = $this->query->getStats();
-
-        $this->assertEquals(
-            'Solarium\QueryType\Select\Query\Component\Stats\Stats',
-            get_class($stats)
-        );
-    }
-
-    public function testGetDebug()
-    {
-        $stats = $this->query->getDebug();
-
-        $this->assertEquals(
-            'Solarium\QueryType\Select\Query\Component\Debug',
-            get_class($stats)
-        );
-    }
-
-    public function testAddTag()
-    {
-        $this->query->addTag('testtag');
-        $this->assertEquals(array('testtag'), $this->query->getTags());
-    }
-
-    public function testAddTags()
-    {
-        $this->query->addTags(array('t1', 't2'));
-        $this->assertEquals(array('t1', 't2'), $this->query->getTags());
-    }
-
-    public function testRemoveTag()
-    {
-        $this->query->addTags(array('t1', 't2'));
-        $this->query->removeTag('t1');
-        $this->assertEquals(array('t2'), $this->query->getTags());
-    }
-
-    public function testClearTags()
-    {
-        $this->query->addTags(array('t1', 't2'));
-        $this->query->clearTags();
-        $this->assertEquals(array(), $this->query->getTags());
-    }
-
-    public function testSetTags()
-    {
-        $this->query->addTags(array('t1', 't2'));
-        $this->query->setTags(array('t3', 't4'));
-        $this->assertEquals(array('t3', 't4'), $this->query->getTags());
-    }
 }

tests/Solarium/Tests/QueryType/Select/Result/AbstractDocumentTest.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ */
+
+namespace Solarium\Tests\QueryType\Select\Result;
+
+abstract class AbstractDocumentTest extends \PHPUnit_Framework_TestCase
+{
+    protected $doc;
+
+    protected $fields = array(
+        'id' => 123,
+        'name' => 'Test document',
+        'categories' => array(1, 2, 3),
+        'empty_field' => '',
+    );
+
+    public function testGetFields()
+    {
+        $this->assertEquals($this->fields, $this->doc->getFields());
+    }
+
+    public function testGetFieldAsProperty()
+    {
+        $this->assertEquals(
+            $this->fields['categories'],
+            $this->doc->categories
+        );
+
+        $this->assertEquals(
+            null,
+            $this->doc->invalidfieldname
+        );
+    }
+
+    public function testPropertyIsset()
+    {
+        $this->assertTrue(
+            isset($this->doc->categories)
+        );
+
+        $this->assertFalse(
+            isset($this->doc->invalidfieldname)
+        );
+    }
+
+    public function testPropertyEmpty()
+    {
+        $this->assertTrue(
+            empty($this->doc->empty_field)
+        );
+
+        $this->assertFalse(
+            empty($this->doc->categories)
+        );
+    }
+
+    public function testSetField()
+    {
+        $this->setExpectedException('Solarium\Exception\RuntimeException');
+        $this->doc->newField = 'new value';
+    }
+
+    public function testIterator()
+    {
+        $fields = array();
+        foreach ($this->doc as $key => $field) {
+            $fields[$key] = $field;
+        }
+
+        $this->assertEquals($this->fields, $fields);
+    }
+
+    public function testArrayGet()
+    {
+        $this->assertEquals(
+            $this->fields['categories'],
+            $this->doc['categories']
+        );
+
+        $this->assertEquals(
+            null,
+            $this->doc['invalidfieldname']
+        );
+    }
+
+    public function testArrayIsset()
+    {
+        $this->assertTrue(
+            isset($this->doc['categories'])
+        );
+
+        $this->assertFalse(
+            isset($this->doc['invalidfieldname'])
+        );
+    }
+
+    public function testArrayEmpty()
+    {
+        $this->assertTrue(
+            empty($this->doc['empty_field'])
+        );
+
+        $this->assertFalse(
+            empty($this->doc['categories'])
+        );
+    }
+
+    public function testArraySet()
+    {
+        $this->setExpectedException('Solarium\Exception\RuntimeException');
+        $this->doc['newField'] = 'new value';
+    }
+
+    public function testArrayUnset()
+    {
+        $this->setExpectedException('Solarium\Exception\RuntimeException');
+        unset($this->doc['newField']);
+    }
+
+    public function testCount()
+    {
+        $this->assertEquals(count($this->fields), count($this->doc));
+    }
+}

tests/Solarium/Tests/QueryType/Select/Result/AbstractResultTest.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ */
+
+namespace Solarium\Tests\QueryType\Select\Result;
+
+use Solarium\QueryType\Select\Result\Document;
+use Solarium\QueryType\Select\Query\Query;
+use Solarium\QueryType\Select\Result\Result;
+
+abstract class AbstractResultTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var SelectDummy
+     */
+    protected $result;
+
+    protected $numFound;
+    protected $maxScore;
+    protected $docs;
+    protected $components;
+    protected $facetSet;
+    protected $moreLikeThis;
+    protected $highlighting;
+    protected $grouping;
+    protected $stats;
+    protected $debug;
+    protected $spellcheck;
+
+    public function setUp()
+    {
+        $this->numFound = 11;
+        $this->maxScore = 0.91;
+
+        $this->docs = array(
+            new Document(array('id'=>1, 'title'=>'doc1')),
+            new Document(array('id'=>1, 'title'=>'doc1')),
+        );
+
+        $this->facetSet = 'dummy-facetset-value';
+        $this->moreLikeThis = 'dummy-facetset-value';
+        $this->highlighting = 'dummy-highlighting-value';
+        $this->grouping = 'dummy-grouping-value';
+        $this->spellcheck = 'dummy-grouping-value';
+        $this->stats = 'dummy-stats-value';
+        $this->debug = 'dummy-debug-value';
+
+        $this->components = array(
+            Query::COMPONENT_FACETSET => $this->facetSet,
+            Query::COMPONENT_MORELIKETHIS => $this->moreLikeThis,
+            Query::COMPONENT_HIGHLIGHTING => $this->highlighting,
+            Query::COMPONENT_GROUPING => $this->grouping,
+            Query::COMPONENT_SPELLCHECK => $this->spellcheck,
+            Query::COMPONENT_STATS => $this->stats,
+            Query::COMPONENT_DEBUG => $this->debug,
+        );
+
+        $this->result = new SelectDummy(1, 12, $this->numFound, $this->maxScore, $this->docs, $this->components);
+    }
+
+    public function testGetNumFound()
+    {
+        $this->assertEquals($this->numFound, $this->result->getNumFound());
+    }
+
+    public function testGetMaxScore()
+    {
+        $this->assertEquals($this->maxScore, $this->result->getMaxScore());
+    }
+
+    public function testGetDocuments()
+    {
+        $this->assertEquals($this->docs, $this->result->getDocuments());
+    }
+
+    public function testGetFacetSet()
+    {
+        $this->assertEquals($this->facetSet, $this->result->getFacetSet());
+    }
+
+    public function testCount()
+    {
+        $this->assertEquals(count($this->docs), count($this->result));
+    }
+
+    public function testGetComponents()
+    {
+        $this->assertEquals($this->components, $this->result->getComponents());
+    }
+
+    public function testGetComponent()
+    {
+        $this->assertEquals(
+            $this->components[Query::COMPONENT_MORELIKETHIS],
+            $this->result->getComponent(Query::COMPONENT_MORELIKETHIS)
+        );
+    }
+
+    public function testGetInvalidComponent()
+    {
+        $this->assertEquals(
+            null,
+            $this->result->getComponent('invalid')
+        );
+    }
+
+    public function testGetMoreLikeThis()
+    {
+        $this->assertEquals(
+            $this->components[Query::COMPONENT_MORELIKETHIS],
+            $this->result->getMoreLikeThis()
+        );
+    }
+
+    public function testGetHighlighting()
+    {
+        $this->assertEquals(
+            $this->components[Query::COMPONENT_HIGHLIGHTING],
+            $this->result->getHighlighting()
+        );
+    }
+
+    public function testGetGrouping()
+    {
+        $this->assertEquals(
+            $this->components[Query::COMPONENT_GROUPING],
+            $this->result->getGrouping()
+        );
+    }
+
+    public function testGetSpellcheck()
+    {
+        $this->assertEquals(
+            $this->components[Query::COMPONENT_SPELLCHECK],
+            $this->result->getSpellcheck()
+        );
+    }
+
+    public function testGetStats()
+    {
+        $this->assertEquals(
+            $this->components[Query::COMPONENT_STATS],
+            $this->result->getStats()
+        );
+    }
+
+    public function testGetDebug()
+    {
+        $this->assertEquals(
+            $this->components[Query::COMPONENT_DEBUG],
+            $this->result->getDebug()
+        );
+    }
+
+    public function testIterator()
+    {
+        $docs = array();
+        foreach ($this->result as $key => $doc) {
+            $docs[$key] = $doc;
+        }
+
+        $this->assertEquals($this->docs, $docs);
+    }
+
+    public function testGetStatus()
+    {
+        $this->assertEquals(
+            1,
+            $this->result->getStatus()
+        );
+    }
+
+    public function testGetQueryTime()
+    {
+        $this->assertEquals(
+            12,
+            $this->result->getQueryTime()
+        );
+    }
+}
+
+class SelectDummy extends Result
+{
+    protected $parsed = true;
+
+    public function __construct($status, $queryTime, $numfound, $maxscore, $docs, $components)
+    {
+        $this->numfound = $numfound;
+        $this->maxscore = $maxscore;
+        $this->documents = $docs;
+        $this->components = $components;
+        $this->queryTime = $queryTime;
+        $this->status = $status;
+    }
+}

tests/Solarium/Tests/QueryType/Select/Result/DocumentTest.php

@@ -33,102 +33,10 @@ namespace Solarium\Tests\QueryType\Select\Result;
 
 use Solarium\QueryType\Select\Result\Document;
 
-class DocumentTest extends \PHPUnit_Framework_TestCase
+class DocumentTest extends AbstractDocumentTest
 {
-    protected $doc;
-
-    protected $fields = array(
-        'id' => 123,
-        'name' => 'Test document',
-        'categories' => array(1, 2, 3)
-    );
-
     protected function setUp()
     {
         $this->doc = new Document($this->fields);
     }
-
-    public function testGetFields()
-    {
-        $this->assertEquals($this->fields, $this->doc->getFields());
-    }
-
-    public function testGetFieldAsProperty()
-    {
-        $this->assertEquals(
-            $this->fields['categories'],
-            $this->doc->categories
-        );
-    }
-
-    public function testGetInvalidFieldAsProperty()
-    {
-        $this->assertEquals(
-            null,
-            $this->doc->invalidfieldname
-        );
-    }
-
-    public function testSetField()
-    {
-        $this->setExpectedException('Solarium\Exception\RuntimeException');
-        $this->doc->newField = 'new value';
-    }
-
-    public function testIterator()
-    {
-        $fields = array();
-        foreach ($this->doc as $key => $field) {
-            $fields[$key] = $field;
-        }
-
-        $this->assertEquals($this->fields, $fields);
-    }
-
-    public function testArrayGet()
-    {
-        $this->assertEquals(
-            $this->fields['categories'],
-            $this->doc['categories']
-        );
-    }
-
-    public function testArrayGetInvalidField()
-    {
-        $this->assertEquals(
-            null,
-            $this->doc['invalidfield']
-        );
-    }
-
-    public function testArrayIsset()
-    {
-        $this->assertTrue(
-            isset($this->doc['categories'])
-        );
-    }
-
-    public function testArrayIssetInvalidField()
-    {
-        $this->assertFalse(
-            isset($this->doc['invalidfield'])
-        );
-    }
-
-    public function testArraySet()
-    {
-        $this->setExpectedException('Solarium\Exception\RuntimeException');
-        $this->doc['newField'] = 'new value';
-    }
-
-    public function testArrayUnset()
-    {
-        $this->setExpectedException('Solarium\Exception\RuntimeException');
-        unset($this->doc['newField']);
-    }
-
-    public function testCount()
-    {
-        $this->assertEquals(count($this->fields), count($this->doc));
-    }
 }

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

@@ -31,192 +31,10 @@
 
 namespace Solarium\Tests\QueryType\Select\Result;
 
-use Solarium\QueryType\Select\Result\Document;
-use Solarium\QueryType\Select\Query\Query;
-use Solarium\QueryType\Select\Result\Result;
-
-class ResultTest extends \PHPUnit_Framework_TestCase
+class ResultTest extends AbstractResultTest
 {
-    /**
-     * @var SelectDummy
-     */
-    protected $result;
-
-    protected $numFound;
-    protected $maxScore;
-    protected $docs;
-    protected $components;
-    protected $facetSet;
-    protected $moreLikeThis;
-    protected $highlighting;
-    protected $grouping;
-    protected $stats;
-    protected $debug;
-    protected $spellcheck;
-
     public function setUp()
     {
-        $this->numFound = 11;
-        $this->maxScore = 0.91;
-
-        $this->docs = array(
-            new Document(array('id'=>1, 'title'=>'doc1')),
-            new Document(array('id'=>1, 'title'=>'doc1')),
-        );
-
-        $this->facetSet = 'dummy-facetset-value';
-        $this->moreLikeThis = 'dummy-facetset-value';
-        $this->highlighting = 'dummy-highlighting-value';
-        $this->grouping = 'dummy-grouping-value';
-        $this->spellcheck = 'dummy-grouping-value';
-        $this->stats = 'dummy-stats-value';
-        $this->debug = 'dummy-debug-value';
-
-        $this->components = array(
-            Query::COMPONENT_FACETSET => $this->facetSet,
-            Query::COMPONENT_MORELIKETHIS => $this->moreLikeThis,
-            Query::COMPONENT_HIGHLIGHTING => $this->highlighting,
-            Query::COMPONENT_GROUPING => $this->grouping,
-            Query::COMPONENT_SPELLCHECK => $this->spellcheck,
-            Query::COMPONENT_STATS => $this->stats,
-            Query::COMPONENT_DEBUG => $this->debug,
-        );
-
-        $this->result = new SelectDummy(1, 12, $this->numFound, $this->maxScore, $this->docs, $this->components);
-    }
-
-    public function testGetNumFound()
-    {
-        $this->assertEquals($this->numFound, $this->result->getNumFound());
-    }
-
-    public function testGetMaxScore()
-    {
-        $this->assertEquals($this->maxScore, $this->result->getMaxScore());
-    }
-
-    public function testGetDocuments()
-    {
-        $this->assertEquals($this->docs, $this->result->getDocuments());
-    }
-
-    public function testGetFacetSet()
-    {
-        $this->assertEquals($this->facetSet, $this->result->getFacetSet());
-    }
-
-    public function testCount()
-    {
-        $this->assertEquals(count($this->docs), count($this->result));
-    }
-
-    public function testGetComponents()
-    {
-        $this->assertEquals($this->components, $this->result->getComponents());
-    }
-
-    public function testGetComponent()
-    {
-        $this->assertEquals(
-            $this->components[Query::COMPONENT_MORELIKETHIS],
-            $this->result->getComponent(Query::COMPONENT_MORELIKETHIS)
-        );
-    }
-
-    public function testGetInvalidComponent()
-    {
-        $this->assertEquals(
-            null,
-            $this->result->getComponent('invalid')
-        );
-    }
-
-    public function testGetMoreLikeThis()
-    {
-        $this->assertEquals(
-            $this->components[Query::COMPONENT_MORELIKETHIS],
-            $this->result->getMoreLikeThis()
-        );
-    }
-
-    public function testGetHighlighting()
-    {
-        $this->assertEquals(
-            $this->components[Query::COMPONENT_HIGHLIGHTING],
-            $this->result->getHighlighting()
-        );
-    }
-
-    public function testGetGrouping()
-    {
-        $this->assertEquals(
-            $this->components[Query::COMPONENT_GROUPING],
-            $this->result->getGrouping()
-        );
-    }
-
-    public function testGetSpellcheck()
-    {
-        $this->assertEquals(
-            $this->components[Query::COMPONENT_SPELLCHECK],
-            $this->result->getSpellcheck()
-        );
-    }
-
-    public function testGetStats()
-    {
-        $this->assertEquals(
-            $this->components[Query::COMPONENT_STATS],
-            $this->result->getStats()
-        );
-    }
-
-    public function testGetDebug()
-    {
-        $this->assertEquals(
-            $this->components[Query::COMPONENT_DEBUG],
-            $this->result->getDebug()
-        );
-    }
-
-    public function testIterator()
-    {
-        $docs = array();
-        foreach ($this->result as $key => $doc) {
-            $docs[$key] = $doc;
-        }
-
-        $this->assertEquals($this->docs, $docs);
-    }
-
-    public function testGetStatus()
-    {
-        $this->assertEquals(
-            1,
-            $this->result->getStatus()
-        );
-    }
-
-    public function testGetQueryTime()
-    {
-        $this->assertEquals(
-            12,
-            $this->result->getQueryTime()
-        );
-    }
-}
-
-class SelectDummy extends Result
-{
-    protected $parsed = true;
-
-    public function __construct($status, $queryTime, $numfound, $maxscore, $docs, $components)
-    {
-        $this->numfound = $numfound;
-        $this->maxscore = $maxscore;
-        $this->documents = $docs;
-        $this->components = $components;
-        $this->queryTime = $queryTime;
-        $this->status = $status;
+        parent::setUp();
     }
 }

tests/Solarium/Tests/QueryType/Update/AbstractResultTest.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ */
+
+namespace Solarium\Tests\QueryType\Update;
+
+abstract class AbstractResultTest extends \PHPUnit_Framework_TestCase
+{
+    protected $result;
+
+    public function testGetStatus()
+    {
+        $this->assertEquals(
+            1,
+            $this->result->getStatus()
+        );
+    }
+
+    public function testGetQueryTime()
+    {
+        $this->assertEquals(
+            12,
+            $this->result->getQueryTime()
+        );
+    }
+}

tests/Solarium/Tests/QueryType/Update/ResultTest.php

@@ -33,33 +33,12 @@ namespace Solarium\Tests\QueryType\Update;
 
 use Solarium\QueryType\Update\Result as UpdateResult;
 
-class ResultTest extends \PHPUnit_Framework_TestCase
+class ResultTest extends AbstractResultTest
 {
-    /**
-     * @var UpdateDummy
-     */
-    protected $result;
-
     public function setUp()
     {
         $this->result = new UpdateDummy();
     }
-
-    public function testGetStatus()
-    {
-        $this->assertEquals(
-            1,
-            $this->result->getStatus()
-        );
-    }
-
-    public function testGetQueryTime()
-    {
-        $this->assertEquals(
-            12,
-            $this->result->getQueryTime()
-        );
-    }
 }
 
 class UpdateDummy extends UpdateResult