Skip to content

Commit 3c4e49e

Browse files
rouiljrouilj
committed
Replace depricated assertEquals with assertEqual failUnless with asserTrue.
1 parent b11c906 commit 3c4e49e

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

‎test/db_test_base.py‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -459,18 +459,18 @@ def testDateChange(self):
459459
def testDateLeapYear(self):
460460
nid = self.db.issue.create(title='spam', status='1',
461461
deadline=date.Date('2008-02-29'))
462-
self.assertEquals(str(self.db.issue.get(nid, 'deadline')),
462+
self.assertEqual(str(self.db.issue.get(nid, 'deadline')),
463463
'2008-02-29.00:00:00')
464-
self.assertEquals(self.db.issue.filter(None,
464+
self.assertEqual(self.db.issue.filter(None,
465465
{'deadline': '2008-02-29'}), [nid])
466-
self.assertEquals(list(self.db.issue.filter_iter(None,
466+
self.assertEqual(list(self.db.issue.filter_iter(None,
467467
{'deadline': '2008-02-29'})), [nid])
468468
self.db.issue.set(nid, deadline=date.Date('2008-03-01'))
469-
self.assertEquals(str(self.db.issue.get(nid, 'deadline')),
469+
self.assertEqual(str(self.db.issue.get(nid, 'deadline')),
470470
'2008-03-01.00:00:00')
471-
self.assertEquals(self.db.issue.filter(None,
471+
self.assertEqual(self.db.issue.filter(None,
472472
{'deadline': '2008-02-29'}), [])
473-
self.assertEquals(list(self.db.issue.filter_iter(None,
473+
self.assertEqual(list(self.db.issue.filter_iter(None,
474474
{'deadline': '2008-02-29'})), [])
475475

476476
def testDateUnset(self):
@@ -1404,30 +1404,30 @@ def testIndexerSearching(self):
14041404
i1 = self.db.issue.create(files=[f1, f2], title="flebble plop")
14051405
i2 = self.db.issue.create(title="flebble the frooz")
14061406
self.db.commit()
1407-
self.assertEquals(self.db.indexer.search([], self.db.issue), {})
1408-
self.assertEquals(self.db.indexer.search(['hello'], self.db.issue),
1407+
self.assertEqual(self.db.indexer.search([], self.db.issue), {})
1408+
self.assertEqual(self.db.indexer.search(['hello'], self.db.issue),
14091409
{i1: {'files': [f1]}})
14101410
# content='world' has the wrong content-type and shouldn't be indexed
1411-
self.assertEquals(self.db.indexer.search(['world'], self.db.issue), {})
1412-
self.assertEquals(self.db.indexer.search(['frooz'], self.db.issue),
1411+
self.assertEqual(self.db.indexer.search(['world'], self.db.issue), {})
1412+
self.assertEqual(self.db.indexer.search(['frooz'], self.db.issue),
14131413
{i2: {}})
1414-
self.assertEquals(self.db.indexer.search(['flebble'], self.db.issue),
1414+
self.assertEqual(self.db.indexer.search(['flebble'], self.db.issue),
14151415
{i1: {}, i2: {}})
14161416

14171417
# test AND'ing of search terms
1418-
self.assertEquals(self.db.indexer.search(['frooz', 'flebble'],
1418+
self.assertEqual(self.db.indexer.search(['frooz', 'flebble'],
14191419
self.db.issue), {i2: {}})
14201420

14211421
# unindexed stopword
1422-
self.assertEquals(self.db.indexer.search(['the'], self.db.issue), {})
1422+
self.assertEqual(self.db.indexer.search(['the'], self.db.issue), {})
14231423

14241424
def testIndexerSearchingLink(self):
14251425
m1 = self.db.msg.create(content="one two")
14261426
i1 = self.db.issue.create(messages=[m1])
14271427
m2 = self.db.msg.create(content="two three")
14281428
i2 = self.db.issue.create(feedback=m2)
14291429
self.db.commit()
1430-
self.assertEquals(self.db.indexer.search(['two'], self.db.issue),
1430+
self.assertEqual(self.db.indexer.search(['two'], self.db.issue),
14311431
{i1: {'messages': [m1]}, i2: {'feedback': [m2]}})
14321432

14331433
def testIndexerSearchMulti(self):
@@ -1436,12 +1436,12 @@ def testIndexerSearchMulti(self):
14361436
i1 = self.db.issue.create(messages=[m1])
14371437
i2 = self.db.issue.create(spam=[m2])
14381438
self.db.commit()
1439-
self.assertEquals(self.db.indexer.search([], self.db.issue), {})
1440-
self.assertEquals(self.db.indexer.search(['one'], self.db.issue),
1439+
self.assertEqual(self.db.indexer.search([], self.db.issue), {})
1440+
self.assertEqual(self.db.indexer.search(['one'], self.db.issue),
14411441
{i1: {'messages': [m1]}})
1442-
self.assertEquals(self.db.indexer.search(['two'], self.db.issue),
1442+
self.assertEqual(self.db.indexer.search(['two'], self.db.issue),
14431443
{i1: {'messages': [m1]}, i2: {'spam': [m2]}})
1444-
self.assertEquals(self.db.indexer.search(['three'], self.db.issue),
1444+
self.assertEqual(self.db.indexer.search(['three'], self.db.issue),
14451445
{i2: {'spam': [m2]}})
14461446

14471447
def testReindexingChange(self):
@@ -1450,29 +1450,29 @@ def testReindexingChange(self):
14501450
i1 = issue.create(title="flebble plop")
14511451
i2 = issue.create(title="flebble frooz")
14521452
self.db.commit()
1453-
self.assertEquals(search(['plop'], issue), {i1: {}})
1454-
self.assertEquals(search(['flebble'], issue), {i1: {}, i2: {}})
1453+
self.assertEqual(search(['plop'], issue), {i1: {}})
1454+
self.assertEqual(search(['flebble'], issue), {i1: {}, i2: {}})
14551455

14561456
# change i1's title
14571457
issue.set(i1, title="plop")
14581458
self.db.commit()
1459-
self.assertEquals(search(['plop'], issue), {i1: {}})
1460-
self.assertEquals(search(['flebble'], issue), {i2: {}})
1459+
self.assertEqual(search(['plop'], issue), {i1: {}})
1460+
self.assertEqual(search(['flebble'], issue), {i2: {}})
14611461

14621462
def testReindexingClear(self):
14631463
search = self.db.indexer.search
14641464
issue = self.db.issue
14651465
i1 = issue.create(title="flebble plop")
14661466
i2 = issue.create(title="flebble frooz")
14671467
self.db.commit()
1468-
self.assertEquals(search(['plop'], issue), {i1: {}})
1469-
self.assertEquals(search(['flebble'], issue), {i1: {}, i2: {}})
1468+
self.assertEqual(search(['plop'], issue), {i1: {}})
1469+
self.assertEqual(search(['flebble'], issue), {i1: {}, i2: {}})
14701470

14711471
# unset i1's title
14721472
issue.set(i1, title="")
14731473
self.db.commit()
1474-
self.assertEquals(search(['plop'], issue), {})
1475-
self.assertEquals(search(['flebble'], issue), {i2: {}})
1474+
self.assertEqual(search(['plop'], issue), {})
1475+
self.assertEqual(search(['flebble'], issue), {i2: {}})
14761476

14771477
def testFileClassReindexing(self):
14781478
f1 = self.db.file.create(content='hello')
@@ -1482,38 +1482,38 @@ def testFileClassReindexing(self):
14821482
d = self.db.indexer.search(['hello'], self.db.issue)
14831483
self.assertTrue(i1 in d)
14841484
d[i1]['files'].sort()
1485-
self.assertEquals(d, {i1: {'files': [f1, f2]}})
1486-
self.assertEquals(self.db.indexer.search(['world'], self.db.issue),
1485+
self.assertEqual(d, {i1: {'files': [f1, f2]}})
1486+
self.assertEqual(self.db.indexer.search(['world'], self.db.issue),
14871487
{i1: {'files': [f2]}})
14881488
self.db.file.set(f1, content="world")
14891489
self.db.commit()
14901490
d = self.db.indexer.search(['world'], self.db.issue)
14911491
d[i1]['files'].sort()
1492-
self.assertEquals(d, {i1: {'files': [f1, f2]}})
1493-
self.assertEquals(self.db.indexer.search(['hello'], self.db.issue),
1492+
self.assertEqual(d, {i1: {'files': [f1, f2]}})
1493+
self.assertEqual(self.db.indexer.search(['hello'], self.db.issue),
14941494
{i1: {'files': [f2]}})
14951495

14961496
def testFileClassIndexingNoNoNo(self):
14971497
f1 = self.db.file.create(content='hello')
14981498
self.db.commit()
1499-
self.assertEquals(self.db.indexer.search(['hello'], self.db.file),
1499+
self.assertEqual(self.db.indexer.search(['hello'], self.db.file),
15001500
{'1': {}})
15011501

15021502
f1 = self.db.file_nidx.create(content='hello')
15031503
self.db.commit()
1504-
self.assertEquals(self.db.indexer.search(['hello'], self.db.file_nidx),
1504+
self.assertEqual(self.db.indexer.search(['hello'], self.db.file_nidx),
15051505
{})
15061506

15071507
def testForcedReindexing(self):
15081508
self.db.issue.create(title="flebble frooz")
15091509
self.db.commit()
1510-
self.assertEquals(self.db.indexer.search(['flebble'], self.db.issue),
1510+
self.assertEqual(self.db.indexer.search(['flebble'], self.db.issue),
15111511
{'1': {}})
15121512
self.db.indexer.quiet = 1
15131513
self.db.indexer.force_reindex()
15141514
self.db.post_init()
15151515
self.db.indexer.quiet = 9
1516-
self.assertEquals(self.db.indexer.search(['flebble'], self.db.issue),
1516+
self.assertEqual(self.db.indexer.search(['flebble'], self.db.issue),
15171517
{'1': {}})
15181518

15191519
def testIndexingPropertiesOnImport(self):
@@ -1525,7 +1525,7 @@ def testIndexingPropertiesOnImport(self):
15251525
self.db.commit()
15261526

15271527
# Content of title attribute is indexed
1528-
self.assertEquals(self.db.indexer.search([title], self.db.issue),
1528+
self.assertEqual(self.db.indexer.search([title], self.db.issue),
15291529
{str(nodeid):{}})
15301530

15311531

@@ -2387,9 +2387,9 @@ def stderrwrite(s):
23872387
tool.do_export (['_test_export'])
23882388
self.assertEqual(len(output), 2)
23892389
self.assertEqual(output [1], '\n')
2390-
self.failUnless(output [0].startswith
2390+
self.assertTrue(output [0].startswith
23912391
('Warning: config csv_field_size should be at least'))
2392-
self.failUnless(int(output[0].split()[-1]) > 500)
2392+
self.assertTrue(int(output[0].split()[-1]) > 500)
23932393

23942394
if hasattr(roundup.admin.csv, 'field_size_limit'):
23952395
self.nukeAndCreate()
@@ -2498,7 +2498,7 @@ def stdoutwrite(s):
24982498
# basic usage test. TODO add full output verification
24992499
soutput[:] = [] # empty for next round of output
25002500
tool.usage(message="Hello World")
2501-
self.failUnless(soutput[0].startswith('Problem: Hello World'), None)
2501+
self.assertTrue(soutput[0].startswith('Problem: Hello World'), None)
25022502

25032503
# check security output
25042504
soutput[:] = [] # empty for next round of output

0 commit comments

Comments
 (0)