-

cool-RR · cool-RR · commit 8cf1d8a972dc · 2014-10-08T12:50:49.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
@@ -184,8 +184,8 @@ def test_hash(self):
         with cute_testing.RaiseAssertor(TypeError):
             hash(bag)
             
-    def test_mutating(bag_type):
-        bag = bag_type('abracadabra')
+    def test_mutating(self):
+        bag = self.bag_type('abracadabra')
         with cute_testing.RaiseAssertor(TypeError):
             bag['a'] += 1
         with cute_testing.RaiseAssertor(TypeError):
@@ -194,71 +194,71 @@ def test_mutating(bag_type):
             bag['a'] = 7
         
     
-    def test_mutating(bag_type):
-        bag = bag_type('abracadabra')
+    def test_mutating(self):
+        bag = self.bag_type('abracadabra')
         bag['a'] += 1
-        assert bag == bag_type('abracadabra' + 'a')
+        assert bag == self.bag_type('abracadabra' + 'a')
             
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag['a'] -= 1
-        assert bag == bag_type('abracadabr')
+        assert bag == self.bag_type('abracadabr')
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag['a'] %= 2
-        assert bag == bag_type('abrcdbr')
+        assert bag == self.bag_type('abrcdbr')
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag += bag
-        assert bag == bag_type('abracadabr' * 2)
+        assert bag == self.bag_type('abracadabr' * 2)
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag -= bag
-        assert bag == bag_type()
+        assert bag == self.bag_type()
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag %= 2
-        assert bag == bag_type('acd')
+        assert bag == self.bag_type('acd')
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag['a'] = 7
-        assert bag == bag_type('abracadabra' + 'aa')
+        assert bag == self.bag_type('abracadabra' + 'aa')
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag.set('a', 7)
-        assert bag == bag_type('abracadabra' + 'aa')
+        assert bag == self.bag_type('abracadabra' + 'aa')
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         assert bag.setdefault('a', 7) == 5
-        assert bag == bag_type('abracadabra')
+        assert bag == self.bag_type('abracadabra')
         
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         assert bag.setdefault('x', 7) == 7
-        assert bag == bag_type('abracadabra' + 'x' * 7)
+        assert bag == self.bag_type('abracadabra' + 'x' * 7)
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         assert bag.pop('a', 7) == 7
-        assert bag == bag_type('brcdbr')
+        assert bag == self.bag_type('brcdbr')
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         key, value = bag.popitem()
         assert key in 'abracadabra'
         if isinstance(bag, nifty_collections.Ordered):
             assert key == 'a'
-        assert bag == bag_type([c for c in 'abracadabra' if c != key])
+        assert bag == self.bag_type([c for c in 'abracadabra' if c != key])
         other_key, other_value = bag.popitem()
         assert other_key in 'abracadabra'
         if isinstance(bag, nifty_collections.Ordered):
             assert key == 'd'
-        assert bag == bag_type([c for c in 'abracadabra'
+        assert bag == self.bag_type([c for c in 'abracadabra'
                                                  if c not in {key, other_key}])
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         del bag['a']
-        assert bag == bag_type('brcdbr')
+        assert bag == self.bag_type('brcdbr')
 
-        bag = bag_type('abracadabra')
+        bag = self.bag_type('abracadabra')
         bag.update(bag)
-        assert bag == bag_type('abracadabra')
+        assert bag == self.bag_type('abracadabra')
             
         
     
