Merge pull request zendframework/zendframework#1383 from EvanDotPro/h…

…otfix/zend-feed-tests

Utilize getter/setter in Subscription model for now() to prevent test failure

src/PubSubHubbub/Model/Subscription.php

@@ -32,6 +32,12 @@
  */
 class Subscription extends AbstractModel implements SubscriptionPersistenceInterface
 {
+    /**
+     * Common Date\Date object to assist with unit testing
+     * 
+     * @var Date\Date
+     */
+    protected $now;
 
     /**
      * Save subscription to RDMBS
@@ -50,7 +56,7 @@ public function setSubscription(array $data)
         $result = $this->_db->select(array('id' => $data['id']));
         if ($result && (0 < count($result))) {
             $data['created_time'] = $result->current()->created_time;
-            $now = new Date\Date;
+            $now = $this->getNow();
             if (array_key_exists('lease_seconds', $data) 
                 && $data['lease_seconds']
             ) {
@@ -126,4 +132,28 @@ public function deleteSubscription($key)
         return false;
     }
 
+    /**
+     * Get a new Date\Date or the one injected for testing
+     * 
+     * @return Date\Date
+     */
+    public function getNow()
+    {
+        if (null === $this->now) {
+            return new Date\Date;
+        }
+        return $this->now;
+    }
+
+    /**
+     * Set a Date\Date instance for assisting with unit testing
+     * 
+     * @param Date\Date $now
+     * @return Subscription
+     */
+    public function setNow(Date\Date $now)
+    {
+        $this->now = $now;
+        return $this;
+    }
 }

test/PubSubHubbub/Model/SubscriptionTest.php

@@ -21,8 +21,9 @@
 namespace ZendTest\Feed\PubSubHubbub\Model;
 
 use Zend\Feed\PubSubHubbub\Model\Subscription;
-use \Zend\Db\Adapter\Adapter as DbAdapter;
-use \Zend\Db\TableGateway\TableGateway;
+use Zend\Db\Adapter\Adapter as DbAdapter;
+use Zend\Db\TableGateway\TableGateway;
+use Zend\Date;
 
 /**
  * @category   Zend
@@ -73,6 +74,14 @@ public function testImpemetsSubscriptionInterface()
         unset($reflection);
     }
 
+    public function testCurrentTimeSetterAndGetter()
+    {
+        $now = new Date\Date;
+        $subscription = new Subscription(new TableGateway('subscription', $this->initDb()));
+        $subscription->setNow($now);
+        $this->assertSame($subscription->getNow(), $now);
+    }
+
     protected function initDb()
     {
         if (!extension_loaded('pdo')

test/PubSubHubbub/Subscriber/CallbackTest.php

@@ -54,6 +54,10 @@ public function setUp()
         $this->_tableGateway->expects($this->any())->method('getAdapter')
             ->will($this->returnValue($this->_adapter));
         $storage = new Model\Subscription($this->_tableGateway);
+
+        $this->now = new Date\Date;
+        $storage->setNow(clone $this->now);
+
         $this->_callback->setStorage($storage);
 
         $this->_get = array(
@@ -268,7 +272,7 @@ public function testRespondsToValidConfirmationWith200Response()
             ->with($this->equalTo(array('id' => 'verifytokenkey')))
             ->will($this->returnValue($this->_rowset));
 
-        $t = new Date\Date;
+        $t = clone $this->now;
         $rowdata = array(
             'id' => 'verifytokenkey',
             'verify_token' => hash('sha256', 'cba'),
@@ -305,7 +309,7 @@ public function testRespondsToValidConfirmationWithBodyContainingHubChallenge()
             ->with($this->equalTo(array('id' => 'verifytokenkey')))
             ->will($this->returnValue($this->_rowset));
 
-        $t = new Date\Date;
+        $t = clone $this->now;
         $rowdata = array(
             'id' => 'verifytokenkey',
             'verify_token' => hash('sha256', 'cba'),
@@ -348,7 +352,6 @@ public function testRespondsToValidFeedUpdateRequestWith200Response()
             ->with($this->equalTo(array('id' => 'verifytokenkey')))
             ->will($this->returnValue($this->_rowset));
 
-        $t = new Date\Date;
         $rowdata = array(
             'id' => 'verifytokenkey',
             'verify_token' => hash('sha256', 'cba'),