- ``repoze.bfg.testing.DummyModel`` did not have a ``get`` method;

  it now does.

3 files changed, 17 insertions, 1 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 8e31f9e99..05f116a01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,11 @@
+Next Release
+
+Bug Fixes
+---------
+
+- ``repoze.bfg.testing.DummyModel`` did not have a ``get`` method;
+  it now does.
+
 0.6.4 (2009-01-23)
 ==================
 
diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py
index 5a90033c7..77a1f05ad 100644
--- a/repoze/bfg/testing.py
+++ b/repoze/bfg/testing.py
@@ -268,6 +268,9 @@ class DummyModel:
     def __delitem__(self, name):
         del self.subs[name]
 
+    def get(self, name, default=None):
+        return self.subs.get(name, default)
+
     def values(self):
         """ Return the values set by __setitem__ """
         return self.subs.values()
@@ -280,6 +283,8 @@ class DummyModel:
         """ Return the keys set by __setitem__ """
         return self.subs.keys()
 
+    __iter__ = keys
+
     def __nonzero__(self):
         return True
 
diff --git a/repoze/bfg/tests/test_testing.py b/repoze/bfg/tests/test_testing.py
index ca3aeb5eb..019e0cc53 100644
--- a/repoze/bfg/tests/test_testing.py
+++ b/repoze/bfg/tests/test_testing.py
@@ -285,7 +285,7 @@ class TestDummyModel(unittest.TestCase):
         klass = self._getTargetClass()
         return klass(name, parent, **kw)
 
-    def test__setitem__and__getitem__and__delitem__and__contains__(self):
+    def test__setitem__and__getitem__and__delitem__and__contains__and_get(self):
         class Dummy:
             pass
         dummy = Dummy()
@@ -294,10 +294,13 @@ class TestDummyModel(unittest.TestCase):
         self.assertEqual(dummy.__name__, 'abc')
         self.assertEqual(dummy.__parent__, model)
         self.assertEqual(model['abc'], dummy)
+        self.assertEqual(model.get('abc'), dummy)
         self.assertRaises(KeyError, model.__getitem__, 'none')
         self.failUnless('abc' in model)
         del model['abc']
         self.failIf('abc' in model)
+        self.assertEqual(model.get('abc', 'foo'), 'foo')
+        self.assertEqual(model.get('abc'), None)
 
     def test_extra_params(self):
         model = self._makeOne(foo=1)