Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_captcha.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_captcha.py	(revision 7284)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_captcha.py	(revision 7285)
@@ -16,12 +16,12 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-from zope.component import getAdapter
+from zope.component import getAdapter, getUtility
 from zope.interface import verify
 from zope.publisher.browser import TestRequest
 from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
 from waeup.sirp.browser.captcha import (
-    ICaptchaResponse, ICaptchaRequest, ICaptcha)
+    ICaptchaResponse, ICaptchaRequest, ICaptcha, ICaptchaChooser)
 from waeup.sirp.browser.captcha import (
-    CaptchaResponse, CaptchaRequest, NullCaptcha)
+    CaptchaResponse, CaptchaRequest, NullCaptcha, CaptchaChooser)
 
 class CaptchaResponseTests(FunctionalTestCase):
@@ -88,8 +88,34 @@
         return
 
-    def test_adapter(self):
-        # the null captcha is also registered as an adapter to IHTTPRequest
-        request = TestRequest()
-        captcha = getAdapter(request, name='No captcha')
+    def test_utility(self):
+        # the null captcha is also registered as a utility for ICaptcha
+        captcha = getUtility(ICaptcha, name='No captcha')
         self.assertTrue(isinstance(captcha, NullCaptcha))
         return
+
+class CaptchaChooserTests(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def test_ifaces(self):
+        # make sure we implement the promised interfaces
+        obj = CaptchaChooser()
+        verify.verifyClass(ICaptchaChooser, CaptchaChooser)
+        verify.verifyObject(ICaptchaChooser, obj)
+        return
+
+    def test_utility(self):
+        # the global captcha chooser is registered as a global utility
+        result = getUtility(ICaptchaChooser)
+        self.assertTrue(isinstance(result, CaptchaChooser))
+        return
+
+    def test_get_avail_captchas(self):
+        # we can get a dict of available captchas.
+        chooser = getUtility(ICaptchaChooser)
+        result = dict(chooser.getAvailCaptchas())
+        no_captcha = result.get('No captcha', None)
+        self.assertTrue(no_captcha is not None)
+        default_captcha = result.get(u'', None)
+        self.assertTrue(default_captcha is None)
+        return
