updated multidict tests

Author: mind1m

aiohttp/multidict.py

@@ -102,7 +102,8 @@ def __contains__(self, key):
     def __repr__(self):
         return '<{}>\n{}'.format(
             self.__class__.__name__, pprint.pformat(
-                list(self.items())))
+                list(self.items(getall=True)))
+        )
 
 
 class CaseInsensitiveMultiDict(MultiDict):

tests/test_multidict.py

@@ -58,7 +58,8 @@ def test_instantiate__with_kwargs(self):
 
     def test_getone(self):
         d = self.make_dict([('key', 'value1')], key='value2')
-        self.assertEqual(d.getone('key'), 'value1')
+        with self.assertRaises(KeyError):
+            self.assertEqual(d.getone('key'), 'value1')
         self.assertEqual(d.get('key'), 'value1')
         self.assertEqual(d['key'], 'value1')
 
@@ -124,7 +125,7 @@ def test_getall(self):
         d = self.make_dict([('key', 'value1')], key='value2')
 
         self.assertEqual(d, {'key': 'value1'})
-        self.assertEqual(len(d), 1)
+        self.assertEqual(len(d), 2)
 
         self.assertEqual(d.getall('key'), ('value1', 'value2'))
 
@@ -142,7 +143,8 @@ def make_dict(self, *args, **kwargs):
 
     def test_basics(self):
         d = self.make_dict([('KEY', 'value1')], KEY='value2')
-        self.assertEqual(d.getone('key'), 'value1')
+        with self.assertRaises(KeyError):
+            self.assertEqual(d.getone('key'), 'value1')
         self.assertEqual(d.get('key'), 'value1')
         self.assertEqual(d.get('key2', 'val'), 'val')
         self.assertEqual(d['key'], 'value1')
@@ -157,7 +159,7 @@ def test_getall(self):
         d = self.make_dict([('KEY', 'value1')], KEY='value2')
 
         self.assertEqual(d, {'KEY': 'value1'})
-        self.assertEqual(len(d), 1)
+        self.assertEqual(len(d), 2)
 
         self.assertEqual(d.getall('key'), ('value1', 'value2'))
 
@@ -170,18 +172,18 @@ class _BaseMutableMultiDictTests(_BaseTest):
     def test__repr__(self):
         d = self.make_dict()
         self.assertEqual(str(d), "<MutableMultiDict>\n[]")
+
         d = self.make_dict([('key', 'one'), ('key', 'two')])
+
         self.assertEqual(
             str(d),
             "<MutableMultiDict>\n[('key', 'one'), ('key', 'two')]")
 
     def test_getall(self):
         d = self.make_dict([('key', 'value1')], key='value2')
+        self.assertEqual(len(d), 2)
 
-        self.assertEqual(d, {'key': 'value1'})
-        self.assertEqual(len(d), 1)
-
-        self.assertEqual(d.getall('key'), ['value1', 'value2'])
+        self.assertEqual(d.getall('key'), ('value1', 'value2'))
 
         with self.assertRaisesRegex(KeyError, "some_key"):
             d.getall('some_key')
@@ -195,56 +197,46 @@ def test_add(self):
         self.assertEqual(d, {})
         d['key'] = 'one'
         self.assertEqual(d, {'key': 'one'})
-        self.assertEqual(d.getall('key'), ['one'])
+        self.assertEqual(d.getall('key'), ('one',))
 
         d['key'] = 'two'
         self.assertEqual(d, {'key': 'two'})
-        self.assertEqual(d.getall('key'), ['two'])
+        self.assertEqual(d.getall('key'), ('two',))
 
         d.add('key', 'one')
         self.assertEqual(d, {'key': 'two'})
-        self.assertEqual(d.getall('key'), ['two', 'one'])
+        self.assertEqual(d.getall('key'), ('two', 'one'))
 
         d.add('foo', 'bar')
         self.assertEqual(d, {'key': 'two', 'foo': 'bar'})
-        self.assertEqual(d.getall('foo'), ['bar'])
+        self.assertEqual(d.getall('foo'), ('bar',))
 
     def test_extend(self):
         d = self.make_dict()
         self.assertEqual(d, {})
 
         d.extend([('key', 'one'), ('key', 'two')], key=3, foo='bar')
         self.assertEqual(d, {'key': 'one', 'foo': 'bar'})
-        self.assertEqual(list(d.items(getall=True)), [
-            ('key', 'one'), ('key', 'two'),
-            ('key', 3), ('foo', 'bar')])
+        itms = d.items(getall=True)
+        # we can't guarantee order of kwargs
+        self.assertTrue(('key', 'one') in itms)
+        self.assertTrue(('key', 'two') in itms)
+        self.assertTrue(('key', 3) in itms)
+        self.assertTrue(('foo', 'bar') in itms)
 
         other = self.make_dict(bar='baz')
         self.assertEqual(other, {'bar': 'baz'})
 
         d.extend(other)
         self.assertEqual(d, {'key': 'one', 'foo': 'bar', 'bar': 'baz'})
-        self.assertEqual(list(d.items(getall=True)), [
-            ('key', 'one'), ('key', 'two'),
-            ('key', 3), ('foo', 'bar'),
-            ('bar', 'baz'),
-            ])
+        self.assertIn(('bar', 'baz'), d.items(getall=True))
 
         d.extend({'foo': 'moo'})
         self.assertEqual(d, {'key': 'one', 'foo': 'bar', 'bar': 'baz'})
-        self.assertEqual(list(d.items(getall=True)), [
-            ('key', 'one'), ('key', 'two'),
-            ('key', 3), ('foo', 'bar'),
-            ('foo', 'moo'), ('bar', 'baz'),
-            ])
+        self.assertIn(('foo', 'moo'), d.items(getall=True))
 
         d.extend()
         self.assertEqual(d, {'key': 'one', 'foo': 'bar', 'bar': 'baz'})
-        self.assertEqual(list(d.items(getall=True)), [
-            ('key', 'one'), ('key', 'two'),
-            ('key', 3), ('foo', 'bar'),
-            ('foo', 'moo'), ('bar', 'baz'),
-            ])
 
         with self.assertRaises(TypeError):
             d.extend('foo', 'bar')
@@ -294,9 +286,9 @@ def test_getall(self):
         d = self.make_dict([('KEY', 'value1')], KEY='value2')
 
         self.assertEqual(d, {'KEY': 'value1'})
-        self.assertEqual(len(d), 1)
+        self.assertEqual(len(d), 2)
 
-        self.assertEqual(d.getall('key'), ['value1', 'value2'])
+        self.assertEqual(d.getall('key'), ('value1', 'value2'))
 
         with self.assertRaisesRegex(KeyError, "SOME_KEY"):
             d.getall('some_key')