--- a/web/test/unittest_form.py Tue Jul 27 12:36:03 2010 +0200
+++ b/web/test/unittest_form.py Wed Nov 03 16:38:28 2010 +0100
@@ -15,9 +15,6 @@
#
# You should have received a copy of the GNU Lesser General Public License along
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
-"""
-
-"""
from xml.etree.ElementTree import fromstring
@@ -39,10 +36,10 @@
def test_form_field_format(self):
form = FieldsForm(self.request(), None)
- self.assertEquals(StringField().format(form), 'text/html')
+ self.assertEqual(StringField().format(form), 'text/html')
self.execute('INSERT CWProperty X: X pkey "ui.default-text-format", X value "text/rest", X for_user U WHERE U login "admin"')
self.commit()
- self.assertEquals(StringField().format(form), 'text/rest')
+ self.assertEqual(StringField().format(form), 'text/rest')
class EntityFieldsFormTC(CubicWebTC):
@@ -57,15 +54,15 @@
t = self.req.create_entity('Tag', name=u'x')
form1 = self.vreg['forms'].select('edition', self.req, entity=t)
unrelated = [reid for rview, reid in form1.field_by_name('tags', 'subject', t.e_schema).choices(form1)]
- self.failUnless(b.eid in unrelated, unrelated)
+ self.failUnless(unicode(b.eid) in unrelated, unrelated)
form2 = self.vreg['forms'].select('edition', self.req, entity=b)
unrelated = [reid for rview, reid in form2.field_by_name('tags', 'object', t.e_schema).choices(form2)]
- self.failUnless(t.eid in unrelated, unrelated)
+ self.failUnless(unicode(t.eid) in unrelated, unrelated)
self.execute('SET X tags Y WHERE X is Tag, Y is BlogEntry')
unrelated = [reid for rview, reid in form1.field_by_name('tags', 'subject', t.e_schema).choices(form1)]
- self.failIf(b.eid in unrelated, unrelated)
+ self.failIf(unicode(b.eid) in unrelated, unrelated)
unrelated = [reid for rview, reid in form2.field_by_name('tags', 'object', t.e_schema).choices(form2)]
- self.failIf(t.eid in unrelated, unrelated)
+ self.failIf(unicode(t.eid) in unrelated, unrelated)
def test_form_field_vocabulary_new_entity(self):
@@ -73,7 +70,7 @@
form = self.vreg['forms'].select('edition', self.req, entity=e)
unrelated = [rview for rview, reid in form.field_by_name('in_group', 'subject').choices(form)]
# should be default groups but owners, i.e. managers, users, guests
- self.assertEquals(unrelated, [u'guests', u'managers', u'users'])
+ self.assertEqual(unrelated, [u'guests', u'managers', u'users'])
def test_consider_req_form_params(self):
e = self.vreg['etypes'].etype_class('CWUser')(self.request())
@@ -82,7 +79,7 @@
field = StringField(name='login', role='subject', eidparam=True)
form.append_field(field)
form.build_context({})
- self.assertEquals(field.widget.values(form, field), (u'toto',))
+ self.assertEqual(field.widget.values(form, field), (u'toto',))
def test_linkto_field_duplication(self):
@@ -103,7 +100,7 @@
rset = self.execute('INSERT BlogEntry X: X title "cubicweb.org", X content "hop"')
form = self.vreg['views'].select('doreledit', self.request(),
rset=rset, row=0, rtype='content')
- data = form.render(row=0, rtype='content')
+ data = form.render(row=0, rtype='content', formid='base')
self.failUnless('content_format' in data)
# form view tests #########################################################
@@ -147,7 +144,7 @@
form = RTFForm(self.req, redirect_path='perdu.com', entity=state)
# make it think it can use fck editor anyway
form.field_by_name('description', 'subject').format = lambda x: 'text/html'
- self.assertTextEquals(self._render_entity_field('description', form),
+ self.assertMultiLineEqual(self._render_entity_field('description', form),
expected % {'eid': state.eid})
@@ -177,7 +174,7 @@
file = self.req.create_entity('File', data_name=u"pouet.txt", data_encoding=u'UTF-8',
data=Binary('new widgets system'))
form = FFForm(self.req, redirect_path='perdu.com', entity=file)
- self.assertTextEquals(self._render_entity_field('data', form),
+ self.assertMultiLineEqual(self._render_entity_field('data', form),
'''<input id="data-subject:%(eid)s" name="data-subject:%(eid)s" tabindex="1" type="file" value="" />
<a href="javascript: toggleVisibility('data-subject:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
<div id="data-subject:%(eid)s-advanced" class="hidden">
@@ -186,8 +183,7 @@
</div>
<br/>
<input name="data-subject__detach:%(eid)s" type="checkbox" />
-detach attached file
-''' % {'eid': file.eid})
+detach attached file''' % {'eid': file.eid})
def test_editablefilefield(self):
@@ -201,7 +197,7 @@
file = self.req.create_entity('File', data_name=u"pouet.txt", data_encoding=u'UTF-8',
data=Binary('new widgets system'))
form = EFFForm(self.req, redirect_path='perdu.com', entity=file)
- self.assertTextEquals(self._render_entity_field('data', form),
+ self.assertMultiLineEqual(self._render_entity_field('data', form),
'''<input id="data-subject:%(eid)s" name="data-subject:%(eid)s" tabindex="1" type="file" value="" />
<a href="javascript: toggleVisibility('data-subject:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
<div id="data-subject:%(eid)s-advanced" class="hidden">
@@ -219,7 +215,7 @@
class PFForm(EntityFieldsForm):
upassword = PasswordField(eidparam=True, role='subject')
form = PFForm(self.req, redirect_path='perdu.com', entity=self.entity)
- self.assertTextEquals(self._render_entity_field('upassword', form),
+ self.assertMultiLineEqual(self._render_entity_field('upassword', form),
'''<input id="upassword-subject:%(eid)s" name="upassword-subject:%(eid)s" tabindex="1" type="password" value="" />
<br/>
<input name="upassword-subject-confirm:%(eid)s" tabindex="1" type="password" value="" />
@@ -233,7 +229,7 @@
# form = DFForm(self.req, entity=self.entity)
# init, cur = (fromstring(self._render_entity_field(attr, form)).get('value')
# for attr in ('edits-creation_date', 'creation_date'))
- # self.assertEquals(init, cur)
+ # self.assertEqual(init, cur)
if __name__ == '__main__':
unittest_main()