Skip to content

Commit cf3a1ba

Browse files
author
Alexander Smishlajev
committed
init.initialize() was removed in [[CVS:1.30]] (27-jul-2004)
initialize test tracker as it is done in admin.py new Tracker objects don't have 'dbinit' property. use .get_backend() to obtain class 'Class' from selected backend. trim trailing spaces; fix vim modeline
1 parent fcd60f1 commit cf3a1ba

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

test/test_cgi.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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.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 $
1212

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

@@ -71,18 +71,19 @@ def setUp(self):
7171
# create the instance
7272
init.install(self.dirname, 'templates/classic')
7373
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
7980
self.db = self.instance.open('admin')
8081
self.db.user.create(username='Chef', address='[email protected]',
8182
realname='Bork, Chef', roles='User')
8283
self.db.user.create(username='mary', address='mary@test',
8384
roles='User', realname='Contrary, Mary')
8485

85-
test = self.instance.dbinit.Class(self.db, "test",
86+
test = self.instance.get_backend().Class(self.db, "test",
8687
string=hyperdb.String(), number=hyperdb.Number(),
8788
boolean=hyperdb.Boolean(), link=hyperdb.Link('test'),
8889
multilink=hyperdb.Multilink('test'), date=hyperdb.Date(),
@@ -273,15 +274,15 @@ def testMixedMultilink(self):
273274
cl.classname = 'issue'
274275
cl.nodeid = None
275276
cl.db = self.db
276-
self.assertEqual(cl.parsePropsFromForm(create=1),
277+
self.assertEqual(cl.parsePropsFromForm(create=1),
277278
({('issue', None): {'nosy': ['1','2', '3']}}, []))
278279

279280
def testEmptyMultilinkSet(self):
280281
nodeid = self.db.issue.create(nosy=['1','2'])
281-
self.assertEqual(self.parseForm({'nosy': ''}, 'issue', nodeid),
282+
self.assertEqual(self.parseForm({'nosy': ''}, 'issue', nodeid),
282283
({('issue', nodeid): {'nosy': []}}, []))
283284
nodeid = self.db.issue.create(nosy=['1','2'])
284-
self.assertEqual(self.parseForm({'nosy': ' '}, 'issue', nodeid),
285+
self.assertEqual(self.parseForm({'nosy': ' '}, 'issue', nodeid),
285286
({('issue', nodeid): {'nosy': []}}, []))
286287
self.assertEqual(self.parseForm({'nosy': '1,2'}, 'issue', nodeid),
287288
({('issue', nodeid): {}}, []))
@@ -468,15 +469,15 @@ def testSetDate(self):
468469
self.assertEqual(self.parseForm({'date': '2003-01-01'}),
469470
({('test', None): {'date': date.Date('2003-01-01')}}, []))
470471
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',
472473
nodeid), ({('test', nodeid): {}}, []))
473474

474475
def testEmptyDateSet(self):
475476
nodeid = self.db.test.create(date=date.Date('.'))
476-
self.assertEqual(self.parseForm({'date': ''}, 'test', nodeid),
477+
self.assertEqual(self.parseForm({'date': ''}, 'test', nodeid),
477478
({('test', nodeid): {'date': None}}, []))
478479
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),
480481
({('test', nodeid): {'date': None}}, []))
481482

482483
#
@@ -543,4 +544,4 @@ def test_suite():
543544
runner = unittest.TextTestRunner()
544545
unittest.main(testRunner=runner)
545546

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

Comments
 (0)