Add TTLCache, refactor base class

1 files changed, 5 insertions, 36 deletions

diff --git a/tests/test_cache.py b/tests/test_cache.py
index e2a58e6..60e9220 100644
--- a/tests/test_cache.py
+++ b/tests/test_cache.py
@@ -1,41 +1,10 @@
 import unittest
 
-import cachetools
-import collections
+from . import CacheTestMixin
+from cachetools import Cache
 
 
-class CacheTest(unittest.TestCase):
+class CacheTest(unittest.TestCase, CacheTestMixin):
 
-    def test_dict_cache(self):
-        cache = cachetools._Cache({'a': 1, 'b': 2}, maxsize=2)
-
-        self.assertEqual(len(cache), 2)
-        self.assertEqual(cache['a'], 1)
-        self.assertEqual(cache['b'], 2)
-
-        cache['c'] = 3
-
-        self.assertEqual(len(cache), 2)
-        self.assertTrue('a' in cache or 'b' in cache)
-        self.assertEqual(cache['c'], 3)
-
-        cache.maxsize = 1
-
-        self.assertEqual(len(cache), 1)
-        self.assertTrue('a' in cache or 'b' in cache or 'c' in cache)
-
-    def test_ordered_dict_cache(self):
-        cache = cachetools._Cache(collections.OrderedDict(), maxsize=2)
-
-        cache['a'] = 1
-        cache['b'] = 2
-        cache['c'] = 3
-
-        self.assertEqual(len(cache), 2)
-        self.assertEqual(cache['b'], 2)
-        self.assertEqual(cache['c'], 3)
-
-        cache.maxsize = 1
-
-        self.assertEqual(len(cache), 1)
-        self.assertEqual(cache['c'], 3)
+    def make_cache(self, maxsize, getsizeof=None):
+        return Cache(maxsize, getsizeof)