Index: /main/waeup.widgets.core/trunk/src/waeup/widgets/core/tests/test_dictwidget.py
===================================================================
--- /main/waeup.widgets.core/trunk/src/waeup/widgets/core/tests/test_dictwidget.py	(revision 5368)
+++ /main/waeup.widgets.core/trunk/src/waeup/widgets/core/tests/test_dictwidget.py	(revision 5369)
@@ -36,5 +36,6 @@
 from zope.formlib.widgets import SequenceWidget
 from zope.formlib.interfaces import IDisplayWidget
-from zope.formlib.interfaces import IInputWidget, MissingInputError
+from zope.formlib.interfaces import (
+    IInputWidget, MissingInputError, WidgetInputError)
 from zope.formlib.interfaces import IWidgetInputError, WidgetInputError
 from zope.formlib.interfaces import IWidgetInputErrorView
@@ -106,4 +107,32 @@
                        IWidgetInputErrorView, '')
 
+    def test_brokenTypeFields(self):
+        """Artificially construct the case, that value_type or key_type of the
+           field are not set. This is merely to keep test coverage
+           happy.
+        """
+        request = TestRequest(form={'field.foo.key.0.bar': u'Hello',
+                                    'field.foo.value.0.baz': u'world!',
+                                    'field.foo.count': u'1'})
+        broken_field =self.field
+        broken_field.key_type = None
+        widget = DictWidget(
+            self.field, request)
+        assert widget._getRenderedValue() == {}
+
+        broken_field.value_type = None
+        widget = DictWidget(
+            self.field, request)
+        assert widget._getRenderedValue() == {}
+
+    def test_invalidCount(self):
+        # If we get a count which is not a number, fail...
+        request = TestRequest(form={'field.foo.key.0.bar': u'Hello',
+                                    'field.foo.value.0.baz': u'world!',
+                                    'field.foo.count': u'a'})
+        widget = DictWidget(
+            self.field, request)
+        self.assertRaises(WidgetInputError, widget.getInputValue)
+        
     def test_haveNoData(self):
         self.failIf(self._widget.hasInput())
@@ -154,4 +183,5 @@
             self.field, request, subwidget=ow)
         assert widget.subwidget is ow
+        assert widget() is not None
 
     def test_dict(self):
