Mercurial Repository: p/roundup/code: test/test

comparison test/test_cgi.py @ 1420:3ac43c62a250

implemented extension to form parsing... ...to allow editing of multiple items and creation of multiple items (but only one per class) the colon ":" special form variable designator may now be any of : + @

author	Richard Jones <richard@users.sourceforge.net>
date	Wed, 12 Feb 2003 06:41:58 +0000
parents	71928bf79302
children	58ce2c1614cd

comparison

equal deleted inserted replaced

-:c717b8d63a7e
+:3ac43c62a250
 #
 # This module is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_cgi.py,v 1.6 2003-01-20 23:05:20 richard Exp $
+# $Id: test_cgi.py,v 1.7 2003-02-12 06:41:58 richard Exp $
 import unittest, os, shutil, errno, sys, difflib, cgi
 from roundup.cgi import client
 from roundup import init, instance, password, hyperdb, date
 if type(v) is type([]):
 [form.list.append(cgi.MiniFieldStorage(k, x)) for x in v]
 else:
 form.list.append(cgi.MiniFieldStorage(k, v))
 return form
+class config:
+TRACKER_NAME = 'testing testing'
+TRACKER_WEB = 'http://testing.testing/'
 class FormTestCase(unittest.TestCase):
 def setUp(self):
 self.dirname = '_test_cgi_form'
 try:
 realname='Bork, Chef', roles='User')
 self.db.user.create(username='mary', address='mary@test',
 roles='User', realname='Contrary, Mary')
 test = self.instance.dbinit.Class(self.db, "test",
+string=hyperdb.String(),
 boolean=hyperdb.Boolean(), link=hyperdb.Link('test'),
 multilink=hyperdb.Multilink('test'), date=hyperdb.Date(),
 interval=hyperdb.Interval())
+def parseForm(self, form, classname='test', nodeid=None):
+cl = client.Client(self.instance, None, {'PATH_INFO':'/'},
+makeForm(form))
+cl.classname = classname
+cl.nodeid = nodeid
+cl.db = self.db
+return cl.parsePropsFromForm()
 def tearDown(self):
 self.db.close()
 try:
 shutil.rmtree(self.dirname)
 #
 # Empty form
 #
 def testNothing(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({}), {'test': {}})
-makeForm({})), {})
 def testNothingWithRequired(self):
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {':required': 'string'})
-self.db.issue, makeForm({':required': 'title'}))
+self.assertRaises(ValueError, self.parseForm,
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+{':required': 'title,status', 'status':'1'}, 'issue')
-self.db.issue, makeForm({':required': 'title,status',
+self.assertRaises(ValueError, self.parseForm,
-'status':'1'}))
+{':required': ['title','status'], 'status':'1'}, 'issue')
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm,
-self.db.issue, makeForm({':required': ['title','status'],
+{':required': 'status', 'status':''}, 'issue')
-'status':'1'}))
+self.assertRaises(ValueError, self.parseForm,
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+{':required': 'nosy', 'nosy':''}, 'issue')
-self.db.issue, makeForm({':required': 'status',
-'status':''}))
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
-self.db.issue, makeForm({':required': 'nosy',
-'nosy':''}))
 #
 # Nonexistant edit
 #
 def testEditNonexistant(self):
-self.assertRaises(IndexError, client.parsePropsFromForm, self.db,
+self.assertRaises(IndexError, self.parseForm, {'boolean': ''},
-self.db.test, makeForm({'boolean': ''}), '1')
+'test', '1')
 #
 # String
 #
 def testEmptyString(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'string': ''}), {'test': {}})
-makeForm({'title': ''})), {})
+self.assertEqual(self.parseForm({'string': ' '}), {'test': {}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertRaises(ValueError, self.parseForm, {'string': ['', '']})
-makeForm({'title': ' '})), {})
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
-self.db.issue, makeForm({'title': ['', '']}))
 def testSetString(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'string': 'foo'}),
-makeForm({'title': 'foo'})), {'title': 'foo'})
+{'test': {'string': 'foo'}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'string': 'a\r\nb\r\n'}),
-makeForm({'title': 'a\r\nb\r\n'})), {'title': 'a\nb'})
+{'test': {'string': 'a\nb'}})
 nodeid = self.db.issue.create(title='foo')
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'title': 'foo'}, 'issue', nodeid),
-makeForm({'title': 'foo'}), nodeid), {})
+{'issue'+nodeid: {}})
 def testEmptyStringSet(self):
 nodeid = self.db.issue.create(title='foo')
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'title': ''}, 'issue', nodeid),
-makeForm({'title': ''}), nodeid), {'title': None})
+{'issue'+nodeid: {'title': None}})
 nodeid = self.db.issue.create(title='foo')
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'title': ' '}, 'issue', nodeid),
-makeForm({'title': ' '}), nodeid), {'title': None})
+{'issue'+nodeid: {'title': None}})
 #
 # Link
 #
 def testEmptyLink(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'link': ''}), {'test': {}})
-makeForm({'status': ''})), {})
+self.assertEqual(self.parseForm({'link': ' '}), {'test': {}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertRaises(ValueError, self.parseForm, {'link': ['', '']})
-makeForm({'status': ' '})), {})
+self.assertEqual(self.parseForm({'link': '-1'}), {'test': {}})
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
-self.db.issue, makeForm({'status': ['', '']}))
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
-makeForm({'status': '-1'})), {})
 def testSetLink(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'status': 'unread'}, 'issue'),
-makeForm({'status': 'unread'})), {'status': '1'})
+{'issue': {'status': '1'}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'status': '1'}, 'issue'),
-makeForm({'status': '1'})), {'status': '1'})
+{'issue': {'status': '1'}})
 nodeid = self.db.issue.create(status='unread')
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'status': 'unread'}, 'issue', nodeid),
-makeForm({'status': 'unread'}), nodeid), {})
+{'issue'+nodeid: {}})
 def testUnsetLink(self):
 nodeid = self.db.issue.create(status='unread')
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'status': '-1'}, 'issue', nodeid),
-makeForm({'status': '-1'}), nodeid), {'status': None})
+{'issue'+nodeid: {'status': None}})
 def testInvalidLinkValue(self):
 # XXX This is not the current behaviour - should we enforce this?
-#        self.assertRaises(IndexError, client.parsePropsFromForm, self.db,
+#        self.assertRaises(IndexError, self.parseForm,
-#            self.db.issue, makeForm({'status': '4'}))
+#            {'status': '4'}))
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {'link': 'frozzle'})
-self.db.issue, makeForm({'status': 'frozzle'}))
+self.assertRaises(ValueError, self.parseForm, {'link': 'frozzle'})
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
-self.db.test, makeForm({'link': 'frozzle'}))
 #
 # Multilink
 #
 def testEmptyMultilink(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': ''}), {'test': {}})
-makeForm({'nosy': ''})), {})
+self.assertEqual(self.parseForm({'nosy': ' '}), {'test': {}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
-makeForm({'nosy': ' '})), {})
 def testSetMultilink(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': '1'}, 'issue'),
-makeForm({'nosy': '1'})), {'nosy': ['1']})
+{'issue': {'nosy': ['1']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': 'admin'}, 'issue'),
-makeForm({'nosy': 'admin'})), {'nosy': ['1']})
+{'issue': {'nosy': ['1']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': ['1','2']}, 'issue'),
-makeForm({'nosy': ['1','2']})), {'nosy': ['1','2']})
+{'issue': {'nosy': ['1','2']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': '1,2'}, 'issue'),
-makeForm({'nosy': '1,2'})), {'nosy': ['1','2']})
+{'issue': {'nosy': ['1','2']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': 'admin,2'}, 'issue'),
-makeForm({'nosy': 'admin,2'})), {'nosy': ['1','2']})
+{'issue': {'nosy': ['1','2']}})
 def testEmptyMultilinkSet(self):
 nodeid = self.db.issue.create(nosy=['1','2'])
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': ''}, 'issue', nodeid),
-makeForm({'nosy': ''}), nodeid), {'nosy': []})
+{'issue'+nodeid: {'nosy': []}})
 nodeid = self.db.issue.create(nosy=['1','2'])
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': ' '}, 'issue', nodeid),
-makeForm({'nosy': ' '}), nodeid), {'nosy': []})
+{'issue'+nodeid: {'nosy': []}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': '1,2'}, 'issue', nodeid),
-makeForm({'nosy': '1,2'}), nodeid), {})
+{'issue'+nodeid: {}})
 def testInvalidMultilinkValue(self):
 # XXX This is not the current behaviour - should we enforce this?
-#        self.assertRaises(IndexError, client.parsePropsFromForm, self.db,
+#        self.assertRaises(IndexError, self.parseForm,
-#            self.db.issue, makeForm({'nosy': '4'}))
+#            {'nosy': '4'}))
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {'nosy': 'frozzle'},
-self.db.issue, makeForm({'nosy': 'frozzle'}))
+'issue')
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {'nosy': '1,frozzle'},
-self.db.issue, makeForm({'nosy': '1,frozzle'}))
+'issue')
+self.assertRaises(ValueError, self.parseForm, {'multilink': 'frozzle'})
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
-self.db.test, makeForm({'multilink': 'frozzle'}))
 def testMultilinkAdd(self):
 nodeid = self.db.issue.create(nosy=['1'])
 # do nothing
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':add:nosy': ''}, 'issue', nodeid),
-makeForm({':add:nosy': ''}), nodeid), {})
+{'issue'+nodeid: {}})
 # do something ;)
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':add:nosy': '2'}, 'issue', nodeid),
-makeForm({':add:nosy': '2'}), nodeid), {'nosy': ['1','2']})
+{'issue'+nodeid: {'nosy': ['1','2']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':add:nosy': '2,mary'}, 'issue',
-makeForm({':add:nosy': '2,mary'}), nodeid), {'nosy': ['1','2','4']})
+nodeid), {'issue'+nodeid: {'nosy': ['1','2','4']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':add:nosy': ['2','3']}, 'issue',
-makeForm({':add:nosy': ['2','3']}), nodeid), {'nosy': ['1','2','3']})
+nodeid), {'issue'+nodeid: {'nosy': ['1','2','3']}})
 def testMultilinkAddNew(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':add:nosy': ['2','3']}, 'issue'),
-makeForm({':add:nosy': ['2','3']})), {'nosy': ['2','3']})
+{'issue': {'nosy': ['2','3']}})
 def testMultilinkRemove(self):
 nodeid = self.db.issue.create(nosy=['1','2'])
 # do nothing
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':remove:nosy': ''}, 'issue', nodeid),
-makeForm({':remove:nosy': ''}), nodeid), {})
+{'issue'+nodeid: {}})
 # do something ;)
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':remove:nosy': '1'}, 'issue',
-makeForm({':remove:nosy': '1'}), nodeid), {'nosy': ['2']})
+nodeid), {'issue'+nodeid: {'nosy': ['2']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':remove:nosy': 'admin,2'},
-makeForm({':remove:nosy': 'admin,2'}), nodeid), {'nosy': []})
+'issue', nodeid), {'issue'+nodeid: {'nosy': []}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':remove:nosy': ['1','2']},
-makeForm({':remove:nosy': ['1','2']}), nodeid), {'nosy': []})
+'issue', nodeid), {'issue'+nodeid: {'nosy': []}})
 # remove one that doesn't exist?
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {':remove:nosy': '4'},
-self.db.issue, makeForm({':remove:nosy': '4'}), nodeid)
+'issue', nodeid)
 def testMultilinkRetired(self):
 self.db.user.retire('2')
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({'nosy': ['2','3']}, 'issue'),
-makeForm({'nosy': ['2','3']})), {'nosy': ['2','3']})
+{'issue': {'nosy': ['2','3']}})
 nodeid = self.db.issue.create(nosy=['1','2'])
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':remove:nosy': '2'}, 'issue',
-makeForm({':remove:nosy': '2'}), nodeid), {'nosy': ['1']})
+nodeid), {'issue'+nodeid: {'nosy': ['1']}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.issue,
+self.assertEqual(self.parseForm({':add:nosy': '3'}, 'issue', nodeid),
-makeForm({':add:nosy': '3'}), nodeid), {'nosy': ['1','2','3']})
+{'issue'+nodeid: {'nosy': ['1','2','3']}})
 def testAddRemoveNonexistant(self):
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {':remove:foo': '2'},
-self.db.issue, makeForm({':remove:foo': '2'}))
+'issue')
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {':add:foo': '2'},
-self.db.issue, makeForm({':add:foo': '2'}))
+'issue')
 #
 # Password
 #
 def testEmptyPassword(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.user,
+self.assertEqual(self.parseForm({'password': ''}, 'user'),
-makeForm({'password': ''})), {})
+{'user': {}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.user,
+self.assertEqual(self.parseForm({'password': ''}, 'user'),
-makeForm({'password': ''})), {})
+{'user': {}})
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {'password': ['', '']},
-self.db.user, makeForm({'password': ['', '']}))
+'user')
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {'password': 'foo',
-self.db.user, makeForm({'password': 'foo',
+'password:confirm': ['', '']}, 'user')
-'password:confirm': ['', '']}))
 def testSetPassword(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.user,
+self.assertEqual(self.parseForm({'password': 'foo',
-makeForm({'password': 'foo', 'password:confirm': 'foo'})),
+'password:confirm': 'foo'}, 'user'), {'user': {'password': 'foo'}})
-{'password': 'foo'})
 def testSetPasswordConfirmBad(self):
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {'password': 'foo'},
-self.db.user, makeForm({'password': 'foo'}))
+'user')
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
+self.assertRaises(ValueError, self.parseForm, {'password': 'foo',
-self.db.user, makeForm({'password': 'foo',
+'password:confirm': 'bar'}, 'user')
-'password:confirm': 'bar'}))
 def testEmptyPasswordNotSet(self):
 nodeid = self.db.user.create(username='1',
 password=password.Password('foo'))
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.user,
+self.assertEqual(self.parseForm({'password': ''}, 'user', nodeid),
-makeForm({'password': ''}), nodeid), {})
+{'user'+nodeid: {}})
 nodeid = self.db.user.create(username='2',
 password=password.Password('foo'))
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.user,
+self.assertEqual(self.parseForm({'password': '',
-makeForm({'password': '', 'password:confirm': ''}), nodeid), {})
+'password:confirm': ''}, 'user', nodeid),
+{'user'+nodeid: {}})
 #
 # Boolean
 #
 def testEmptyBoolean(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'boolean': ''}), {'test': {}})
-makeForm({'boolean': ''})), {})
+self.assertEqual(self.parseForm({'boolean': ' '}), {'test': {}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertRaises(ValueError, self.parseForm, {'boolean': ['', '']})
-makeForm({'boolean': ' '})), {})
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
-self.db.test, makeForm({'boolean': ['', '']}))
 def testSetBoolean(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'boolean': 'yes'}),
-makeForm({'boolean': 'yes'})), {'boolean': 1})
+{'test': {'boolean': 1}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'boolean': 'a\r\nb\r\n'}),
-makeForm({'boolean': 'a\r\nb\r\n'})), {'boolean': 0})
+{'test': {'boolean': 0}})
 nodeid = self.db.test.create(boolean=1)
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'boolean': 'yes'}, 'test', nodeid),
-makeForm({'boolean': 'yes'}), nodeid), {})
+{'test'+nodeid: {}})
 nodeid = self.db.test.create(boolean=0)
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'boolean': 'no'}, 'test', nodeid),
-makeForm({'boolean': 'no'}), nodeid), {})
+{'test'+nodeid: {}})
 def testEmptyBooleanSet(self):
 nodeid = self.db.test.create(boolean=0)
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'boolean': ''}, 'test', nodeid),
-makeForm({'boolean': ''}), nodeid), {'boolean': None})
+{'test'+nodeid: {'boolean': None}})
 nodeid = self.db.test.create(boolean=1)
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'boolean': ' '}, 'test', nodeid),
-makeForm({'boolean': ' '}), nodeid), {'boolean': None})
+{'test'+nodeid: {'boolean': None}})
 #
 # Date
 #
 def testEmptyDate(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'date': ''}), {'test': {}})
-makeForm({'date': ''})), {})
+self.assertEqual(self.parseForm({'date': ' '}), {'test': {}})
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertRaises(ValueError, self.parseForm, {'date': ['', '']})
-makeForm({'date': ' '})), {})
-self.assertRaises(ValueError, client.parsePropsFromForm, self.db,
-self.db.test, makeForm({'date': ['', '']}))
 def testSetDate(self):
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'date': '2003-01-01'}),
-makeForm({'date': '2003-01-01'})),
+{'test': {'date': date.Date('2003-01-01')}})
-{'date': date.Date('2003-01-01')})
 nodeid = self.db.test.create(date=date.Date('2003-01-01'))
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'date': '2003-01-01'}, 'test',
-makeForm({'date': '2003-01-01'}), nodeid), {})
+nodeid), {'test'+nodeid: {}})
 def testEmptyDateSet(self):
 nodeid = self.db.test.create(date=date.Date('.'))
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'date': ''}, 'test', nodeid),
-makeForm({'date': ''}), nodeid), {'date': None})
+{'test'+nodeid: {'date': None}})
 nodeid = self.db.test.create(date=date.Date('1970-01-01.00:00:00'))
-self.assertEqual(client.parsePropsFromForm(self.db, self.db.test,
+self.assertEqual(self.parseForm({'date': ' '}, 'test', nodeid),
-makeForm({'date': ' '}), nodeid), {'date': None})
+{'test'+nodeid: {'date': None}})
+#
+# Test multiple items in form
+#
+def testMultiple(self):
+self.assertEqual(self.parseForm({'string': 'a', 'issue@title': 'b'}),
+{'test': {'string': 'a'}, 'issue': {'title': 'b'}})
+nodeid = self.db.test.create()
+self.assertEqual(self.parseForm({'string': 'a', 'issue@title': 'b'},
+'test', nodeid),
+{'test1': {'string': 'a'}, 'issue': {'title': 'b'}})
 def suite():
 l = [unittest.makeSuite(FormTestCase),
 ]
 return unittest.TestSuite(l)

Mercurial > p > roundup > code

comparison test/test_cgi.py @ 1420:3ac43c62a250