-

cool-RR · cool-RR · commit 2315012007b9 · 2012-05-31T15:25:50.000+03:00
diff --git a/python_toolbox/nifty_collections/weak_key_default_dict.py b/python_toolbox/nifty_collections/weak_key_default_dict.py
@@ -118,21 +118,16 @@ def get(self, key, default=None):
         return self.data.get(ref(key),default)
 
     
-    def has_key(self, key):
-        try:
-            wr = ref(key)
-        except TypeError:
-            return 0
-        return wr in self.data
-
-    
     def __contains__(self, key):
         try:
             wr = ref(key)
         except TypeError:
             return 0
         return wr in self.data
 
+
+    has_key = __contains__
+
     
     def items(self):
         """ D.items() -> list of D's (key, value) pairs, as 2-tuples """
diff --git a/test_python_toolbox/test_binary_search/test.py b/test_python_toolbox/test_binary_search/test.py
@@ -1,3 +1,8 @@
+# Copyright 2009-2011 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Test module for `binary_search`.'''
+
 from python_toolbox import binary_search
 from python_toolbox import nifty_collections
 from python_toolbox import misc_tools
@@ -21,9 +26,86 @@ def test():
         binary_search.CLOSEST
     ) == 3
     
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        3.2,
+        binary_search.LOW
+    ) == 3
+    
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        3.2,
+        binary_search.HIGH
+    ) == 4
+    
     assert binary_search.binary_search(
         my_list,
         misc_tools.identity_function,
         3.2,
         binary_search.BOTH
-    ) == (3, 4)
+    ) == (3, 4)
+    
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        -5,
+        binary_search.BOTH
+    ) == (None, 0)
+    
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        -5,
+        binary_search.LOW
+    ) == None
+    
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        -5,
+        binary_search.HIGH
+    ) == 0
+    
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        100,
+        binary_search.BOTH
+    ) == (4, None)
+    
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        100,
+        binary_search.LOW
+    ) == 4
+    
+    assert binary_search.binary_search(
+        my_list,
+        misc_tools.identity_function,
+        100,
+        binary_search.HIGH
+    ) == None
+    
+    assert binary_search.binary_search_by_index(
+        [(number * 10) for number in my_list],
+        misc_tools.identity_function,
+        32,
+        binary_search.BOTH
+    ) == (3, 4)
+    
+    assert binary_search.binary_search(
+        [], 
+        misc_tools.identity_function,
+        32,
+        binary_search.BOTH
+    ) == (None, None)
+    
+    assert binary_search.binary_search(
+        [], 
+        misc_tools.identity_function,
+        32,
+    ) == None
+    
diff --git a/test_python_toolbox/test_nifty_collections/test_ordered_set/__init__.py b/test_python_toolbox/test_nifty_collections/test_ordered_set/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2009-2012 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Testing module for `python_toolbox.nifty_collections.OrderedSet`.'''
diff --git a/test_python_toolbox/test_nifty_collections/test_ordered_set/test.py b/test_python_toolbox/test_nifty_collections/test_ordered_set/test.py
@@ -0,0 +1,30 @@
+# Copyright 2009-2012 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Testing module for `nifty_collections.ordered_dict.OrderedSet`.'''
+
+from __future__ import with_statement
+
+from python_toolbox import cute_testing
+
+from python_toolbox.nifty_collections import OrderedSet
+
+
+def test_sort():
+    '''Test the basic workings of `OrderedSet`.'''
+    
+    ordered_set = OrderedSet(range(4))
+    
+    assert list(ordered_set) == list(range(4))
+    assert len(ordered_set) == 4
+    assert 1 in ordered_set
+    assert 3 in ordered_set
+    assert 7 not in ordered_set
+    ordered_set.add(8)
+    assert list(ordered_set)[-1] == 8
+    ordered_set.discard(2)
+    assert 2 not in ordered_set
+    assert list(reversed(ordered_set)) == [8, 3, 1, 0]
+    assert ordered_set.pop() == 8
+    assert ordered_set.pop(last=False) == 0
+    
diff --git a/test_python_toolbox/test_nifty_collections/test_weak_key_default_dict/test.py b/test_python_toolbox/test_nifty_collections/test_weak_key_default_dict/test.py
@@ -27,9 +27,44 @@ def test():
     assert wkd_dict[weakreffable_object_1] == 7
     assert wkd_dict[weakreffable_object_2] == 7
     
+    assert weakreffable_object_0 in wkd_dict
+    assert weakreffable_object_1 in wkd_dict
+    assert weakreffable_object_2 in wkd_dict
+    assert 'meow' not in wkd_dict
+    
+    assert sorted(wkd_dict.items()) == sorted(wkd_dict.iteritems()) == sorted(
+        ((weakreffable_object_0, 2),
+         (weakreffable_object_1, 7),
+         (weakreffable_object_2, 7), )
+    )
+    
+    assert set(wkd_dict.iterkeys()) == set(wkd_dict.keys()) == \
+           set((ref() for ref in wkd_dict.iterkeyrefs())) == \
+           set((ref() for ref in wkd_dict.keyrefs())) == \
+           set((weakreffable_object_0, weakreffable_object_1,
+                weakreffable_object_2))
+    
     weakreffable_object_3 = WeakreffableObject()
     wkd_dict[weakreffable_object_3] = 123
     assert len(wkd_dict.keys()) == 4
     del weakreffable_object_3
     gc_tools.collect()
-    assert len(wkd_dict.keys()) == 3
+    assert len(wkd_dict.keys()) == 3
+    
+    assert wkd_dict.pop(weakreffable_object_2) == 7
+    assert len(wkd_dict) == 2
+    popped_key, popped_value = wkd_dict.popitem()
+    assert popped_key in (weakreffable_object_0, weakreffable_object_1)
+    assert popped_value in (2, 7)
+
+
+    weakreffable_object_4 = WeakreffableObject()
+    weakreffable_object_5 = WeakreffableObject()
+    weakreffable_object_6 = WeakreffableObject()
+    
+    assert weakreffable_object_4 not in wkd_dict
+    wkd_dict.setdefault(weakreffable_object_4, 222)
+    assert wkd_dict[weakreffable_object_4] == 222
+    
+    wkd_dict.update({weakreffable_object_5: 444,})
+    assert wkd_dict[weakreffable_object_5] == 444
