--- a/web/test/unittest_form.py	Thu Feb 19 18:54:26 2009 +0100
+++ b/web/test/unittest_form.py	Thu Feb 19 18:55:13 2009 +0100
@@ -1,31 +1,30 @@
 from logilab.common.testlib import TestCase, unittest_main, mock_object
-from cubicweb.web.form import *
 
-class ChangeStateForm(EntityFieldsForm):
-    state = TextField(widget=HiddenInput, eidparam=False)
-    __method = TextField(widget=HiddenInput, initial='set_state', eidparam=False)
-    trcomment = RichTextField()
-
-    def buttons(self):
-        return []
+from cubicweb.web.form import *
+from cubicweb.web.views.baseforms import ChangeStateForm
 
 class CustomChangeStateForm(ChangeStateForm):
     hello = IntField(name='youlou')
 
 class EntityFieldsFormTC(TestCase):
 
+    def setUp(self):
+        def next_tabindex(self):
+            self.count += 1
+            return self.count
+        self.req = mock_object(build_url=lambda *args,**kwargs: 'myurl.com',
+                               _=lambda s,x: x,
+                               next_tabindex=next_tabindex, count=0)
+        self.entity = mock_object(eid=1)
+        
     def test(self):
-        req = mock_object(build_url=lambda *args,**kwargs: 'myurl.com')
-        form = ChangeStateForm(req, redirect_path='perdu.com')
-        entity = mock_object(eid=1)
-        self.assertEquals(form.render(entity, state=123),
+        form = ChangeStateForm(self.req, redirect_path='perdu.com')
+        self.assertEquals(form.form_render(self.entity, state=123),
                           '''''')
 
     def test_form_inheritance(self):
-        req = mock_object(build_url=lambda *args,**kwargs: 'myurl.com')
-        form = CustomChangeStateForm(req, redirect_path='perdu.com')
-        entity = mock_object(eid=1)
-        self.assertEquals(form.render(entity, state=123),
+        form = CustomChangeStateForm(self.req, redirect_path='perdu.com')
+        self.assertEquals(form.form_render(self.entity, state=123),
                           '''''')