|
8 | 8 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 | 9 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
10 | 10 | # |
11 | | -# $Id: test_cgi.py,v 1.23 2004-02-17 03:48:08 richard Exp $ |
| 11 | +# $Id: test_cgi.py,v 1.24 2004-09-28 10:47:20 a1s Exp $ |
12 | 12 |
|
13 | 13 | import unittest, os, shutil, errno, sys, difflib, cgi, re |
14 | 14 |
|
@@ -71,18 +71,19 @@ def setUp(self): |
71 | 71 | # create the instance |
72 | 72 | init.install(self.dirname, 'templates/classic') |
73 | 73 | init.write_select_db(self.dirname, 'anydbm') |
74 | | - init.initialise(self.dirname, 'sekrit') |
75 | | - |
76 | | - # check we can load the package |
77 | | - self.instance = instance.open(self.dirname) |
78 | | - # and open the database |
| 74 | + self.instance = tracker = instance.open(self.dirname) |
| 75 | + if tracker.exists(): |
| 76 | + tracker.nuke() |
| 77 | + tracker.init(password.Password('sekrit')) |
| 78 | + |
| 79 | + # open the database |
79 | 80 | self.db = self.instance.open('admin') |
80 | 81 | self. db. user. create( username='Chef', address='[email protected]', |
81 | 82 | realname='Bork, Chef', roles='User') |
82 | 83 | self.db.user.create(username='mary', address='mary@test', |
83 | 84 | roles='User', realname='Contrary, Mary') |
84 | 85 |
|
85 | | - test = self.instance.dbinit.Class(self.db, "test", |
| 86 | + test = self.instance.get_backend().Class(self.db, "test", |
86 | 87 | string=hyperdb.String(), number=hyperdb.Number(), |
87 | 88 | boolean=hyperdb.Boolean(), link=hyperdb.Link('test'), |
88 | 89 | multilink=hyperdb.Multilink('test'), date=hyperdb.Date(), |
@@ -273,15 +274,15 @@ def testMixedMultilink(self): |
273 | 274 | cl.classname = 'issue' |
274 | 275 | cl.nodeid = None |
275 | 276 | cl.db = self.db |
276 | | - self.assertEqual(cl.parsePropsFromForm(create=1), |
| 277 | + self.assertEqual(cl.parsePropsFromForm(create=1), |
277 | 278 | ({('issue', None): {'nosy': ['1','2', '3']}}, [])) |
278 | 279 |
|
279 | 280 | def testEmptyMultilinkSet(self): |
280 | 281 | nodeid = self.db.issue.create(nosy=['1','2']) |
281 | | - self.assertEqual(self.parseForm({'nosy': ''}, 'issue', nodeid), |
| 282 | + self.assertEqual(self.parseForm({'nosy': ''}, 'issue', nodeid), |
282 | 283 | ({('issue', nodeid): {'nosy': []}}, [])) |
283 | 284 | nodeid = self.db.issue.create(nosy=['1','2']) |
284 | | - self.assertEqual(self.parseForm({'nosy': ' '}, 'issue', nodeid), |
| 285 | + self.assertEqual(self.parseForm({'nosy': ' '}, 'issue', nodeid), |
285 | 286 | ({('issue', nodeid): {'nosy': []}}, [])) |
286 | 287 | self.assertEqual(self.parseForm({'nosy': '1,2'}, 'issue', nodeid), |
287 | 288 | ({('issue', nodeid): {}}, [])) |
@@ -468,15 +469,15 @@ def testSetDate(self): |
468 | 469 | self.assertEqual(self.parseForm({'date': '2003-01-01'}), |
469 | 470 | ({('test', None): {'date': date.Date('2003-01-01')}}, [])) |
470 | 471 | nodeid = self.db.test.create(date=date.Date('2003-01-01')) |
471 | | - self.assertEqual(self.parseForm({'date': '2003-01-01'}, 'test', |
| 472 | + self.assertEqual(self.parseForm({'date': '2003-01-01'}, 'test', |
472 | 473 | nodeid), ({('test', nodeid): {}}, [])) |
473 | 474 |
|
474 | 475 | def testEmptyDateSet(self): |
475 | 476 | nodeid = self.db.test.create(date=date.Date('.')) |
476 | | - self.assertEqual(self.parseForm({'date': ''}, 'test', nodeid), |
| 477 | + self.assertEqual(self.parseForm({'date': ''}, 'test', nodeid), |
477 | 478 | ({('test', nodeid): {'date': None}}, [])) |
478 | 479 | nodeid = self.db.test.create(date=date.Date('1970-01-01.00:00:00')) |
479 | | - self.assertEqual(self.parseForm({'date': ' '}, 'test', nodeid), |
| 480 | + self.assertEqual(self.parseForm({'date': ' '}, 'test', nodeid), |
480 | 481 | ({('test', nodeid): {'date': None}}, [])) |
481 | 482 |
|
482 | 483 | # |
@@ -543,4 +544,4 @@ def test_suite(): |
543 | 544 | runner = unittest.TextTestRunner() |
544 | 545 | unittest.main(testRunner=runner) |
545 | 546 |
|
546 | | -# vim: set filetype=python ts=4 sw=4 et si |
| 547 | +# vim: set filetype=python sts=4 sw=4 et si : |
0 commit comments