Index: main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_passportwidget.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_passportwidget.py	(revision 6055)
+++ 	(revision )
@@ -1,235 +1,0 @@
-"""Tests for objectwidget.
-"""
-import doctest
-import unittest
-import sys
-from zope.app.file.interfaces import IImage
-from zope.component import testing
-from zope.interface import Interface, implements
-from zope.interface.verify import verifyClass
-from zope.publisher.browser import TestRequest
-from zope.schema import Object, TextLine
-from zope.schema.interfaces import ITextLine
-from zope.traversing.adapters import DefaultTraversable
-from zope.traversing.interfaces import ITraversable
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-from zope.component import provideAdapter
-
-from zope.formlib.interfaces import (
-    IInputWidget, IDisplayWidget,MissingInputError)
-from zope.formlib.widgets import TextWidget, DisplayWidget
-from zope.formlib.tests.test_browserwidget import BrowserWidgetTest
-from zope.formlib.interfaces import IWidgetInputErrorView
-
-from waeup.sirp.widgets.objectwidget import WAeUPObjectWidget as ObjectWidget
-from waeup.sirp.widgets.objectwidget import (
-    WAeUPObjectDisplayWidget as ObjectDisplayWidget)
-
-from waeup.sirp.widgets.passportwidget import (
-    PassportWidget, PassportDisplayWidget, PassportImage,
-    )
-
-
-class ITestContact(Interface):
-    name = TextLine()
-    email = TextLine()
-    
-class TestContact(object):
-    implements(ITestContact)
-
-class TestImage(object):
-    implements(IImage)
-
-class ITestContent(Interface):
-    passport = Object(
-        title = u'Passport Photograph',
-        required = True,
-        schema = IImage)
-
-    foo = Object(
-        ITestContact, 
-        title = u'Foo Title',
-        description = u'',
-        )
-    
-class PassportWidgetInputErrorView(object):
-    implements(IWidgetInputErrorView)
-
-    def __init__(self, error, request):
-        self.error = error
-        self.request = request
-
-    def snippet(self):
-        return repr(self.error)
-
-class PassportWidgetTest(BrowserWidgetTest):
-    """Documents and tests the passort image widget.
-
-        >>> from zope.interface.verify import verifyClass
-        >>> verifyClass(IInputWidget, ObjectWidget)
-        True
-    """
-
-    _FieldFactory = Object
-    def _WidgetFactory(self, context, request, **kw):
-        kw.update({'factory': TestContact})
-        return ObjectWidget(context, request, **kw)
-
-    def setUpContent(self, desc=u'', title=u'Foo Title'):
-        provideAdapter(TextWidget, (ITextLine, IDefaultBrowserLayer),
-                       IInputWidget)
-        
-        class TestObject(object):
-            implements(ITestContent)
-
-        self.content = TestObject()
-        self.field = ITestContent['foo']
-        self.request = TestRequest(HTTP_ACCEPT_LANGUAGE='pl')
-        self.request.form['field.foo'] = u'Foo Value'
-        self._widget = self._WidgetFactory(self.field, self.request)
-
-    def setUp(self):
-        super(PassportWidgetTest, self).setUp()
-        self.field = Object(ITestContact, __name__=u'foo')
-        provideAdapter(TextWidget,
-                       (ITextLine, IDefaultBrowserLayer),
-                       IInputWidget)
-
-    def test_applyChanges(self):
-        self.request.form['field.foo.name'] = u'Foo Name'
-        self.request.form['field.foo.email'] = u'foo@foo.test'
-        widget = self._WidgetFactory(self.field, self.request)
-
-        self.assertEqual(widget.applyChanges(self.content), True)
-        self.assertEqual(hasattr(self.content, 'foo'), True)
-        self.assertEqual(isinstance(self.content.foo, TestContact), True)
-        self.assertEqual(self.content.foo.name, u'Foo Name')
-        self.assertEqual(self.content.foo.email, u'foo@foo.test')
-
-    def test_error(self):
-        provideAdapter(
-            PassportWidgetInputErrorView,
-            (MissingInputError, TestRequest),
-            IWidgetInputErrorView)
-
-        widget = self._WidgetFactory(self.field, self.request)
-        self.assertRaises(MissingInputError, widget.getInputValue)
-        error_html = widget.error()
-        if sys.version_info < (2, 5):
-            self.failUnless("email: <zope.formlib.interfaces.Mis" 
-                             in error_html)
-            self.failUnless("name: <zope.formlib.interfaces.Miss"
-                             in error_html)
-        else:
-            self.failUnless(
-                "email: MissingInputError(u'field.foo.email', u'', None)"
-                in error_html)
-            self.failUnless(
-                "name: MissingInputError(u'field.foo.name', u'', None)"
-                in error_html)
-
-    def test_applyChangesNoChange(self):
-        self.content.foo = TestContact()
-        self.content.foo.name = u'Foo Name'
-        self.content.foo.email = u'foo@foo.test'
-
-        self.request.form['field.foo.name'] = u'Foo Name'
-        self.request.form['field.foo.email'] = u'foo@foo.test'
-        widget = self._WidgetFactory(self.field, self.request)
-        widget.setRenderedValue(self.content.foo)
-
-        self.assertEqual(widget.applyChanges(self.content), False)
-        self.assertEqual(hasattr(self.content, 'foo'), True)
-        self.assertEqual(isinstance(self.content.foo, TestContact), True)
-        self.assertEqual(self.content.foo.name, u'Foo Name')
-        self.assertEqual(self.content.foo.email, u'foo@foo.test')
-
-    def test_respect_custom_widgets(self):
-        # We can use our own subwidgets when creating ObjectWidgets
-        class CustomTextWidget(TextWidget):
-            pass
-
-        # We create a custom widget for the `name` field of ITestContact
-        name_widget = CustomTextWidget(ITestContact['name'], self.request)
-
-        # Custom widgets are passed by <fieldname>_widget keyword:
-        widget = self._WidgetFactory(self.field, self.request,
-                                     name_widget=name_widget)
-        widget1, widget2 = widget.subwidgets()
-        self.assertTrue(widget1 is name_widget)
-        
-        
-class PassportDisplayWidgetTest(BrowserWidgetTest):
-    """Documents and tests the display variant of passport widget.
-
-        >>> from zope.interface.verify import verifyClass
-        >>> verifyClass(IDisplayWidget, ObjectDisplayWidget)
-        True
-
-   """
-    _FieldFactory = Object
-    def _WidgetFactory(self, context, request, **kw):
-        #kw.update({'factory': TestContact})
-        #kw.update({'factory': TestImage})
-        return PassportDisplayWidget(context, request, **kw)
-        #return ObjectDisplayWidget(context, request, **kw)
-
-    def setUpContent(self, desc=u'', title=u'Foo Title'):
-        provideAdapter(TextWidget, (ITextLine, IDefaultBrowserLayer),
-                       IInputWidget)
-        provideAdapter(DisplayWidget, (ITextLine, IDefaultBrowserLayer),
-                       IDisplayWidget)
-        # The widget must be traversable. We register the default
-        # adapter that can turn nearly any object into an ITraversable.
-        provideAdapter(DefaultTraversable, (None,), ITraversable)
-        
-        class TestObject(object):
-            implements(ITestContent)
-
-        self.content = PassportImage() #TestImage()
-        #self.content.name = u'Foo Name'
-        #self.content.email = u'foo@foo.test'
-        self.field = ITestContent['passport']
-        self.request = TestRequest(HTTP_ACCEPT_LANGUAGE='pl')
-        self.request.form['field.passport'] = u'Foo Value'
-        self._widget = self._WidgetFactory(self.field, self.request)
-
-    def setUp(self):
-        super(PassportDisplayWidgetTest, self).setUp()
-        self.field = Object(ITestContact, __name__=u'passport')
-        #provideAdapter(TextWidget,
-        #               (ITextLine, IDefaultBrowserLayer),
-        #               IInputWidget)
-        #provideAdapter(DisplayWidget,
-        #               (ITextLine, IDefaultBrowserLayer),
-        #               IDisplayWidget)
-
-        
-    def test_interfaces(self):
-        from zope.interface.verify import DoesNotImplement
-        self.assertTrue(IDisplayWidget.providedBy(self._widget))
-        self.assertFalse(IInputWidget.providedBy(self._widget))
-        self.assertTrue(verifyClass(IDisplayWidget, ObjectDisplayWidget))
-
-    def DISABLEDtest_render(self):
-        widget = PassportDisplayWidget(
-            self.field, self.request) #, TestImage)
-        widget.setRenderedValue(self.content)
-
-        check_list = [
-            '<td', 'class=', 'row',
-            'Foo Name',
-            '</td>', '<td', 'class=', 'row',
-            'foo@foo.test',
-            '</td>']
-        self.verifyResult(widget(), check_list, inorder=True)    
-
-def test_suite():
-    return unittest.TestSuite((
-        #unittest.makeSuite(PassportWidgetTest),
-        unittest.makeSuite(PassportDisplayWidgetTest),
-        doctest.DocTestSuite(),
-        ))
-
-if __name__=='__main__':
-    unittest.main(defaultTest='test_suite')
