- fixed tests

- added countable to iterators

library/Solarium/Document/ReadOnly.php

@@ -38,7 +38,7 @@
 /**
  * Solr query result read-only document
  */
-class Solarium_Document_ReadOnly implements IteratorAggregate
+class Solarium_Document_ReadOnly implements IteratorAggregate, Countable
 {
 
     /**
@@ -111,4 +111,14 @@ class Solarium_Document_ReadOnly implements IteratorAggregate
         return new ArrayIterator($this->_fields);
     }
 
+    /**
+     * Countable implementation
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->_fields);
+    }
+
 }
\ No newline at end of file

library/Solarium/Result/Select.php

@@ -39,7 +39,7 @@
  * Select query result
  */
 class Solarium_Result_Select extends Solarium_Result_Query
-    implements IteratorAggregate
+    implements IteratorAggregate, Countable
 {
 
     /**
@@ -148,4 +148,13 @@ class Solarium_Result_Select extends Solarium_Result_Query
         return new ArrayIterator($this->_documents);
     }
 
+    /**
+     * Countable implementation
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->_documents);
+    }
 }
\ No newline at end of file

library/Solarium/Result/Select/Facet/Field.php

@@ -38,7 +38,7 @@
 /**
  * Select query facet result
  */
-class Solarium_Result_Select_Facet_Field implements IteratorAggregate
+class Solarium_Result_Select_Facet_Field implements IteratorAggregate, Countable
 {
 
     /**
@@ -76,6 +76,16 @@ class Solarium_Result_Select_Facet_Field implements IteratorAggregate
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->_documents);
+        return new ArrayIterator($this->_values);
+    }
+
+    /**
+     * Countable implementation
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->_values);
     }
 }
\ No newline at end of file

tests/Solarium/Client/Request/SelectTest.php

@@ -118,7 +118,8 @@ class Solarium_Client_Request_SelectTest extends PHPUnit_Framework_TestCase
     {
         $this->_query->addFacet(new UnknownFacet(array('key' => 'f1', 'field' => 'owner')));
         $this->setExpectedException('Solarium_Exception');
-        new Solarium_Client_Request_Select($this->_options, $this->_query);
+        $request = new Solarium_Client_Request_Select($this->_options, $this->_query);
+        $request->getUri();
     }
 }
 

tests/Solarium/Client/Request/UpdateTest.php

@@ -302,7 +302,8 @@ class Solarium_Client_Request_UpdateTest extends PHPUnit_Framework_TestCase
         $query->add('invalidcommand',new InvalidCommand);
 
         $this->setExpectedException('Solarium_Exception');
-        new Solarium_Client_Request_Update($this->_options, $query);
+        $request = new Solarium_Client_Request_Update($this->_options, $query);
+        $request->getRawData();
     }
 }