Moved document classes to select and update query (as they are closely related)

library/Solarium/Plugin/BufferedAdd.php

@@ -43,7 +43,7 @@ namespace Solarium\Plugin;
 use Solarium\Client;
 use Solarium\QueryType\Update\Result as UpdateResult;
 use Solarium\QueryType\Update\Query\Query as UpdateQuery;
-use Solarium\Document\ReadOnly as ReadOnlyDocument;
+use Solarium\QueryType\Select\Result\Document as ReadOnlyDocument;
 
 /**
  * Buffered add plugin

library/Solarium/QueryType/MoreLikeThis/Query.php

@@ -77,7 +77,7 @@ class Query extends SelectQuery
     protected $_options = array(
         'handler'       => 'mlt',
         'resultclass'   => 'Solarium\QueryType\MoreLikeThis\Result',
-        'documentclass' => 'Solarium\Document\ReadOnly',
+        'documentclass' => 'Solarium\QueryType\Select\Result\Document',
         'query'         => '*:*',
         'start'         => 0,
         'rows'          => 10,

library/Solarium/QueryType/MoreLikeThis/Result.php

@@ -42,7 +42,7 @@
  */
 namespace Solarium\QueryType\MoreLikeThis;
 use Solarium\Exception;
-use Solarium\Document\ReadOnly as ReadOnlyDocument;
+use Solarium\QueryType\Select\Result\Document as ReadOnlyDocument;
 use Solarium\QueryType\Select\Result\Result as SelectResult;
 
 /**

library/Solarium/QueryType/Select/Query/Query.php

@@ -140,7 +140,7 @@ class Query extends BaseQuery
     protected $_options = array(
         'handler'       => 'select',
         'resultclass'   => 'Solarium\QueryType\Select\Result\Result',
-        'documentclass' => 'Solarium\Document\ReadOnly',
+        'documentclass' => 'Solarium\QueryType\Select\Result\Document',
         'query'         => '*:*',
         'start'         => 0,
         'rows'          => 10,

library/Solarium/Document/ReadOnly.php → library/Solarium/QueryType/Select/Result/Document.php

@@ -33,13 +33,13 @@
  * @link http://www.solarium-project.org/
  *
  * @package Solarium
- * @subpackage Document
+ * @subpackage QueryType
  */
 
 /**
  * @namespace
  */
-namespace Solarium\Document;
+namespace Solarium\QueryType\Select\Result;
 use Solarium\Exception;
 
 /**
@@ -51,7 +51,7 @@ use Solarium\Exception;
  * @package Solarium
  * @subpackage Document
  */
-class ReadOnly implements \IteratorAggregate, \Countable, \ArrayAccess
+class Document implements \IteratorAggregate, \Countable, \ArrayAccess
 {
 
     /**

library/Solarium/Document/ReadWrite.php → library/Solarium/QueryType/Update/Query/Document.php

@@ -39,7 +39,8 @@
 /**
  * @namespace
  */
-namespace Solarium\Document;
+namespace Solarium\QueryType\Update\Query;
+use Solarium\QueryType\Select\Result\Document as ReadOnlyDocument;
 
 /**
  * Read/Write Solr document
@@ -55,9 +56,9 @@ namespace Solarium\Document;
  * Solr. Always update from the original data source.
  *
  * @package Solarium
- * @subpackage Document
+ * @subpackage QueryType
  */
-class ReadWrite extends ReadOnly
+class Document extends ReadOnlyDocument
 {
 
     /**

library/Solarium/QueryType/Update/Query/Query.php

@@ -41,7 +41,6 @@
  */
 namespace Solarium\QueryType\Update\Query;
 use Solarium\Exception;
-use Solarium\Document\ReadWrite as ReadWriteDocument;
 use Solarium\Client\Client;
 use Solarium\Query\Query as BaseQuery;
 
@@ -104,7 +103,7 @@ class Query extends BaseQuery
     protected $_options = array(
         'handler'       => 'update',
         'resultclass'   => 'Solarium\QueryType\Update\Result',
-        'documentclass' => 'Solarium\Document\ReadWrite',
+        'documentclass' => 'Solarium\QueryType\Update\Query\Document',
     );
 
     /**
@@ -318,7 +317,7 @@ class Query extends BaseQuery
      * If you need more control, like choosing a key for the command you need to
      * create you own command instance and use the add method.
      *
-     * @param ReadWriteDocument $document
+     * @param Document $document
      * @param boolean $overwrite
      * @param int $commitWithin
      * @return self Provides fluent interface
@@ -399,7 +398,7 @@ class Query extends BaseQuery
    /**
     * Set a custom document class for use in the createDocument method
     *
-    * This class should extend Solarium\Document\ReadWrite or
+    * This class should extend the Document class or
     * at least be compatible with it's interface
     *
     * @param string $value classname
@@ -432,7 +431,7 @@ class Query extends BaseQuery
      *
      * @param array $fields
      * @param array $boosts
-     * @return ReadWriteDocument
+     * @return Document
      */
     public function createDocument($fields = array(), $boosts = array())
     {

tests/Solarium/Tests/Plugin/BufferedAddTest.php

@@ -30,6 +30,7 @@
  */
 
 namespace Solarium\Tests\Plugin;
+use Solarium\QueryType\Update\Query\Document;
 
 class BufferedAddTest extends \PHPUnit_Framework_TestCase
 {
@@ -52,7 +53,7 @@ class BufferedAddTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocument()
     {
-        $doc = new \Solarium\Document\ReadWrite();
+        $doc = new Document();
         $doc->id = '123';
         $doc->name = 'test';
 
@@ -64,7 +65,7 @@ class BufferedAddTest extends \PHPUnit_Framework_TestCase
     public function testCreateDocument()
     {
         $data = array('id' => '123', 'name' => 'test');
-        $doc = new \Solarium\Document\ReadWrite($data);
+        $doc = new Document($data);
 
         $this->_plugin->createDocument($data);
 
@@ -73,11 +74,11 @@ class BufferedAddTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocuments()
     {
-        $doc1 = new \Solarium\Document\ReadWrite();
+        $doc1 = new Document();
         $doc1->id = '123';
         $doc1->name = 'test';
 
-        $doc2 = new \Solarium\Document\ReadWrite();
+        $doc2 = new Document();
         $doc2->id = '234';
         $doc2->name = 'test2';
 
@@ -94,11 +95,11 @@ class BufferedAddTest extends \PHPUnit_Framework_TestCase
         $observer->expects($this->once())->method('flush');
         $observer->setBufferSize(1);
 
-        $doc1 = new \Solarium\Document\ReadWrite();
+        $doc1 = new Document();
         $doc1->id = '123';
         $doc1->name = 'test';
 
-        $doc2 = new \Solarium\Document\ReadWrite();
+        $doc2 = new Document();
         $doc2->id = '234';
         $doc2->name = 'test2';
 
@@ -109,7 +110,7 @@ class BufferedAddTest extends \PHPUnit_Framework_TestCase
 
     public function testClear()
     {
-        $doc = new \Solarium\Document\ReadWrite();
+        $doc = new Document();
         $doc->id = '123';
         $doc->name = 'test';
 
@@ -127,7 +128,7 @@ class BufferedAddTest extends \PHPUnit_Framework_TestCase
     public function testFlush()
     {
         $data = array('id' => '123', 'name' => 'test');
-        $doc = new \Solarium\Document\ReadWrite($data);
+        $doc = new Document($data);
 
         $mockUpdate = $this->getMock('Solarium\Query\Update', array('addDocuments'));
         $mockUpdate->expects($this->once())->method('addDocuments')->with($this->equalTo(array($doc)),$this->equalTo(true),$this->equalTo(12));
@@ -147,7 +148,7 @@ class BufferedAddTest extends \PHPUnit_Framework_TestCase
     public function testCommit()
     {
         $data = array('id' => '123', 'name' => 'test');
-        $doc = new \Solarium\Document\ReadWrite($data);
+        $doc = new Document($data);
 
         $mockUpdate = $this->getMock('Solarium\Query\Update', array('addDocuments', 'addCommit'));
         $mockUpdate->expects($this->once())->method('addDocuments')->with($this->equalTo(array($doc)),$this->equalTo(true));

tests/Solarium/Tests/Plugin/PrefetchIteratorTest.php

@@ -30,6 +30,7 @@
  */
 
 namespace Solarium\Tests\Plugin;
+use Solarium\QueryType\Select\Result\Document;
 
 class PrefetchIteratorTest extends \PHPUnit_Framework_TestCase
 {
@@ -110,11 +111,11 @@ class PrefetchIteratorTest extends \PHPUnit_Framework_TestCase
         $numFound = 5;
 
         $docs = array(
-            new \Solarium\Document\ReadOnly(array('id'=>1,'title'=>'doc1')),
-            new \Solarium\Document\ReadOnly(array('id'=>2,'title'=>'doc2')),
-            new \Solarium\Document\ReadOnly(array('id'=>3,'title'=>'doc3')),
-            new \Solarium\Document\ReadOnly(array('id'=>4,'title'=>'doc4')),
-            new \Solarium\Document\ReadOnly(array('id'=>5,'title'=>'doc5')),
+            new Document(array('id'=>1,'title'=>'doc1')),
+            new Document(array('id'=>2,'title'=>'doc2')),
+            new Document(array('id'=>3,'title'=>'doc3')),
+            new Document(array('id'=>4,'title'=>'doc4')),
+            new Document(array('id'=>5,'title'=>'doc5')),
         );
 
         return new SelectDummy(1, 12, $numFound, $docs, array());

tests/Solarium/Tests/QueryType/Analysis/Query/DocumentTest.php

@@ -51,7 +51,7 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
 
     public function testAddAndGetDocument()
     {
-        $doc = new \Solarium\Document\ReadWrite(array('id' => 1));
+        $doc = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
         $this->_query->addDocument($doc);
         $this->assertEquals(
             array($doc),
@@ -61,8 +61,8 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
 
     public function testAddAndGetDocuments()
     {
-        $doc1 = new \Solarium\Document\ReadWrite(array('id' => 1));
-        $doc2 = new \Solarium\Document\ReadWrite(array('id' => 2));
+        $doc1 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
+        $doc2 = new \Solarium\QueryType\Update\Query\Document(array('id' => 2));
         $this->_query->addDocuments(array($doc1, $doc2));
         $this->assertEquals(
             array($doc1, $doc2),

tests/Solarium/Tests/QueryType/Analysis/RequestBuilder/DocumentTest.php

@@ -61,10 +61,10 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
     public function testGetRawData()
     {
         // this doc tests data escaping
-        $doc1 = new \Solarium\Document\ReadWrite(array('id' => 1, 'name' => 'doc1', 'cat' => 'my > cat'));
+        $doc1 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1, 'name' => 'doc1', 'cat' => 'my > cat'));
 
         // this doc tests a multivalue field
-        $doc2 = new \Solarium\Document\ReadWrite(array('id' => 2, 'name' => 'doc2', 'cat' => array(1,2,3)));
+        $doc2 = new \Solarium\QueryType\Update\Query\Document(array('id' => 2, 'name' => 'doc2', 'cat' => array(1,2,3)));
 
         $this->_query->addDocuments(array($doc1, $doc2));
 

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

@@ -56,7 +56,7 @@ class MoreLikeThisTest extends \PHPUnit_Framework_TestCase
             )
         );
 
-        $docs = array(new \Solarium\Document\ReadOnly(array('field1' => 'value1')));
+        $docs = array(new \Solarium\QueryType\Select\Result\Document(array('field1' => 'value1')));
         $expected = array(
             'id1' => new \Solarium\QueryType\Select\Result\MoreLikeThis\Result(12, 1.75, $docs)
         );

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

@@ -50,7 +50,7 @@ class ResponseParserTest extends \PHPUnit_Framework_TestCase
             )
         );
 
-        $query = new \Solarium\QueryType\Select\Query\Query(array('documentclass' => 'Solarium\Document\ReadWrite'));
+        $query = new \Solarium\QueryType\Select\Query\Query(array('documentclass' => 'Solarium\QueryType\Update\Query\Document'));
         $query->getFacetSet();
 
         $resultStub = $this->getMock('Solarium\QueryType\Select\Result\Result', array(), array(), '', false);
@@ -69,8 +69,8 @@ class ResponseParserTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(503, $result['numfound']);
 
         $docs = array(
-            new \Solarium\Document\ReadWrite(array('fieldA' => 1, 'fieldB' => 'Test')),
-            new \Solarium\Document\ReadWrite(array('fieldA' => 2, 'fieldB' => 'Test2'))
+            new \Solarium\QueryType\Update\Query\Document(array('fieldA' => 1, 'fieldB' => 'Test')),
+            new \Solarium\QueryType\Update\Query\Document(array('fieldA' => 2, 'fieldB' => 'Test2'))
         );
         $this->assertEquals($docs, $result['documents']);
 
@@ -95,7 +95,7 @@ class ResponseParserTest extends \PHPUnit_Framework_TestCase
             )
         );
 
-        $query = new \Solarium\QueryType\Select\Query\Query(array('documentclass' => 'Solarium\Document\ReadWrite'));
+        $query = new \Solarium\QueryType\Select\Query\Query(array('documentclass' => 'Solarium\QueryType\Update\Query\Document'));
         $query->getFacetSet();
 
         $resultStub = $this->getMock('Solarium\QueryType\Select\Result\Result', array(), array(), '', false);

tests/Solarium/Tests/Document/ReadOnlyTest.php → tests/Solarium/Tests/QueryType/Select/Result/DocumentTest.php

@@ -29,9 +29,9 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Document;
+namespace Solarium\Tests\QueryType\Select\Result;
 
-class ReadOnlyTest extends \PHPUnit_Framework_TestCase
+class DocumentTest extends \PHPUnit_Framework_TestCase
 {
 
     protected $_doc;
@@ -44,7 +44,7 @@ class ReadOnlyTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_doc = new \Solarium\Document\ReadOnly($this->_fields);
+        $this->_doc = new \Solarium\QueryType\Select\Result\Document($this->_fields);
     }
 
     public function testGetFields()

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

@@ -44,8 +44,8 @@ class MoreLikeThisTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $docs = array(
-            new \Solarium\Document\ReadOnly(array('id'=>1,'name'=>'test1')),
-            new \Solarium\Document\ReadOnly(array('id'=>2,'name'=>'test2')),
+            new \Solarium\QueryType\Select\Result\Document(array('id'=>1,'name'=>'test1')),
+            new \Solarium\QueryType\Select\Result\Document(array('id'=>2,'name'=>'test2')),
         );
 
         $this->_results = array(

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

@@ -42,8 +42,8 @@ class ResultTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->_docs = array(
-            new \Solarium\Document\ReadOnly(array('id'=>1,'name'=>'test1')),
-            new \Solarium\Document\ReadOnly(array('id'=>2,'name'=>'test2')),
+            new \Solarium\QueryType\Select\Result\Document(array('id'=>1,'name'=>'test1')),
+            new \Solarium\QueryType\Select\Result\Document(array('id'=>2,'name'=>'test2')),
         );
 
         $this->_mltResult = new \Solarium\QueryType\Select\Result\MoreLikeThis\Result(2, 5.13, $this->_docs);

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

@@ -47,8 +47,8 @@ class ResultTest extends \PHPUnit_Framework_TestCase
         $this->_numFound = 11;
 
         $this->_docs = array(
-            new \Solarium\Document\ReadOnly(array('id'=>1,'title'=>'doc1')),
-            new \Solarium\Document\ReadOnly(array('id'=>1,'title'=>'doc1')),
+            new \Solarium\QueryType\Select\Result\Document(array('id'=>1,'title'=>'doc1')),
+            new \Solarium\QueryType\Select\Result\Document(array('id'=>1,'title'=>'doc1')),
         );
 
         $this->_facetSet = 'dummy-facetset-value';

tests/Solarium/Tests/QueryType/Update/Query/Command/AddTest.php

@@ -50,7 +50,7 @@ class AddTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocument()
     {
-        $doc = new \Solarium\Document\ReadWrite(array('id' => 1));
+        $doc = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
         $this->_command->addDocument($doc);
         $this->assertEquals(
             array($doc),
@@ -60,8 +60,8 @@ class AddTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocuments()
     {
-        $doc1 = new \Solarium\Document\ReadWrite(array('id' => 1));
-        $doc2 = new \Solarium\Document\ReadWrite(array('id' => 2));
+        $doc1 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
+        $doc2 = new \Solarium\QueryType\Update\Query\Document(array('id' => 2));
         $this->_command->addDocuments(array($doc1, $doc2));
         $this->assertEquals(
             array($doc1, $doc2),
@@ -71,12 +71,12 @@ class AddTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocumentsMultipleTimes()
     {
-        $doc1 = new \Solarium\Document\ReadWrite(array('id' => 1));
-        $doc2 = new \Solarium\Document\ReadWrite(array('id' => 2));
+        $doc1 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
+        $doc2 = new \Solarium\QueryType\Update\Query\Document(array('id' => 2));
         $this->_command->addDocuments(array($doc1, $doc2));
 
-        $doc3 = new \Solarium\Document\ReadWrite(array('id' => 3));
-        $doc4 = new \Solarium\Document\ReadWrite(array('id' => 4));
+        $doc3 = new \Solarium\QueryType\Update\Query\Document(array('id' => 3));
+        $doc4 = new \Solarium\QueryType\Update\Query\Document(array('id' => 4));
         $this->_command->addDocuments(array($doc3, $doc4));
 
         $this->assertEquals(
@@ -87,8 +87,8 @@ class AddTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocumentsIteration()
     {
-        $doc1 = new \Solarium\Document\ReadWrite(array('id' => 1));
-        $doc2 = new \Solarium\Document\ReadWrite(array('id' => 2));
+        $doc1 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
+        $doc2 = new \Solarium\QueryType\Update\Query\Document(array('id' => 2));
 
         $it = new \ArrayIterator(array($doc1, $doc2));
 
@@ -106,9 +106,9 @@ class AddTest extends \PHPUnit_Framework_TestCase
             'checking first two documents are added correctly'
         );
 
-        $doc3 = new \Solarium\Document\ReadWrite(array('id' => 3));
-        $doc4 = new \Solarium\Document\ReadWrite(array('id' => 4));
-        $doc5 = new \Solarium\Document\ReadWrite(array('id' => 5));
+        $doc3 = new \Solarium\QueryType\Update\Query\Document(array('id' => 3));
+        $doc4 = new \Solarium\QueryType\Update\Query\Document(array('id' => 4));
+        $doc5 = new \Solarium\QueryType\Update\Query\Document(array('id' => 5));
 
         $it2 = new \ArrayIterator(array($doc3, $doc4, $doc5));
 
@@ -132,12 +132,12 @@ class AddTest extends \PHPUnit_Framework_TestCase
      */
     public function testAddDocumentToIteration()
     {
-        $doc1 = new \Solarium\Document\ReadWrite(array('id' => 1));
-        $doc2 = new \Solarium\Document\ReadWrite(array('id' => 2));
+        $doc1 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
+        $doc2 = new \Solarium\QueryType\Update\Query\Document(array('id' => 2));
 
         $this->_command->addDocuments(new \ArrayIterator(array($doc1, $doc2)));
 
-        $doc3 = new \Solarium\Document\ReadWrite(array('id' => 3));
+        $doc3 = new \Solarium\QueryType\Update\Query\Document(array('id' => 3));
 
         $this->_command->addDocument($doc3);
 

tests/Solarium/Tests/Document/ReadWriteTest.php → tests/Solarium/Tests/QueryType/Update/Query/DocumentTest.php

@@ -29,9 +29,9 @@
  * policies, either expressed or implied, of the copyright holder.
  */
 
-namespace Solarium\Tests\Document;
+namespace Solarium\Tests\QueryType\Update\Query;
 
-class ReadWriteTest extends \PHPUnit_Framework_TestCase
+class DocumentTest extends \PHPUnit_Framework_TestCase
 {
 
     protected $_doc;
@@ -44,14 +44,14 @@ class ReadWriteTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_doc = new \Solarium\Document\ReadWrite($this->_fields);
+        $this->_doc = new \Solarium\QueryType\Update\Query\Document($this->_fields);
     }
 
     public function testConstructorWithFieldsAndBoosts()
     {
         $fields = array('id' => 1, 'name' => 'testname');
         $boosts = array('name' => 2.7);
-        $doc = new \Solarium\Document\ReadWrite($fields, $boosts);
+        $doc = new \Solarium\QueryType\Update\Query\Document($fields, $boosts);
 
         $this->assertEquals(
             $fields,

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

@@ -296,7 +296,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocument()
     {
-        $doc = new \Solarium\Document\ReadWrite(array('id' => 1));
+        $doc = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
 
         $this->_query->addDocument($doc);
         $commands = $this->_query->getCommands();
@@ -314,8 +314,8 @@ class QueryTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocuments()
     {
-        $doc1 = new \Solarium\Document\ReadWrite(array('id' => 1));
-        $doc2 = new \Solarium\Document\ReadWrite(array('id' => 1));
+        $doc1 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
+        $doc2 = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
 
         $this->_query->addDocuments(array($doc1,$doc2), true, 100);
         $commands = $this->_query->getCommands();
@@ -462,6 +462,6 @@ class QueryTest extends \PHPUnit_Framework_TestCase
 
 }
 
-class MyCustomDoc extends \Solarium\Document\ReadWrite{
+class MyCustomDoc extends \Solarium\QueryType\Update\Query\Document{
 
 }

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

@@ -71,7 +71,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
     public function testBuildAddXmlNoParamsSingleDocument()
     {
         $command = new \Solarium\QueryType\Update\Query\Command\Add;
-        $command->addDocument(new \Solarium\Document\ReadWrite(array('id' => 1)));
+        $command->addDocument(new \Solarium\QueryType\Update\Query\Document(array('id' => 1)));
 
         $this->assertEquals(
             '<add><doc><field name="id">1</field></doc></add>',
@@ -82,7 +82,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
     public function testBuildAddXmlWithParams()
     {
         $command = new \Solarium\QueryType\Update\Query\Command\Add(array('overwrite' => true,'commitwithin' => 100));
-        $command->addDocument(new \Solarium\Document\ReadWrite(array('id' => 1)));
+        $command->addDocument(new \Solarium\QueryType\Update\Query\Document(array('id' => 1)));
 
         $this->assertEquals(
             '<add overwrite="true" commitWithin="100"><doc><field name="id">1</field></doc></add>',
@@ -93,7 +93,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
     public function testBuildAddXmlSpecialCharacters()
     {
         $command = new \Solarium\QueryType\Update\Query\Command\Add;
-        $command->addDocument(new \Solarium\Document\ReadWrite(array('id' => 1, 'text' => 'test < 123 > test')));
+        $command->addDocument(new \Solarium\QueryType\Update\Query\Document(array('id' => 1, 'text' => 'test < 123 > test')));
 
         $this->assertEquals(
             '<add><doc><field name="id">1</field><field name="text">test &lt; 123 &gt; test</field></doc></add>',
@@ -104,7 +104,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
     public function testBuildAddXmlMultivalueField()
     {
         $command = new \Solarium\QueryType\Update\Query\Command\Add;
-        $command->addDocument(new \Solarium\Document\ReadWrite(array('id' => array(1,2,3), 'text' => 'test < 123 > test')));
+        $command->addDocument(new \Solarium\QueryType\Update\Query\Document(array('id' => array(1,2,3), 'text' => 'test < 123 > test')));
 
         $this->assertEquals(
             '<add><doc><field name="id">1</field><field name="id">2</field><field name="id">3</field><field name="text">test &lt; 123 &gt; test</field></doc></add>',
@@ -114,7 +114,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function testBuildAddXmlSingleDocumentWithBoost()
     {
-        $doc = new \Solarium\Document\ReadWrite(array('id' => 1));
+        $doc = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
         $doc->setBoost(2.5);
         $command = new \Solarium\QueryType\Update\Query\Command\Add;
         $command->addDocument($doc);
@@ -127,7 +127,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function testBuildAddXmlSingleDocumentWithFieldBoost()
     {
-        $doc = new \Solarium\Document\ReadWrite(array('id' => 1));
+        $doc = new \Solarium\QueryType\Update\Query\Document(array('id' => 1));
         $doc->setFieldBoost('id',2.1);
         $command = new \Solarium\QueryType\Update\Query\Command\Add;
         $command->addDocument($doc);
@@ -141,8 +141,8 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
     public function testBuildAddXmlMultipleDocuments()
     {
         $command = new \Solarium\QueryType\Update\Query\Command\Add;
-        $command->addDocument(new \Solarium\Document\ReadWrite(array('id' => 1)));
-        $command->addDocument(new \Solarium\Document\ReadWrite(array('id' => 2)));
+        $command->addDocument(new \Solarium\QueryType\Update\Query\Document(array('id' => 1)));
+        $command->addDocument(new \Solarium\QueryType\Update\Query\Document(array('id' => 2)));
 
         $this->assertEquals(
             '<add><doc><field name="id">1</field></doc><doc><field name="id">2</field></doc></add>',
@@ -287,7 +287,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         $this->_query->addDeleteById(1);
         $this->_query->addRollback();
         $this->_query->addDeleteQuery('*:*');
-        $this->_query->addDocument(new \Solarium\Document\ReadWrite(array('id' => 1)));
+        $this->_query->addDocument(new \Solarium\QueryType\Update\Query\Document(array('id' => 1)));
         $this->_query->addCommit();
         $this->_query->addOptimize();