Skip to content

Commit ad4560b

Browse files
author
Johannes Gijsbers
committed
Use FormError.
1 parent 990a34b commit ad4560b

File tree

1 file changed

+31
-30
lines changed

1 file changed

+31
-30
lines changed

‎test/test_cgi.py‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1010
#
11-
# $Id: test_cgi.py,v 1.19 2003-09-07 20:37:33 jlgijsbers Exp $
11+
# $Id: test_cgi.py,v 1.20 2003-09-24 14:54:23 jlgijsbers Exp $
1212

1313
import unittest, os, shutil, errno, sys, difflib, cgi, re
1414

1515
from roundup.cgi import client
16+
from roundup.cgi.client import FormError
1617
from roundup import init, instance, password, hyperdb, date
1718

1819
NEEDS_INSTANCE = 1
@@ -149,21 +150,21 @@ def testNothing(self):
149150
self.assertEqual(self.parseForm({}), ({('test', None): {}}, []))
150151

151152
def testNothingWithRequired(self):
152-
self.assertRaises(ValueError, self.parseForm, {':required': 'string'})
153-
self.assertRaises(ValueError, self.parseForm,
153+
self.assertRaises(FormError, self.parseForm, {':required': 'string'})
154+
self.assertRaises(FormError, self.parseForm,
154155
{':required': 'title,status', 'status':'1'}, 'issue')
155-
self.assertRaises(ValueError, self.parseForm,
156+
self.assertRaises(FormError, self.parseForm,
156157
{':required': ['title','status'], 'status':'1'}, 'issue')
157-
self.assertRaises(ValueError, self.parseForm,
158+
self.assertRaises(FormError, self.parseForm,
158159
{':required': 'status', 'status':''}, 'issue')
159-
self.assertRaises(ValueError, self.parseForm,
160+
self.assertRaises(FormError, self.parseForm,
160161
{':required': 'nosy', 'nosy':''}, 'issue')
161162

162163
#
163164
# Nonexistant edit
164165
#
165166
def testEditNonexistant(self):
166-
self.assertRaises(IndexError, self.parseForm, {'boolean': ''},
167+
self.assertRaises(FormError, self.parseForm, {'boolean': ''},
167168
'test', '1')
168169

169170
#
@@ -174,7 +175,7 @@ def testEmptyString(self):
174175
({('test', None): {}}, []))
175176
self.assertEqual(self.parseForm({'string': ' '}),
176177
({('test', None): {}}, []))
177-
self.assertRaises(ValueError, self.parseForm, {'string': ['', '']})
178+
self.assertRaises(FormError, self.parseForm, {'string': ['', '']})
178179

179180
def testSetString(self):
180181
self.assertEqual(self.parseForm({'string': 'foo'}),
@@ -214,7 +215,7 @@ def testEmptyLink(self):
214215
({('test', None): {}}, []))
215216
self.assertEqual(self.parseForm({'link': ' '}),
216217
({('test', None): {}}, []))
217-
self.assertRaises(ValueError, self.parseForm, {'link': ['', '']})
218+
self.assertRaises(FormError, self.parseForm, {'link': ['', '']})
218219
self.assertEqual(self.parseForm({'link': '-1'}),
219220
({('test', None): {}}, []))
220221

@@ -236,8 +237,8 @@ def testInvalidLinkValue(self):
236237
# XXX This is not the current behaviour - should we enforce this?
237238
# self.assertRaises(IndexError, self.parseForm,
238239
# {'status': '4'}))
239-
self.assertRaises(ValueError, self.parseForm, {'link': 'frozzle'})
240-
self.assertRaises(ValueError, self.parseForm, {'status': 'frozzle'},
240+
self.assertRaises(FormError, self.parseForm, {'link': 'frozzle'})
241+
self.assertRaises(FormError, self.parseForm, {'status': 'frozzle'},
241242
'issue')
242243

243244
#
@@ -286,11 +287,11 @@ def testInvalidMultilinkValue(self):
286287
# XXX This is not the current behaviour - should we enforce this?
287288
# self.assertRaises(IndexError, self.parseForm,
288289
# {'nosy': '4'}))
289-
self.assertRaises(ValueError, self.parseForm, {'nosy': 'frozzle'},
290+
self.assertRaises(FormError, self.parseForm, {'nosy': 'frozzle'},
290291
'issue')
291-
self.assertRaises(ValueError, self.parseForm, {'nosy': '1,frozzle'},
292+
self.assertRaises(FormError, self.parseForm, {'nosy': '1,frozzle'},
292293
'issue')
293-
self.assertRaises(ValueError, self.parseForm, {'multilink': 'frozzle'})
294+
self.assertRaises(FormError, self.parseForm, {'multilink': 'frozzle'})
294295

295296
def testMultilinkAdd(self):
296297
nodeid = self.db.issue.create(nosy=['1'])
@@ -330,7 +331,7 @@ def testMultilinkRemove(self):
330331
'issue', nodeid), ({('issue', nodeid): {'nosy': ['3']}}, []))
331332

332333
# remove one that doesn't exist?
333-
self.assertRaises(ValueError, self.parseForm, {':remove:nosy': '4'},
334+
self.assertRaises(FormError, self.parseForm, {':remove:nosy': '4'},
334335
'issue', nodeid)
335336

336337
def testMultilinkRetired(self):
@@ -344,9 +345,9 @@ def testMultilinkRetired(self):
344345
({('issue', nodeid): {'nosy': ['1','2','3']}}, []))
345346

346347
def testAddRemoveNonexistant(self):
347-
self.assertRaises(ValueError, self.parseForm, {':remove:foo': '2'},
348+
self.assertRaises(FormError, self.parseForm, {':remove:foo': '2'},
348349
'issue')
349-
self.assertRaises(ValueError, self.parseForm, {':add:foo': '2'},
350+
self.assertRaises(FormError, self.parseForm, {':add:foo': '2'},
350351
'issue')
351352

352353
#
@@ -357,9 +358,9 @@ def testEmptyPassword(self):
357358
({('user', None): {}}, []))
358359
self.assertEqual(self.parseForm({'password': ''}, 'user'),
359360
({('user', None): {}}, []))
360-
self.assertRaises(ValueError, self.parseForm, {'password': ['', '']},
361+
self.assertRaises(FormError, self.parseForm, {'password': ['', '']},
361362
'user')
362-
self.assertRaises(ValueError, self.parseForm, {'password': 'foo',
363+
self.assertRaises(FormError, self.parseForm, {'password': 'foo',
363364
':confirm:password': ['', '']}, 'user')
364365

365366
def testSetPassword(self):
@@ -368,9 +369,9 @@ def testSetPassword(self):
368369
({('user', None): {'password': 'foo'}}, []))
369370

370371
def testSetPasswordConfirmBad(self):
371-
self.assertRaises(ValueError, self.parseForm, {'password': 'foo'},
372+
self.assertRaises(FormError, self.parseForm, {'password': 'foo'},
372373
'user')
373-
self.assertRaises(ValueError, self.parseForm, {'password': 'foo',
374+
self.assertRaises(FormError, self.parseForm, {'password': 'foo',
374375
':confirm:password': 'bar'}, 'user')
375376

376377
def testEmptyPasswordNotSet(self):
@@ -392,7 +393,7 @@ def testEmptyBoolean(self):
392393
({('test', None): {}}, []))
393394
self.assertEqual(self.parseForm({'boolean': ' '}),
394395
({('test', None): {}}, []))
395-
self.assertRaises(ValueError, self.parseForm, {'boolean': ['', '']})
396+
self.assertRaises(FormError, self.parseForm, {'boolean': ['', '']})
396397

397398
def testSetBoolean(self):
398399
self.assertEqual(self.parseForm({'boolean': 'yes'}),
@@ -422,10 +423,10 @@ def testEmptyNumber(self):
422423
({('test', None): {}}, []))
423424
self.assertEqual(self.parseForm({'number': ' '}),
424425
({('test', None): {}}, []))
425-
self.assertRaises(ValueError, self.parseForm, {'number': ['', '']})
426+
self.assertRaises(FormError, self.parseForm, {'number': ['', '']})
426427

427428
def testInvalidNumber(self):
428-
self.assertRaises(ValueError, self.parseForm, {'number': 'hi, mum!'})
429+
self.assertRaises(FormError, self.parseForm, {'number': 'hi, mum!'})
429430

430431
def testSetNumber(self):
431432
self.assertEqual(self.parseForm({'number': '1'}),
@@ -455,10 +456,10 @@ def testEmptyDate(self):
455456
({('test', None): {}}, []))
456457
self.assertEqual(self.parseForm({'date': ' '}),
457458
({('test', None): {}}, []))
458-
self.assertRaises(ValueError, self.parseForm, {'date': ['', '']})
459+
self.assertRaises(FormError, self.parseForm, {'date': ['', '']})
459460

460461
def testInvalidDate(self):
461-
self.assertRaises(ValueError, self.parseForm, {'date': '12'})
462+
self.assertRaises(FormError, self.parseForm, {'date': '12'})
462463

463464
def testSetDate(self):
464465
self.assertEqual(self.parseForm({'date': '2003-01-01'}),
@@ -506,15 +507,15 @@ def testLinking(self):
506507
)
507508

508509
def testLinkBadDesignator(self):
509-
self.assertRaises(ValueError, self.parseForm,
510+
self.assertRaises(FormError, self.parseForm,
510511
{'test-1@link@link': 'blah'})
511-
self.assertRaises(ValueError, self.parseForm,
512+
self.assertRaises(FormError, self.parseForm,
512513
{'test-1@link@link': 'issue'})
513514

514515
def testLinkNotLink(self):
515-
self.assertRaises(ValueError, self.parseForm,
516+
self.assertRaises(FormError, self.parseForm,
516517
{'test-1@link@boolean': 'issue-1'})
517-
self.assertRaises(ValueError, self.parseForm,
518+
self.assertRaises(FormError, self.parseForm,
518519
{'test-1@link@string': 'issue-1'})
519520

520521
def testBackwardsCompat(self):

0 commit comments

Comments
 (0)