Add clear() tests for TTLCache and TLRUCache.

Author: jponf

tests/test_lru.py

@@ -72,8 +72,6 @@ def test_lru_clear(self):
 
         cache[1] = 1
         cache[2] = 2
-        cache[1]  # access to make 1 most recently used
-
         cache.clear()
 
         self.assertEqual(0, len(cache))

tests/test_tlru.py

@@ -299,3 +299,24 @@ def test_ttu_heap_cleanup(self):
         expired = cache.expire()
         self.assertEqual(4, len(expired))
         self.assertEqual(0, len(cache))
+
+    def test_tlru_clear(self):
+        cache = TLRUCache(maxsize=2, ttu=lambda k, v, t: t + 2, timer=Timer())
+
+        cache[1] = 1
+        cache[2] = 2
+        cache.clear()
+
+        self.assertEqual(0, len(cache))
+        self.assertEqual(0, cache.currsize)
+
+        # verify LRU order is reset after clear
+        cache[3] = 3
+        cache[4] = 4
+        cache[3]  # access 3 to make it most recently used
+        cache[5] = 5  # should evict 4 (least recently used)
+
+        self.assertEqual(2, len(cache))
+        self.assertIn(3, cache)
+        self.assertIn(5, cache)
+        self.assertNotIn(4, cache)

tests/test_ttl.py

@@ -215,3 +215,24 @@ def test_ttl_datetime(self):
         items = cache.expire(datetime.now() + timedelta(days=1))
         self.assertEqual([(1, 1)], list(items))
         self.assertEqual(0, len(cache))
+
+    def test_ttl_clear(self):
+        cache = TTLCache(maxsize=2, ttl=2, timer=Timer())
+
+        cache[1] = 1
+        cache[2] = 2
+        cache.clear()
+
+        self.assertEqual(0, len(cache))
+        self.assertEqual(0, cache.currsize)
+
+        # verify LRU order is reset after clear
+        cache[3] = 3
+        cache[4] = 4
+        cache[3]  # access 3 to make it most recently used
+        cache[5] = 5  # should evict 4 (least recently used)
+
+        self.assertEqual(2, len(cache))
+        self.assertIn(3, cache)
+        self.assertIn(5, cache)
+        self.assertNotIn(4, cache)