-

cool-RR · cool-RR · commit 847a1e4ae309 · 2014-10-08T22:40:31.000+03:00
diff --git a/source_py3/test_python_toolbox/test_nifty_collections/test_bagging.py b/source_py3/test_python_toolbox/test_nifty_collections/test_bagging.py
@@ -40,6 +40,10 @@ def test_common(self):
         assert bag['a'] == 5
         assert bag['missing value'] == 0
         assert len(bag) == 5
+        assert 'a' in bag
+        assert 'r' in bag
+        assert 'R' not in bag
+        assert 'x' not in self.bag_type({'x': 0,})
         
         assert set(bag.most_common()) == \
                                  set(collections.Counter(bag).most_common()) == \
@@ -213,10 +217,22 @@ def test_mutating(self):
         bag['a'] -= 1
         assert bag == self.bag_type('abracadabr')
 
+        bag = self.bag_type('abracadabra')
+        bag['a'] *= 2
+        assert bag == self.bag_type('abracadabra' + 'a' * 5)
+
+        bag = self.bag_type('abracadabra')
+        bag['a'] //= 2
+        assert bag == self.bag_type('abracdbr')
+
         bag = self.bag_type('abracadabra')
         bag['a'] %= 2
         assert bag == self.bag_type('abrcdbr')
 
+        bag = self.bag_type('abracadabra')
+        bag['a'] **= 2
+        assert bag == self.bag_type('abracadabra' + 'a' * 20)
+
         bag = self.bag_type('abracadabra')
         bag += bag
         assert bag == self.bag_type('abracadabra' * 2)
@@ -225,10 +241,31 @@ def test_mutating(self):
         bag -= bag
         assert bag == self.bag_type()
 
+        bag = self.bag_type('abracadabra')
+        bag *= 2
+        assert bag == self.bag_type('abracadabra' * 2)
+
+        bag = self.bag_type('abracadabra')
+        bag //= 2
+        assert bag == self.bag_type('aabr')
+        
+        bag = self.bag_type('abracadabra')
+        bag //= self.bag_type('aabr')
+        assert bag == 2
+
         bag = self.bag_type('abracadabra')
         bag %= 2
         assert bag == self.bag_type('acd')
 
+        bag = self.bag_type('abracadabra')
+        bag %= self.bag_type('aabr')
+        assert bag == self.bag_type('acd')
+        
+        bag = self.bag_type('abracadabra')
+        bag **= 2
+        assert bag == self.bag_type('abracadabra' + 'a' * 20 + 'b' * 2 +
+                                    'r' * 2)
+
         bag = self.bag_type('abracadabra')
         bag['a'] = 7
         assert bag == self.bag_type('abracadabra' + 'aa')
@@ -290,33 +327,51 @@ def test_mutating(self):
             bag['a'] += 1
         with cute_testing.RaiseAssertor(TypeError):
             bag['a'] -= 1
+        with cute_testing.RaiseAssertor(TypeError):
+            bag['a'] *= 2
+        with cute_testing.RaiseAssertor(TypeError):
+            bag['a'] //= 2
         with cute_testing.RaiseAssertor(TypeError):
             bag['a'] %= 2
+        with cute_testing.RaiseAssertor(TypeError):
+            bag['a'] **= 2
         
         bag += bag
         assert bag == bag_reference * 2
         assert bag is not bag_reference
         bag = bag_reference
         
-        bag -= bag
-        assert bag == bag_reference * 2
+        bag -= self.bag_type('ab')
+        assert bag == bag_reference - self.bag_type('ab') == \
+                                                     self.bag_type('abracadar')
         assert bag is not bag_reference
         bag = bag_reference
         
-        bag %= bag
-        assert bag == bag_reference * 2
+        bag *= 3
+        assert bag == bag_reference + bag_reference + bag_reference
         assert bag is not bag_reference
         bag = bag_reference
         
-        bag *= 3
+        bag //= 2
+        assert bag == bag_reference + bag_reference + bag_reference
+        assert bag is not bag_reference
+        bag = bag_reference
+        
+        bag //= 
         assert bag == bag_reference + bag_reference + bag_reference
         assert bag is not bag_reference
         bag = bag_reference
+        
+        bag %= 2
+        assert bag == bag_reference % 2 == self.bag_type('acd')
+        assert bag is not bag_reference
+        bag = bag_reference
+        
+        bag %= self.bag_type('aabr')
+        assert bag == 2
+        assert bag is not bag_reference
+        bag = bag_reference
 
-        with cute_testing.RaiseAssertor(TypeError):
-            bag -= bag
-        with cute_testing.RaiseAssertor(TypeError):
-            bag %= bag
         with cute_testing.RaiseAssertor(TypeError):
             bag['a'] = 7
         with cute_testing.RaiseAssertor(TypeError):
@@ -345,7 +400,11 @@ def test_ordering(self):
         assert ordered_bag_0 <= ordered_bag_1
         assert ordered_bag_0 >= ordered_bag_1
           
-    
+    def test_reversed(self):
+        bag = self.bag_type('abracadabra')
+        assert tuple(reversed(self.bag)) == tuple(reversed(tuple(self.bag)))
+            
+          
 class BaseUnorderedBagTestCase(BaseBagTestCase):
     
     def test_ordering(self):
@@ -354,6 +413,12 @@ def test_ordering(self):
         assert bag_0 == bag_1
         if issubclass(self.bag_type, collections.Hashable):
             assert hash(bag_0) == hash(bag_1)
+            
+            
+    def test_reversed(self):
+        bag = self.bag_type('abracadabra')
+        assert set(reversed(self.bag)) == set(self.bag)
+        
         
 ###############################################################################
 
