[Zope3-checkins] CVS: Zope3/src/zope/app/cache/tests - test_annotationcacheable.py:1.13 test_cachename.py:1.8 test_caching.py:1.13 test_icache.py:1.4 test_ramcache.py:1.12

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/cache/tests
In directory cvs.zope.org:/tmp/cvs-serv22236/cache/tests

Modified Files:
	test_annotationcacheable.py test_cachename.py test_caching.py 
	test_icache.py test_ramcache.py 
Log Message:
Combined all cache-related code in the zope.app.cache package, except
for the cache service which is going to be converted to a utility anyway.


=== Zope3/src/zope/app/cache/tests/test_annotationcacheable.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/cache/tests/test_annotationcacheable.py:1.12	Wed Feb 25 18:02:22 2004
+++ Zope3/src/zope/app/cache/tests/test_annotationcacheable.py	Mon Mar  1 05:57:36 2004
@@ -22,7 +22,7 @@
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.app.cache.annotationcacheable import AnnotationCacheable
-from zope.app.interfaces.cache import ICachingService
+from zope.app.cache.interfaces import ICachingService
 from zope.component.service import serviceManager as sm
 from zope.app.interfaces.services.service import ISimpleService
 from zope.interface import implements


=== Zope3/src/zope/app/cache/tests/test_cachename.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/cache/tests/test_cachename.py:1.7	Thu Dec 18 04:57:11 2003
+++ Zope3/src/zope/app/cache/tests/test_cachename.py	Mon Mar  1 05:57:36 2004
@@ -18,13 +18,13 @@
 $Id$
 """
 import unittest
+from zope.interface import implements
 
-from zope.app.interfaces.cache import CacheName
+from zope.app.cache.interfaces import CacheName
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.app.tests import setup
 from zope.app.interfaces.services.service import ILocalService
 from zope.app.interfaces.annotation import IAttributeAnnotatable
-from zope.interface import implements
 
 __metaclass__ = type
 


=== Zope3/src/zope/app/cache/tests/test_caching.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/cache/tests/test_caching.py:1.12	Wed Feb 25 18:02:22 2004
+++ Zope3/src/zope/app/cache/tests/test_caching.py	Mon Mar  1 05:57:36 2004
@@ -17,20 +17,20 @@
 """
 
 from unittest import TestCase, TestSuite, main, makeSuite
+from zope.component import getAdapter, getService
+from zope.interface import implements
+from zope.component.service import serviceManager as sm
+
 from zope.app.tests import ztapi
-from zope.app.interfaces.cache import ICacheable, ICachingService
+from zope.app.cache.interfaces import ICacheable, ICachingService
 from zope.app.cache.caching import getCacheForObj
 from zope.app.cache.annotationcacheable import AnnotationCacheable
 from zope.app.interfaces.annotation import IAnnotatable
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.attributeannotations import AttributeAnnotations
-from zope.component import getAdapter
-from zope.component import getService
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.component.service import serviceManager as sm
 from zope.app.interfaces.services.service import ISimpleService
-from zope.interface import implements
 
 class ObjectStub:
     implements(IAttributeAnnotatable)


=== Zope3/src/zope/app/cache/tests/test_icache.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/cache/tests/test_icache.py:1.3	Tue Aug 19 13:34:12 2003
+++ Zope3/src/zope/app/cache/tests/test_icache.py	Mon Mar  1 05:57:36 2004
@@ -18,7 +18,7 @@
 
 from unittest import TestSuite, main
 from zope.interface.verify import verifyObject
-from zope.app.interfaces.cache import ICache
+from zope.app.cache.interfaces import ICache
 
 
 class BaseICacheTest:


=== Zope3/src/zope/app/cache/tests/test_ramcache.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/cache/tests/test_ramcache.py:1.11	Thu Dec 18 04:57:11 2003
+++ Zope3/src/zope/app/cache/tests/test_ramcache.py	Mon Mar  1 05:57:36 2004
@@ -17,17 +17,17 @@
 """
 from time import time
 from unittest import TestCase, TestSuite, main, makeSuite
+
+from zope.interface.verify import verifyClass, verifyObject
+from zope.interface import implements
+
 from zope.app.cache.ram import RAMCache
 from zope.app.cache.tests.test_icache import BaseICacheTest
-from zope.app.interfaces.cache import ICache
-from zope.app.interfaces.cache.ram import IRAMCache
+from zope.app.cache.interfaces import ICache
+from zope.app.cache.interfaces.ram import IRAMCache
 from zope.app.interfaces.event import ISubscriber
 from zope.app.interfaces.traversing import IPhysicallyLocatable
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.interface.verify import verifyClass, verifyObject
-from zope.interface import implements
-
-
 
 class Locatable: