[Erp5-report] r11122 - /erp5/trunk/products/ERP5Type/tests/testERP5Type.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Nov  6 15:30:32 2006
New Revision: 11122

URL: http://svn.erp5.org?rev=11122&view=rev
Log:
method_id= in clearCache is not part of the API.


Modified:
    erp5/trunk/products/ERP5Type/tests/testERP5Type.py

Modified: erp5/trunk/products/ERP5Type/tests/testERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testERP5Type.py?rev=11122&r1=11121&r2=11122&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testERP5Type.py (original)
+++ erp5/trunk/products/ERP5Type/tests/testERP5Type.py Mon Nov  6 15:30:32 2006
@@ -370,33 +370,23 @@
     def test_06_CachingMethod(self, quiet=quiet, run=run_all_test):
       """Tests Caching methods."""
       if not run: return
-      cached_var1 = cached_var1_orig = 'cached_var1'
-      cached_var2 = cached_var2_orig = 'cached_var2'
-
-      def _cache1():
-        return cached_var1
-      def _cache2():
-        return cached_var2
+      cached_var = cached_var_orig = 'cached_var1'
+
+      def _cache():
+        return cached_var
       
       from Products.ERP5Type.Cache import CachingMethod, clearCache
-      cache1 = CachingMethod(_cache1, id='_cache1')
-      cache2 = CachingMethod(_cache2, id='_cache2')
-      
-      self.assertEquals(cache1(), cached_var1)
-      self.assertEquals(cache2(), cached_var2)
-      
-      cached_var1 = 'cached_var1 (modified)'
-      cached_var2 = 'cached_var2 (modified)'
-      self.assertEquals(cache1(), cached_var1_orig)
+      cache1 = CachingMethod(_cache, id='testing_cache')
+      
+      self.assertEquals(cache(), cached_var)
+      
+      # change the variable
+      cached_var = 'cached_var (modified)'
+      # cache hit -> still the old variable
+      self.assertEquals(cache(), cached_var_orig)
         
-      # clearCache with a method argument only clear this cache
-      clearCache(method_id = '_cache1')
-      self.assertEquals(cache1(), cached_var1)
-      self.assertEquals(cache2(), cached_var2_orig)
-      
-      # clearCache with no arguments clear all caches
       clearCache()
-      self.assertEquals(cache2(), cached_var2)
+      self.assertEquals(cache(), cached_var)
 
     def test_07_afterCloneScript(self, quiet=quiet, run=run_all_test):
       """manage_afterClone can call a type based script."""