From 29802faef42526b467ee3d618fb706bc2d4646dd Mon Sep 17 00:00:00 2001 From: Dustin Whittle Date: Tue, 19 Apr 2011 01:04:25 -0700 Subject: [PATCH] [Classloader] Refactored ApcUniversalClassLoader to use setUp() to detect APC --- .../ClassLoader/ApcUniversalClassLoaderTest.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/Symfony/Tests/Component/ClassLoader/ApcUniversalClassLoaderTest.php b/tests/Symfony/Tests/Component/ClassLoader/ApcUniversalClassLoaderTest.php index 9484b8ae6b..e74d93fc3c 100644 --- a/tests/Symfony/Tests/Component/ClassLoader/ApcUniversalClassLoaderTest.php +++ b/tests/Symfony/Tests/Component/ClassLoader/ApcUniversalClassLoaderTest.php @@ -16,7 +16,7 @@ use Symfony\Component\ClassLoader\ApcUniversalClassLoader; class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase { - protected function skipIfAPCExtensionIsNotLoadedOrEnabled() + protected function setUp() { if (!extension_loaded('apc')) { $this->markTestSkipped('The apc extension is not available.'); @@ -29,8 +29,6 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase public function testConstructor() { - $this->skipIfAPCExtensionIsNotLoadedOrEnabled(); - $loader = new ApcUniversalClassLoader('test.prefix.'); $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); @@ -42,8 +40,6 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase */ public function testLoadClass($className, $testClassName, $message) { - $this->skipIfAPCExtensionIsNotLoadedOrEnabled(); - $loader = new ApcUniversalClassLoader('test.prefix.'); $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); @@ -66,8 +62,6 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase */ public function testLoadClassFromFallback($className, $testClassName, $message) { - $this->skipIfAPCExtensionIsNotLoadedOrEnabled(); - $loader = new ApcUniversalClassLoader('test.prefix.'); $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); @@ -92,8 +86,6 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase */ public function testLoadClassNamespaceCollision($namespaces, $className, $message) { - $this->skipIfAPCExtensionIsNotLoadedOrEnabled(); - $loader = new ApcUniversalClassLoader('test.prefix.'); $loader->registerNamespaces($namespaces); @@ -144,8 +136,6 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase */ public function testLoadClassPrefixCollision($prefixes, $className, $message) { - $this->skipIfAPCExtensionIsNotLoadedOrEnabled(); - $loader = new ApcUniversalClassLoader('test.prefix.'); $loader->registerPrefixes($prefixes);