- fixed some test issues

library/Solarium/Client/Adapter/Http.php

@@ -116,9 +116,18 @@ class Solarium_Client_Adapter_Http extends Solarium_Client_Adapter
         if ($method == Solarium_Client_Request::POST) {
             $data = $request->getRawData();
             if (null !== $data) {
-                stream_context_set_option($context, 'http', 'content', $data);
-                stream_context_set_option($context, 'http', 'header',
-                    'Content-Type: text/xml; charset=UTF-8');
+                stream_context_set_option(
+                    $context,
+                    'http',
+                    'content',
+                    $data
+                );
+                stream_context_set_option(
+                    $context,
+                    'http',
+                    'header',
+                    'Content-Type: text/xml; charset=UTF-8'
+                );
             }
         }
 

library/Solarium/Client/Adapter/ZendHttp.php

@@ -148,7 +148,9 @@ class Solarium_Client_Adapter_ZendHttp extends Solarium_Client_Adapter_Http
                     return $this->_jsonDecode($data);
                     break;
                 default:
-                    throw new Solarium_Exception('Unknown content-type: ' . $type);
+                    throw new Solarium_Exception(
+                        'Unknown Content-Type in ZendHttp adapter: ' . $type
+                    );
                     break;
             }
         }

tests/Solarium/Client/Request/PingTest.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.
+ */
+
+class Solarium_Client_Request_PingTest extends PHPUnit_Framework_TestCase
+{
+
+    protected $_query;
+
+    protected $_options = array(
+        'host' => '127.0.0.1',
+        'port' => 80,
+        'path' => '/solr',
+        'core' => null,
+    );
+
+    public function setUp()
+    {
+        $this->_query = new Solarium_Query_Ping($this->_options);
+    }
+
+    public function testGetMethod()
+    {
+        $this->assertEquals(
+            Solarium_Client_Request::HEAD,
+            $this->_getRequest($this->_options)->getMethod()
+        );
+    }
+
+    public function testGetUri()
+    {
+        $this->assertEquals(
+            'http://127.0.0.1:80/solr/admin/ping?',
+            $this->_getRequest($this->_options)->getUri()
+        );
+    }
+
+}
\ No newline at end of file

tests/Solarium/Client/Request/UpdateTest.php

@@ -46,6 +46,22 @@ class Solarium_Client_Request_UpdateTest extends PHPUnit_Framework_TestCase
         $this->_query = new Solarium_Query_Update;
     }
 
+    public function testGetMethod()
+    {
+        $this->assertEquals(
+            Solarium_Client_Request::POST,
+            $this->_getRequest($this->_options)->getMethod()
+        );
+    }
+
+    public function testGetUri()
+    {
+        $this->assertEquals(
+            'http://127.0.0.1:80/solr/update?wt=json',
+            $this->_getRequest($this->_options)->getUri()
+        );
+    }
+
     public function testBuildAddXmlNoParamsSingleDocument()
     {
         $command = new Solarium_Query_Update_Command_Add;

tests/Solarium/Client/RequestTest.php

@@ -49,6 +49,14 @@ class Solarium_Client_RequestTest extends PHPUnit_Framework_TestCase
         return new $class($options, $query);
     }
 
+    public function testGetMethod()
+    {
+        $this->assertEquals(
+            Solarium_Client_Request::HEAD,
+            $this->_getRequest($this->_options)->getMethod()
+        );
+    }
+
     public function testGetUri()
     {
         $this->assertEquals(

tests/Solarium/Document/ReadOnlyTest.php

@@ -71,5 +71,21 @@ class Solarium_Document_ReadOnlyTest extends PHPUnit_Framework_TestCase
         $this->setExpectedException('Solarium_Exception');
         $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 testCount()
+    {
+        $this->assertEquals(count($this->_fields), count($this->_doc));
+    }
     
 }