diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php index 0906bb43d1964..5ee749d8d2da8 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php @@ -11,12 +11,11 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use Cache\IntegrationTests\CachePoolTest; use Psr\Cache\CacheItemInterface; use Symfony\Component\Cache\Adapter\NullAdapter; use Symfony\Component\Cache\Adapter\PhpArrayAdapter; -class PhpArrayAdapterTest extends CachePoolTest +class PhpArrayAdapterTest extends AdapterTestCase { protected $skippedTests = array( 'testBasicUsage' => 'PhpArrayAdapter is read-only.', @@ -45,6 +44,8 @@ class PhpArrayAdapterTest extends CachePoolTest 'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.', 'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.', 'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.', + + 'testDefaultLifeTime' => 'PhpArrayAdapter does not allow configuring a default lifetime.', ); private static $file; diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php index 72ba51221a344..7c71fa83aef5d 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php @@ -11,14 +11,13 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use Cache\IntegrationTests\CachePoolTest; use Symfony\Component\Cache\Adapter\FilesystemAdapter; use Symfony\Component\Cache\Adapter\PhpArrayAdapter; /** * @group time-sensitive */ -class PhpArrayAdapterWithFallbackTest extends CachePoolTest +class PhpArrayAdapterWithFallbackTest extends AdapterTestCase { protected $skippedTests = array( 'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.', @@ -26,6 +25,7 @@ class PhpArrayAdapterWithFallbackTest extends CachePoolTest 'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.', 'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.', 'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.', + 'testDefaultLifeTime' => 'PhpArrayAdapter does not allow configuring a default lifetime.', ); private static $file; diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php index e3d6024f34dc6..94e3fef83e334 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php @@ -11,14 +11,17 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use Cache\IntegrationTests\CachePoolTest; use Symfony\Component\Cache\Adapter\PhpFilesAdapter; /** * @group time-sensitive */ -class PhpFilesAdapterTest extends CachePoolTest +class PhpFilesAdapterTest extends AdapterTestCase { + protected $skippedTests = array( + 'testDefaultLifeTime' => 'PhpFilesAdapter does not allow configuring a default lifetime.', + ); + public function createCachePool() { if (defined('HHVM_VERSION')) { diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisAdapterTest.php index 2a61d49bce706..2cf9462771e15 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisAdapterTest.php @@ -24,12 +24,12 @@ public static function setupBeforeClass() self::$redis->connect('127.0.0.1'); } - public function createCachePool() + public function createCachePool($defaultLifeTime = 0) { if (defined('HHVM_VERSION')) { $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM'; } - return new TagAwareRedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__)); + return new TagAwareRedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifeTime); } } diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisArrayAdapterTest.php index 0a0f212eee283..0d655d9d1f617 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisArrayAdapterTest.php @@ -30,12 +30,12 @@ public static function setupBeforeClass() self::$redis->connect('127.0.0.1'); } - public function createCachePool() + public function createCachePool($defaultLifeTime = 0) { if (defined('HHVM_VERSION')) { $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM'; } - return new TagAwareRedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), 0, new ArrayAdapter()); + return new TagAwareRedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), 0, new ArrayAdapter($defaultLifeTime)); } }