Просмотр исходного кода

ZF-8809: use explicit locale and caching in currency view helper test; clean cache in currency test

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20265 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 16 лет назад
Родитель
Сommit
8d8b86962e
2 измененных файлов с 15 добавлено и 3 удалено
  1. 7 2
      tests/Zend/CurrencyTest.php
  2. 8 1
      tests/Zend/View/Helper/CurrencyTest.php

+ 7 - 2
tests/Zend/CurrencyTest.php

@@ -50,10 +50,15 @@ class Zend_CurrencyTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         require_once 'Zend/Cache.php';
-        $cache = Zend_Cache::factory('Core', 'File',
+        $this->_cache = Zend_Cache::factory('Core', 'File',
                  array('lifetime' => 120, 'automatic_serialization' => true),
                  array('cache_dir' => dirname(__FILE__) . '/_files/'));
-        Zend_Currency::setCache($cache);
+        Zend_Currency::setCache($this->_cache);
+    }
+
+    public function tearDown()
+    {
+        $this->_cache->clean(Zend_Cache::CLEANING_MODE_ALL);
     }
 
     /**

+ 8 - 1
tests/Zend/View/Helper/CurrencyTest.php

@@ -85,7 +85,13 @@ class Zend_View_Helper_CurrencyTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->clearRegistry();
-        $this->helper = new Zend_View_Helper_Currency();
+        require_once 'Zend/Cache.php';
+        $this->_cache = Zend_Cache::factory('Core', 'File',
+                 array('lifetime' => 120, 'automatic_serialization' => true),
+                 array('cache_dir' => dirname(__FILE__) . '/../../_files/'));
+        Zend_Currency::setCache($this->_cache);
+
+        $this->helper = new Zend_View_Helper_Currency('de_AT');
     }
 
     /**
@@ -97,6 +103,7 @@ class Zend_View_Helper_CurrencyTest extends PHPUnit_Framework_TestCase
     public function tearDown()
     {
         unset($this->helper);
+        $this->_cache->clean(Zend_Cache::CLEANING_MODE_ALL);
         $this->clearRegistry();
     }