ZF-8690 Renaming the CacheManager Resource Plugin to 'Cache' (unittests updated)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20024 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Application/Resource/AllTests.php

@@ -27,7 +27,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 require_once 'Zend/Application/Resource/ResourceAbstractTest.php';
-require_once 'Zend/Application/Resource/CacheManagerTest.php';
+require_once 'Zend/Application/Resource/CacheTest.php';
 require_once 'Zend/Application/Resource/DbTest.php';
 require_once 'Zend/Application/Resource/DojoTest.php';
 require_once 'Zend/Application/Resource/FrontcontrollerTest.php';
@@ -60,7 +60,7 @@ class Zend_Application_Resource_AllTests
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Application_Resource');
 
         $suite->addTestSuite('Zend_Application_Resource_ResourceAbstractTest');
-        $suite->addTestSuite('Zend_Application_Resource_CacheManagerTest');
+        $suite->addTestSuite('Zend_Application_Resource_CacheTest');
         $suite->addTestSuite('Zend_Application_Resource_DbTest');
         $suite->addTestSuite('Zend_Application_Resource_DojoTest');
         $suite->addTestSuite('Zend_Application_Resource_FrontcontrollerTest');

tests/Zend/Application/Resource/CacheManagerTest.php → tests/Zend/Application/Resource/CacheTest.php

@@ -42,7 +42,7 @@ require_once 'Zend/Controller/Front.php';
 /**
  * Zend_Application_Resource_Cachemanager
  */
-require_once 'Zend/Application/Resource/Cachemanager.php';
+require_once 'Zend/Application/Resource/Cache.php';
 
 /**
  * @category   Zend
@@ -52,7 +52,7 @@ require_once 'Zend/Application/Resource/Cachemanager.php';
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Application
  */
-class Zend_Application_Resource_CacheManagerTest extends PHPUnit_Framework_TestCase
+class Zend_Application_Resource_CacheTest extends PHPUnit_Framework_TestCase
 {
     public static function main()
     {
@@ -100,22 +100,22 @@ class Zend_Application_Resource_CacheManagerTest extends PHPUnit_Framework_TestC
     public function testInitializationCreatesCacheManagerInstance()
     {
 
-        $resource = new Zend_Application_Resource_Cachemanager(array());
+        $resource = new Zend_Application_Resource_Cache(array());
         $resource->init();
-        $this->assertTrue($resource->getCachemanager() instanceof Zend_Cache_Manager);
+        $this->assertTrue($resource->getCache() instanceof Zend_Cache_Manager);
     }
 
     public function testInitializationPushesCacheManagerToBootstrapWhenPresent()
     {
-        $resource = new Zend_Application_Resource_Cachemanager(array());
+        $resource = new Zend_Application_Resource_Cache(array());
         $resource->setBootstrap($this->bootstrap);
         $resource->init();
-        $this->assertSame($resource->getCachemanager(), $this->bootstrap->cacheManager);
+        $this->assertSame($resource->getCache(), $this->bootstrap->cacheManager);
     }
 
     public function testShouldReturnCacheManagerWhenComplete()
     {
-        $resource = new Zend_Application_Resource_Cachemanager(array());
+        $resource = new Zend_Application_Resource_Cache(array());
         $manager = $resource->init();
         $this->assertTrue($manager instanceof Zend_Cache_Manager);
     }
@@ -131,12 +131,14 @@ class Zend_Application_Resource_CacheManagerTest extends PHPUnit_Framework_TestC
                 )
             )
         );
-        $resource = new Zend_Application_Resource_Cachemanager($options);
+
+        $resource = new Zend_Application_Resource_Cache($options);
         $manager = $resource->init();
         $cacheTemplate = $manager->getCacheTemplate('page');
         $this->assertEquals('/foo', $cacheTemplate['backend']['options']['cache_dir']);
 
     }
+    
     public function testShouldCreateNewCacheTemplateIfConfigNotMatchesADefaultTemplate()
     {
         $options = array(
@@ -148,14 +150,15 @@ class Zend_Application_Resource_CacheManagerTest extends PHPUnit_Framework_TestC
                 )
             )
         );
-        $resource = new Zend_Application_Resource_Cachemanager($options);
+
+        $resource = new Zend_Application_Resource_Cache($options);
         $manager = $resource->init();
         $cacheTemplate = $manager->getCacheTemplate('foo');
         $this->assertSame($options['foo'], $cacheTemplate);
     }
-
+    
 }
 
-if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_CacheManagerTest::main') {
-    Zend_Application_Resource_CacheManagerTest::main();
+if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_CacheTest::main') {
+    Zend_Application_Resource_CacheTest::main();
 }