Added some tests for multidict; fixed setdefault

2 files changed, 25 insertions, 1 deletions

diff --git a/paste/util/multidict.py b/paste/util/multidict.py
index 37a9d8c..246061d 100644
--- a/paste/util/multidict.py
+++ b/paste/util/multidict.py
@@ -132,7 +132,7 @@ class MultiDict(DictMixin):
         for k, v in self._items:
             if key == k:
                 return v
-        self._items.append(default)
+        self._items.append((key, default))
         return default
 
     def pop(self, key, *args):
diff --git a/tests/test_multidict.py b/tests/test_multidict.py
new file mode 100644
index 0000000..494b0b2
--- /dev/null
+++ b/tests/test_multidict.py
@@ -0,0 +1,24 @@
+from paste.util.multidict import MultiDict
+from py.test import raises
+
+def test_dict():
+    d = MultiDict({'a': 1})
+    assert d.items() == [('a', 1)]
+    d['b'] = 2
+    d['c'] = 3
+    assert d.items() == [('a', 1), ('b', 2), ('c', 3)]
+    d['b'] = 4
+    assert d.items() == [('a', 1), ('c', 3), ('b', 4)]
+    d.add('b', 5)
+    raises(KeyError, 'd.getone("b")')
+    assert d.getall('b') == [4, 5]
+    assert d.items() == [('a', 1), ('c', 3), ('b', 4), ('b', 5)]
+    del d['b']
+    assert d.items() == [('a', 1), ('c', 3)]
+    assert d.pop('xxx', 5) == 5
+    assert d.getone('a') == 1
+    assert d.popitem() == ('c', 3)
+    assert d.items() == [('a', 1)]
+    item = []
+    assert d.setdefault('z', item) is item
+    assert d.items() == [('a', 1), ('z', item)]