test for heap

satella/coding/structures.py

@@ -227,6 +227,7 @@ class Heap(object):
     def __contains__(self, item):
         return item in self.heap
 
+
 class TimeBasedHeap(Heap):
     """
     A heap of items sorted by timestamps.
@@ -240,6 +241,9 @@ class TimeBasedHeap(Heap):
     #notthreadsafe
     """
 
+    def __repr__(self):
+        return u'<satella.coding.TimeBasedHeap>'
+
     def __init__(self):
         """
         Initialize an empty heap
@@ -255,7 +259,7 @@ class TimeBasedHeap(Heap):
         """
         self.push(timestamp, item)
 
-    @typed(None, (float, int))
+    @typed(None, (float, int), returns=list)
     def pop_less_than(self, timestamp):
         """
         Return a list of items with timestamps less than your value.
@@ -269,5 +273,5 @@ class TimeBasedHeap(Heap):
         """
         Remove all things equal to item
         """
-        self.filter(lambda i: i != item)
+        self.filtermap(filter_fun=lambda i: i != item)
 

tests/test_coding/test_structures.py

@@ -25,7 +25,7 @@ class TestHeap(unittest.TestCase):
 
     def test_tbh_iter(self):
         tbh = Heap([(10, 'ala'), (20, 'ma'), (30, 'kota'), (5, 'yo')])
-        
+
         self.assertEqual([(5, 'yo'), (10, 'ala'), (20, 'ma'), (30, 'kota')], list(tbh.iter_ascending()))
         self.assertEqual(reversed([(5, 'yo'), (10, 'ala'), (20, 'ma'), (30, 'kota')]), list(tbh.iter_descending()))
 
@@ -41,7 +41,8 @@ class TestHeap(unittest.TestCase):
         self.assertIn((10, 'ala'), tbh)
         self.assertIn((20, 'ma'), tbh)
 
-        tbh.filtermap(lambda x: x[0] != 20, lambda x: x[0]+10, 'azomg')
+        tbh.filtermap(filter_fun=lambda x: x[0] != 20,
+                      map_fun=lambda x: (x[0]+10, 'azomg'))
 
         self.assertIn((20, 'azomg'), tbh)
         self.assertNotIn((10, 'ala'), tbh)