Fixes test errors from ZF-9188

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

library/Zend/Cache/Manager.php

@@ -165,7 +165,7 @@ class Zend_Cache_Manager
                 || !$this->_optionTemplates[$name]['backend']['options']['tag_cache'] instanceof Zend_Cache_Core)
             ) {
                 $this->_optionTemplates[$name]['backend']['options']['tag_cache']
-                    = $this->getCache(self::PAGETAGCACHE );
+                    = $this->getCache(self::PAGETAGCACHE);
             }
             $this->_caches[$name] = Zend_Cache::factory(
                 $this->_optionTemplates[$name]['frontend']['name'],

tests/Zend/Cache/AllTests.php

@@ -74,6 +74,7 @@ class Zend_Cache_AllTests
         $suite->addTestSuite('Zend_Cache_ClassFrontendTest');
         $suite->addTestSuite('Zend_Cache_FileFrontendTest');
         $suite->addTestSuite('Zend_Cache_PageFrontendTest');
+        $suite->addTestSuite('Zend_Cache_ManagerTest');
 
         /*
          * Check if SQLite tests are enabled, and if extension and driver are available.

tests/Zend/Cache/ManagerTest.php

@@ -58,20 +58,20 @@ class Zend_Cache_ManagerTest extends PHPUnit_Framework_TestCase
     public function testLazyLoadsDefaultPageCache()
     {
         $manager = new Zend_Cache_Manager;
-        $manager->setTemplateOptions('tagCache',array(
+        $manager->setTemplateOptions('pagetag',array(
             'backend' => array(
                 'options' => array(
                     'cache_dir' => $this->_cache_dir
                 )
             )
         ));
-        $this->assertTrue($manager->getCache('page') instanceof Zend_Cache_Frontend_Output);
+        $this->assertTrue($manager->getCache('page') instanceof Zend_Cache_Frontend_Capture);
     }
 
     public function testCanOverrideCacheFrontendNameConfiguration()
     {
         $manager = new Zend_Cache_Manager;
-        $manager->setTemplateOptions('tagCache',array(
+        $manager->setTemplateOptions('pagetag',array(
             'backend' => array(
                 'options' => array(
                     'cache_dir' => $this->_cache_dir
@@ -96,15 +96,15 @@ class Zend_Cache_ManagerTest extends PHPUnit_Framework_TestCase
                 )
             )
         ));
-        $manager->setTemplateOptions('tagCache', $config);
-        $options = $manager->getCacheTemplate('tagCache');
+        $manager->setTemplateOptions('pagetag', $config);
+        $options = $manager->getCacheTemplate('pagetag');
         $this->assertEquals($this->_cache_dir, $options['backend']['options']['cache_dir']);
     }
 
     public function testCanOverrideCacheBackendendNameConfiguration()
     {
         $manager = new Zend_Cache_Manager;
-        $manager->setTemplateOptions('tagCache',array(
+        $manager->setTemplateOptions('pagetag',array(
             'backend' => array(
                 'options' => array(
                     'cache_dir' => $this->_cache_dir
@@ -218,7 +218,7 @@ class Zend_Cache_ManagerTest extends PHPUnit_Framework_TestCase
         $manager = new Zend_Cache_Manager;
         $tagCacheConfig = $manager->getCacheTemplate('tagCache');
         $tagCacheConfig['backend']['options']['cache_dir'] = $this->getTmpDir();
-        $manager->setCacheTemplate('tagCache', $tagCacheConfig);
+        $manager->setCacheTemplate('pagetag', $tagCacheConfig);
         $tagCache = $manager->getCache('page')->getBackend()->getOption('tag_cache');
         $this->assertTrue($tagCache instanceof Zend_Cache_Core);
     }