Add test for saving with null lifetime that actualyl checks lifetime.

Author: colinmollenhour

tests/CommonBackendTest.php renamed to tests/CommonBackend.php

@@ -20,12 +20,6 @@
  * @version    $Id: CommonBackendTest.php 23775 2011-03-01 17:25:24Z ralph $
  */
 
-
-// backward compatibility (https://stackoverflow.com/a/42828632/187780)
-if (!class_exists('\PHPUnit\Framework\TestCase') && class_exists('\PHPUnit_Framework_TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-}
-
 /**
  * @category   Zend
  * @package    Zend_Cache
@@ -34,7 +28,7 @@ class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Cache
  */
-abstract class Zend_Cache_CommonBackendTest extends \PHPUnit\Framework\TestCase
+abstract class CommonBackend extends \PHPUnit\Framework\TestCase
 {
     protected $_instance;
     protected $_className;
@@ -105,45 +99,35 @@ public function testConstructorCorrectCall()
 
     public function testConstructorBadOption()
     {
-        try {
-            $class = $this->_className;
-            $test = new $class(array(1 => 'bar'));
-        } catch (Zend_Cache_Exception $e) {
-            return;
-        }
-        $this->fail('Zend_Cache_Exception was expected but not thrown');
+        $this->expectException('Zend_Cache_Exception');
+        $className = $this->_className;
+        new $className(array(1 => 'bar'));
     }
 
     public function testSetDirectivesCorrectCall()
     {
         $this->_instance->setDirectives(array('lifetime' => 3600));
+        $this->assertTrue(true);
     }
 
     public function testSetDirectivesBadArgument()
     {
-        try {
-            $this->_instance->setDirectives('foo');
-        } catch (Zend_Cache_Exception $e) {
-            return;
-        }
-        $this->fail('Zend_Cache_Exception was expected but not thrown');
+        $this->expectException('Zend_Cache_Exception');
+        $this->_instance->setDirectives('foo');
     }
 
     public function testSetDirectivesBadDirective()
     {
         // A bad directive (not known by a specific backend) is possible
         // => so no exception here
         $this->_instance->setDirectives(array('foo' => true, 'lifetime' => 3600));
+        $this->assertTrue(true);
     }
 
     public function testSetDirectivesBadDirective2()
     {
-        try {
-            $this->_instance->setDirectives(array('foo' => true, 12 => 3600));
-        } catch (Zend_Cache_Exception $e) {
-            return;
-        }
-        $this->fail('Zend_Cache_Exception was expected but not thrown');
+        $this->expectException('Zend_Cache_Exception');
+        $this->_instance->setDirectives(array('foo' => true, 12 => 3600));
     }
 
     public function testSaveCorrectCall()
@@ -176,14 +160,7 @@ public function testRemoveCorrectCall()
 
     public function testTestWithAnExistingCacheId()
     {
-        $res = $this->_instance->test('bar');
-        if (!$res) {
-            $this->fail('test() return false');
-        }
-        if (!($res > 999999)) {
-            $this->fail('test() return an incorrect integer');
-        }
-        return;
+        $this->assertGreaterThan(999999, $this->_instance->test('bar'));
     }
 
     public function testTestWithANonExistingCacheId()
@@ -194,14 +171,7 @@ public function testTestWithANonExistingCacheId()
     public function testTestWithAnExistingCacheIdAndANullLifeTime()
     {
         $this->_instance->setDirectives(array('lifetime' => null));
-        $res = $this->_instance->test('bar');
-        if (!$res) {
-            $this->fail('test() return false');
-        }
-        if (!($res > 999999)) {
-            $this->fail('test() return an incorrect integer');
-        }
-        return;
+        $this->assertGreaterThan(999999, $this->_instance->test('bar'));
     }
 
     public function testGetWithANonExistingCacheId()

tests/CommonExtendedBackendTest.php renamed to tests/CommonExtendedBackend.php

@@ -20,10 +20,7 @@
  * @version    $Id: CommonExtendedBackendTest.php 23775 2011-03-01 17:25:24Z ralph $
  */
 
-/**
- * @see Zend_Cache_CommonBackendTest
- */
-require_once 'CommonBackendTest.php';
+require_once 'CommonBackend.php';
 
 /**
  * @category   Zend
@@ -33,7 +30,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Cache
  */
-abstract class Zend_Cache_CommonExtendedBackendTest extends Zend_Cache_CommonBackendTest
+abstract class CommonExtendedBackend extends \CommonBackend
 {
     private $_capabilities;
 

tests/FileBackendTest.php

@@ -28,11 +28,13 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+require_once 'CommonExtendedBackend.php';
+
 /**
  * @copyright  Copyright (c) 2012 Colin Mollenhour (http://colin.mollenhour.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Cm_Cache_FileBackendTest extends Zend_Cache_CommonExtendedBackendTest
+class FileBackendTest extends \CommonExtendedBackend
 {
     protected $_instance;
     protected $_cache_dir;
@@ -59,9 +61,11 @@ public function tearDown(): void
 
     public function testConstructorBadOption()
     {
+        $this->markTestSkipped();
     }
     public function testConstructorCorrectCall()
     {
+        $this->markTestSkipped();
     }
 
     public function testGetWithANonExistingCacheIdAndANullLifeTime()
@@ -92,4 +96,11 @@ public function testSaveWithABadCacheDir()
         $this->assertFalse($res);
     }
 
+    public function testSaveWithNullLifeTime2()
+    {
+        $res = $this->_instance->save('data to cache', 'foo', array('tag1', 'tag2'), null);
+        $this->assertTrue($res);
+        $metadatas = $this->_instance->getMetadatas('foo');
+        $this->assertGreaterThan(time() + 99999999, $metadatas['expire']);
+    }
 }