update configuration of disabled resource tests

This commit is contained in:
uwetews
2015-12-30 21:14:22 +01:00
parent 1800432c4c
commit b887f18acf
8 changed files with 190 additions and 175 deletions

View File

@@ -6,6 +6,7 @@
/* /*
* Smarty PHPUnit Bootstrap * Smarty PHPUnit Bootstrap
*/ */
include_once __DIR__ . '/Config.php';
// Locate Autoloader or SmartyBC class and load it // Locate Autoloader or SmartyBC class and load it
if (is_file(__DIR__ . '/../smarty/libs/Autoloader.php')) { if (is_file(__DIR__ . '/../smarty/libs/Autoloader.php')) {
require_once __DIR__ . '/../smarty/libs/Autoloader.php'; require_once __DIR__ . '/../smarty/libs/Autoloader.php';
@@ -22,7 +23,7 @@ if (is_file(__DIR__ . '/../smarty/libs/Autoloader.php')) {
} }
if (!defined('SMARTY_COMPOSER_INSTALL')) { if (!defined('SMARTY_COMPOSER_INSTALL')) {
foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php',
__DIR__ . '/vendor/autoload.php') as $file) { __DIR__ . '/vendor/autoload.php') as $file) {
if (file_exists($file)) { if (file_exists($file)) {
define('SMARTY_COMPOSER_INSTALL', $file); define('SMARTY_COMPOSER_INSTALL', $file);
break; break;

View File

@@ -4,8 +4,6 @@
* *
*/ */
include_once __DIR__ . '/Config.php';
/** /**
* Smarty Test Case Fixture * Smarty Test Case Fixture
*/ */
@@ -106,7 +104,7 @@ class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
define('individualFolders', true); define('individualFolders', true);
} }
parent::__construct($name, $data, $dataName); parent::__construct($name, $data, $dataName);
$this->backupStaticAttributesBlacklist[get_class($this)] = array('init', 'config', 'pdo'); $this->backupStaticAttributesBlacklist[ get_class($this) ] = array('init', 'config', 'pdo');
} }
/** /**
@@ -129,10 +127,10 @@ class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
mkdir($dir . '/configs'); mkdir($dir . '/configs');
} }
if (individualFolders != 'true') { if (individualFolders != 'true') {
if (!isset($s_dir[$dir])) { if (!isset($s_dir[ $dir ])) {
$this->cleanDir($dir . '/templates_c'); $this->cleanDir($dir . '/templates_c');
$this->cleanDir($dir . '/cache'); $this->cleanDir($dir . '/cache');
$s_dir[$dir] = true; $s_dir[ $dir ] = true;
} }
$dir = __DIR__; $dir = __DIR__;
} }
@@ -351,7 +349,8 @@ KEY `expire` (`expire`)
case 'file': case 'file':
case 'filetest': case 'filetest':
if ($tpl instanceof Smarty) { if ($tpl instanceof Smarty) {
return sha1($this->normalizePath($this->smarty->getTemplateDir(0) . $name) . $this->smarty->_joined_template_dir); return sha1($this->normalizePath($this->smarty->getTemplateDir(0) . $name) .
$this->smarty->_joined_template_dir);
} }
return sha1($tpl->source->filepath . $this->smarty->_joined_template_dir); return sha1($tpl->source->filepath . $this->smarty->_joined_template_dir);
case 'mysqltest': case 'mysqltest':
@@ -375,7 +374,7 @@ KEY `expire` (`expire`)
*/ */
public function normalizePath($path) public function normalizePath($path)
{ {
if ($path[0] == '.') { if ($path[ 0 ] == '.') {
$path = getcwd() . DS . $path; $path = getcwd() . DS . $path;
} }
$path = preg_replace('#[\\\/]+([.][\\\/]+)*#', DS, $path); $path = preg_replace('#[\\\/]+([.][\\\/]+)*#', DS, $path);
@@ -532,15 +531,15 @@ KEY `expire` (`expire`)
$uid = $this->buildUid($tpl, $sp, $name, $type); $uid = $this->buildUid($tpl, $sp, $name, $type);
$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null; $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
$_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null; $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
return sha1($uid . $_cache_id . $_compile_id); return sha1($uid . $_cache_id . $_compile_id);
case 'memcachetest': case 'memcachetest':
case 'acp': case 'acp':
$sp = $this->buildSourcePath($tpl, $name, $type, $dir); $sp = $this->buildSourcePath($tpl, $name, $type, $dir);
$uid = $this->buildUid($tpl, $sp, $name, $type); $uid = $this->buildUid($tpl, $sp, $name, $type);
$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null; $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
$_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null; $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
return sha1($uid) . '#' . preg_replace('#[^\w\|]+#S', '_', $tpl->template_resource) . '#' . return sha1($uid) . '#' . preg_replace('#[^\w\|]+#S', '_', $tpl->template_resource) . '#' . $_cache_id .
$_cache_id . '#' . $_compile_id; '#' . $_compile_id;
default: default:
throw new Exception("Unhandled cache resource type '{$cacheType}'"); throw new Exception("Unhandled cache resource type '{$cacheType}'");

View File

@@ -5,31 +5,32 @@
* @package PHPunit * @package PHPunit
* @author Uwe Tews * @author Uwe Tews
*/ */
if (ApcCacheEnable == true) {
include_once __DIR__ . '/../Memcache/CacheResourceCustomMemcacheTest.php';
include_once __DIR__ . '/../Memcache/CacheResourceCustomMemcacheTest.php'; /**
* class for cache resource file tests
/** *
* class for cache resource file tests * @runTestsInSeparateProcess
* * @preserveGlobalState disabled
* @runTestsInSeparateProcess * @backupStaticAttributes enabled
* @preserveGlobalState disabled */
* @backupStaticAttributes enabled class CacheResourceCustomApcTest extends CacheResourceCustomMemcacheTest
*/
class CacheResourceCustomApcTest extends CacheResourceCustomMemcacheTest
{
public function setUp()
{ {
if (ApcCacheEnable != true) { public function setUp()
$this->markTestSkipped('Apc tests are disabled'); {
} else { if (ApcCacheEnable != true) {
if (!function_exists('apc_cache_info') || ini_get('apc.enable_cli')) { $this->markTestSkipped('Apc tests are disabled');
$this->markTestSkipped('APC cache not available'); } else {
if (!function_exists('apc_cache_info') || ini_get('apc.enable_cli')) {
$this->markTestSkipped('APC cache not available');
}
} }
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('apc');
$this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
} }
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('apc');
$this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
} }
} }

View File

@@ -5,44 +5,46 @@
* @package PHPunit * @package PHPunit
* @author Uwe Tews * @author Uwe Tews
*/ */
if (MemCacheEnable == true) {
include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php'; include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php';
/**
* class for cache resource memcache tests
*
* @runTestsInSeparateProcess
* @preserveGlobalState disabled
* @backupStaticAttributes enabled
*/
class CacheResourceCustomMemcacheTest extends CacheResourceTestCommon
{
/** /**
* Sets up the fixture * class for cache resource memcache tests
* This method is called before a test is executed.
* *
* @runTestsInSeparateProcess
* @preserveGlobalState disabled
* @backupStaticAttributes enabled
*/ */
public function setUp() class CacheResourceCustomMemcacheTest extends CacheResourceTestCommon
{ {
if (MemCacheEnable != true) { /**
$this->markTestSkipped('Memcache tests are disabled'); * Sets up the fixture
} else { * This method is called before a test is executed.
if (!class_exists('Memcache')) { *
$this->markTestSkipped('Memcache not available'); */
public function setUp()
{
if (MemCacheEnable != true) {
$this->markTestSkipped('Memcache tests are disabled');
} else {
if (!class_exists('Memcache')) {
$this->markTestSkipped('Memcache not available');
}
} }
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('memcachetest');
} }
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('memcachetest');
}
public function testInit() public function testInit()
{ {
$this->cleanDirs(); $this->cleanDirs();
} }
protected function doClearCacheAssertion($a, $b) protected function doClearCacheAssertion($a, $b)
{ {
$this->assertEquals(- 1, $b); $this->assertEquals(- 1, $b);
}
} }
} }

View File

@@ -5,36 +5,38 @@
* @package PHPunit * @package PHPunit
* @author Uwe Tews * @author Uwe Tews
*/ */
if (MysqlCacheEnable == true) {
include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php'; include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php';
/** /**
* class for cache resource file tests * class for cache resource file tests
* *
* @runTestsInSeparateProcess * @runTestsInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @backupStaticAttributes enabled * @backupStaticAttributes enabled
*/ */
class CacheResourceCustomMysqlTest extends CacheResourceTestCommon class CacheResourceCustomMysqlTest extends CacheResourceTestCommon
{
public function setUp()
{ {
if (MysqlCacheEnable != true) {
$this->markTestSkipped('mysql tests are disabled');
}
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('mysqltest');
}
public function testInit() public function setUp()
{ {
$this->cleanDirs(); if (MysqlCacheEnable != true) {
$this->initMysqlCache(); $this->markTestSkipped('mysql tests are disabled');
}
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('mysqltest');
}
public function testInit()
{
$this->cleanDirs();
$this->initMysqlCache();
}
} }
} }

View File

@@ -5,39 +5,43 @@
* @package PHPunit * @package PHPunit
* @author Uwe Tews * @author Uwe Tews
*/ */
if (PdoCacheEnable == true) {
include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php'; include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php';
/** /**
* class for cache resource file tests * class for cache resource file tests
* *
* @runTestsInSeparateProcess * @runTestsInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @backupStaticAttributes enabled * @backupStaticAttributes enabled
*/ */
class CacheResourceCustomPDOTest extends CacheResourceTestCommon class CacheResourceCustomPDOTest extends CacheResourceTestCommon
{
public function setUp($dir = null, $clear = true)
{ {
if (PdoCacheEnable != true) {
$this->markTestSkipped('mysql Pdo tests are disabled');
}
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('pdo');
$this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
$this->assertTrue(false !== $this->smarty->loadPlugin('Smarty_CacheResource_Pdotest'), 'loadPlugin() could not load PDO cache resource');
$this->smarty->registerCacheResource('pdo', new Smarty_CacheResource_Pdotest($this->getPDO(), 'output_cache'));
}
public function testInit() public function setUp($dir = null, $clear = true)
{ {
$this->cleanDirs(); if (PdoCacheEnable != true) {
$this->initMysqlCache(); $this->markTestSkipped('mysql Pdo tests are disabled');
}
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('pdo');
$this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
$this->assertTrue(false !== $this->smarty->loadPlugin('Smarty_CacheResource_Pdotest'),
'loadPlugin() could not load PDO cache resource');
$this->smarty->registerCacheResource('pdo',
new Smarty_CacheResource_Pdotest($this->getPDO(), 'output_cache'));
}
public function testInit()
{
$this->cleanDirs();
$this->initMysqlCache();
}
} }
} }

View File

@@ -5,37 +5,41 @@
* @package PHPunit * @package PHPunit
* @author Uwe Tews * @author Uwe Tews
*/ */
if (PdoGzipCacheEnable == true) {
include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php'; include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php';
/** /**
* class for cache resource file tests * class for cache resource file tests
* *
* @backupStaticAttributes enabled * @backupStaticAttributes enabled
*/ */
class CacheResourceCustomPDOGzipTest extends CacheResourceTestCommon class CacheResourceCustomPDOGzipTest extends CacheResourceTestCommon
{
public function setUp($dir = null, $clear = true)
{ {
if (PdoGzipCacheEnable != true) {
$this->markTestSkipped('mysql Pdo Gzip tests are disabled');
}
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('pdo');
$this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
$this->assertTrue(false !== $this->smarty->loadPlugin('Smarty_CacheResource_Pdo_Gziptest'), 'loadPlugin() could not load PDOGzip cache resource');
$this->smarty->registerCacheResource('pdo', new Smarty_CacheResource_Pdo_Gziptest($this->getPDO(), 'output_cache'));
}
public function testInit() public function setUp($dir = null, $clear = true)
{ {
$this->cleanDirs(); if (PdoGzipCacheEnable != true) {
$this->initMysqlCache(); $this->markTestSkipped('mysql Pdo Gzip tests are disabled');
}
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
$this->smarty->setCachingType('pdo');
$this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
$this->assertTrue(false !== $this->smarty->loadPlugin('Smarty_CacheResource_Pdo_Gziptest'),
'loadPlugin() could not load PDOGzip cache resource');
$this->smarty->registerCacheResource('pdo', new Smarty_CacheResource_Pdo_Gziptest($this->getPDO(),
'output_cache'));
}
public function testInit()
{
$this->cleanDirs();
$this->initMysqlCache();
}
} }
} }

View File

@@ -5,38 +5,40 @@
* @package PHPunit * @package PHPunit
* @author Uwe Tews * @author Uwe Tews
*/ */
include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php'; if (MysqlCacheEnable == true) {
include_once __DIR__ . '/../_shared/CacheResourceTestCommon.php';
/** /**
* class for cache resource file tests * class for cache resource file tests
* *
* @runTestsInSeparateProcess * @runTestsInSeparateProcess
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @backupStaticAttributes enabled * @backupStaticAttributes enabled
*/ */
class CacheResourceCustomRegisteredTest extends CacheResourceTestCommon class CacheResourceCustomRegisteredTest extends CacheResourceTestCommon
{
public function setUp()
{ {
if (MysqlCacheEnable != true) { public function setUp()
$this->markTestSkipped('mysql tests are disabled'); {
if (MysqlCacheEnable != true) {
$this->markTestSkipped('mysql tests are disabled');
}
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
if (!class_exists('Smarty_CacheResource_Mysqltest', false)) {
require_once(__DIR__ . "/../_shared/PHPunitplugins/cacheresource.mysqltest.php");
}
$this->smarty->setCachingType('foobar');
$this->smarty->registerCacheResource('foobar', new Smarty_CacheResource_Mysqltest());
} }
if (self::$init) {
$this->getConnection();
}
$this->setUpSmarty(__DIR__);
parent::setUp();
if (!class_exists('Smarty_CacheResource_Mysqltest', false)) {
require_once(__DIR__ . "/../_shared/PHPunitplugins/cacheresource.mysqltest.php");
}
$this->smarty->setCachingType('foobar');
$this->smarty->registerCacheResource('foobar', new Smarty_CacheResource_Mysqltest());
}
public function testInit() public function testInit()
{ {
$this->cleanDirs(); $this->cleanDirs();
$this->initMysqlCache(); $this->initMysqlCache();
}
} }
} }