[ZF-10242] Zend_Gdata:

- Fixed implemented the interface Countable.
- Correction in the tests units the count of data was wrong.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22880 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Gdata/App/Feed.php

@@ -41,7 +41,7 @@ require_once 'Zend/Gdata/App/FeedSourceParent.php';
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent
-        implements Iterator, ArrayAccess
+        implements Iterator, ArrayAccess, Countable
 {
 
     /**

tests/Zend/Gdata/App/FeedTest.php

@@ -266,4 +266,17 @@ class Zend_Gdata_App_FeedTest extends PHPUnit_Framework_TestCase
         $result = $feed->lookupNamespace($prefix, null, 1);
         $this->assertEquals($testString21, $result);
     }
+
+    /**
+     * @group ZF-10242
+     */
+    public function testCount()
+    {
+        $feed =  new Zend_Gdata_App_Feed();
+        $feed->addEntry('foo')
+             ->addEntry('bar');
+
+        $this->assertEquals(2, $feed->count());
+        $this->assertEquals(2, count($feed));
+    }
 }

tests/Zend/Gdata/Docs/DocumentListFeedTest.php

@@ -45,7 +45,8 @@ class Zend_Gdata_Docs_DocumentListFeedTest extends PHPUnit_Framework_TestCase
     public function testToAndFromString()
     {
         // There should be 2 entries in the feed.
-        $this->assertTrue(count($this->docFeed->entries) == 1);
+        $this->assertTrue(count($this->docFeed->entries) == 2);
+        $this->assertTrue($this->docFeed->entries->count() == 2);
         foreach($this->docFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Docs_DocumentListEntry);

tests/Zend/Gdata/Gbase/ItemFeedTest.php

@@ -44,7 +44,8 @@ class Zend_Gdata_Gbase_ItemFeedTest extends PHPUnit_Framework_TestCase
 
     public function testToAndFromString()
     {
-        $this->assertEquals(count($this->itemFeed->entries), 1);
+        $this->assertEquals(2, count($this->itemFeed->entries));
+        $this->assertEquals(2, $this->itemFeed->entries->count());
         foreach($this->itemFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Gbase_ItemEntry);
@@ -55,7 +56,8 @@ class Zend_Gdata_Gbase_ItemFeedTest extends PHPUnit_Framework_TestCase
         $doc->loadXML($this->itemFeed->saveXML());
         $newItemFeed->transferFromDom($doc->documentElement);
 
-        $this->assertEquals(count($newItemFeed->entries), 1);
+        $this->assertEquals(2, count($newItemFeed->entries));
+        $this->assertEquals(2, $newItemFeed->entries->count());
         foreach($newItemFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Gbase_ItemEntry);

tests/Zend/Gdata/Gbase/SnippetFeedTest.php

@@ -44,7 +44,8 @@ class Zend_Gdata_Gbase_SnippetFeedTest extends PHPUnit_Framework_TestCase
 
     public function testToAndFromString()
     {
-        $this->assertEquals(count($this->snippetFeed->entries), 1);
+        $this->assertEquals(2, count($this->snippetFeed->entries));
+        $this->assertEquals(2, $this->snippetFeed->entries->count());
         foreach($this->snippetFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Gbase_SnippetEntry);
@@ -55,7 +56,8 @@ class Zend_Gdata_Gbase_SnippetFeedTest extends PHPUnit_Framework_TestCase
         $doc->loadXML($this->snippetFeed->saveXML());
         $newSnippetFeed->transferFromDom($doc->documentElement);
 
-        $this->assertEquals(count($newSnippetFeed->entries), 1);
+        $this->assertEquals(2, count($newSnippetFeed->entries));
+        $this->assertEquals(2, $newSnippetFeed->entries->count());
         foreach($newSnippetFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Gbase_SnippetEntry);

tests/Zend/Gdata/Spreadsheets/CellFeedTest.php

@@ -44,7 +44,9 @@ class Zend_Gdata_Spreadsheets_CellFeedTest extends PHPUnit_Framework_TestCase
 
     public function testToAndFromString()
     {
-        $this->assertTrue(count($this->cellFeed->entries) == 1);
+        $this->assertTrue(count($this->cellFeed->entries) == 2);
+        $this->assertTrue($this->cellFeed->entries->count() == 2);
+
         foreach($this->cellFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Spreadsheets_CellEntry);
@@ -59,7 +61,9 @@ class Zend_Gdata_Spreadsheets_CellFeedTest extends PHPUnit_Framework_TestCase
         $doc->loadXML($this->cellFeed->saveXML());
         $newCellFeed->transferFromDom($doc->documentElement);
 
-        $this->assertTrue(count($newCellFeed->entries) == 1);
+        $this->assertTrue(count($newCellFeed->entries) == 2);
+        $this->assertTrue($newCellFeed->entries->count() == 2);
+
         foreach($newCellFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Spreadsheets_CellEntry);

tests/Zend/Gdata/Spreadsheets/ListFeedTest.php

@@ -44,7 +44,8 @@ class Zend_Gdata_Spreadsheets_ListFeedTest extends PHPUnit_Framework_TestCase
 
     public function testToAndFromString()
     {
-        $this->assertTrue(count($this->listFeed->entries) == 1);
+        $this->assertTrue(count($this->listFeed->entries) == 2);
+        $this->assertTrue($this->listFeed->entries->count() == 2);
         foreach($this->listFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Spreadsheets_ListEntry);
@@ -55,7 +56,8 @@ class Zend_Gdata_Spreadsheets_ListFeedTest extends PHPUnit_Framework_TestCase
         $doc->loadXML($this->listFeed->saveXML());
         $newListFeed->transferFromDom($doc->documentElement);
 
-        $this->assertTrue(count($newListFeed->entries) == 1);
+        $this->assertTrue(count($newListFeed->entries) == 2);
+        $this->assertTrue($newListFeed->entries->count() == 2);
         foreach($newListFeed->entries as $entry)
         {
             $this->assertTrue($entry instanceof Zend_Gdata_Spreadsheets_ListEntry);