Selaa lähdekoodia

Improve assertions in unit tests for GH-172

Adam Lundrigan 12 vuotta sitten
vanhempi
commit
045105fe4a
1 muutettua tiedostoa jossa 15 lisäystä ja 2 poistoa
  1. 15 2
      tests/Zend/Db/Table/Rowset/TestCommon.php

+ 15 - 2
tests/Zend/Db/Table/Rowset/TestCommon.php

@@ -345,10 +345,21 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
     public function testTableRowsetContainsDisconnectedRowObjectsWhenDeserialized()
     {
         $table = $this->_table['bugs'];
-        $ser = serialize($table->fetchAll('bug_id = 1', 'bug_id ASC'));
+        $onlineRowset = $table->fetchAll('bug_id = 1', 'bug_id ASC');
+
+        // Test that initial rowset and it's rows are connected
+        $this->assertTrue($onlineRowset instanceof Zend_Db_Table_Rowset_Abstract);
+        $this->assertTrue($onlineRowset->isConnected());
+        $onlineRow = $onlineRowset->current();
+        $this->assertTrue($onlineRow instanceof Zend_Db_Table_Row_Abstract);
+        $this->assertTrue($onlineRow->isConnected());
 
+        $ser = serialize($onlineRowset);
         $rowset = unserialize($ser);
 
+        // Test that newly-unserialized rowset and it's rows are not connected
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract);
+        $this->assertFalse($rowset->isConnected());
         $row = $rowset->current();
         $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract);
         $this->assertFalse($row->isConnected());
@@ -367,11 +378,13 @@ abstract class Zend_Db_Table_Rowset_TestCommon extends Zend_Db_Table_TestSetup
         // Reconnect the rowset
         $rowset->setTable($table);
 
+        // Test that unserialized rowset and it's rows are now connected
+        $this->assertTrue($rowset instanceof Zend_Db_Table_Rowset_Abstract);
         $this->assertTrue($rowset->isConnected());
         $row = $rowset->current();
         $this->assertTrue($row instanceof Zend_Db_Table_Row_Abstract);
         $this->assertTrue($row->isConnected());
-        $this->assertSame($row->getTable(), $table);
+        $this->assertTrue($row->getTable() instanceof Zend_Db_Table_Abstract);
     }
  
     /**