PR zendframework/zendframework#4427

* added better testing for DbTableGateway paginator
zendframework · May 9, 2013 · 177d204 · 177d204
1 parent 201a0dd
commit 177d204
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/Adapter/DbTableGateway.php b/src/Adapter/DbTableGateway.php
@@ -27,7 +27,8 @@ class DbTableGateway extends DbSelect
      */
     public function __construct(TableGateway $tableGateway, $where = null, $order = null, $group = null, $having = null)
     {
-        $select = $tableGateway->getSql()->select();
+        $sql    = $tableGateway->getSql();
+        $select = $sql->select();
         if ($where) {
             $select->where($where);
         }
@@ -41,9 +42,7 @@ public function __construct(TableGateway $tableGateway, $where = null, $order =
             $select->having($having);
         }
 
-        $dbAdapter          = $tableGateway->getAdapter();
         $resultSetPrototype = $tableGateway->getResultSetPrototype();
-
-        parent::__construct($select, $dbAdapter, $resultSetPrototype);
+        parent::__construct($select, $sql, $resultSetPrototype);
     }
 }
diff --git a/test/Adapter/DbTableGatewayTest.php b/test/Adapter/DbTableGatewayTest.php
@@ -10,6 +10,7 @@
 
 namespace ZendTest\Paginator\Adapter;
 
+use Zend\Db\Adapter\Platform\Sql92;
 use Zend\Paginator\Adapter\DbTableGateway;
 use Zend\Paginator\Adapter\DbSelect;
 use Zend\Db\ResultSet\ResultSet;
@@ -25,6 +26,7 @@ class DbTableGatewayTest extends \PHPUnit_Framework_TestCase
     /** @var DbTableGateway */
     protected $dbTableGateway;
 
+    /** @var \Zend\Db\TableGateway\TableGateway */
     protected $mockTableGateway;
 
     public function setup()
@@ -34,13 +36,12 @@ public function setup()
         $mockDriver->expects($this->any())
                    ->method('createStatement')
                    ->will($this->returnValue($mockStatement));
-        $mockPlatform = $this->getMock('Zend\Db\Adapter\Platform\PlatformInterface');
-        $mockPlatform->expects($this->any())
-                     ->method('getName')
-                     ->will($this->returnValue('platform'));
+        $mockDriver->expects($this->any())
+            ->method('formatParameterName')
+            ->will($this->returnArgument(0));
         $mockAdapter = $this->getMockForAbstractClass(
             'Zend\Db\Adapter\Adapter',
-            array($mockDriver, $mockPlatform)
+            array($mockDriver, new Sql92())
         );
 
         $tableName = 'foobar';
@@ -109,6 +110,10 @@ public function testGetItemsWithWhereAndOrderAndGroup()
         $this->dbTableGateway = new DbTableGateway($this->mockTableGateway, $where, $order, $group);
 
         $mockResult = $this->getMock('Zend\Db\Adapter\Driver\ResultInterface');
+        $this->mockStatement
+            ->expects($this->once())
+            ->method('setSql')
+            ->with($this->equalTo('SELECT "foobar".* FROM "foobar" WHERE foo = bar GROUP BY "foo" ORDER BY "foo" ASC LIMIT limit OFFSET offset'));
         $this->mockStatement
              ->expects($this->any())
              ->method('execute')
@@ -128,9 +133,13 @@ public function testGetItemsWithWhereAndOrderAndGroupAndHaving()
 
         $mockResult = $this->getMock('Zend\Db\Adapter\Driver\ResultInterface');
         $this->mockStatement
-             ->expects($this->any())
-             ->method('execute')
-             ->will($this->returnValue($mockResult));
+            ->expects($this->once())
+            ->method('setSql')
+            ->with($this->equalTo('SELECT "foobar".* FROM "foobar" WHERE foo = bar GROUP BY "foo" HAVING count(foo)>0 ORDER BY "foo" ASC LIMIT limit OFFSET offset'));
+        $this->mockStatement
+            ->expects($this->any())
+            ->method('execute')
+            ->will($this->returnValue($mockResult));
 
         $items = $this->dbTableGateway->getItems(2, 10);
         $this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);