Skip to content

Commit 3fbe665

Browse files
CitoCito
committed
Made tests a bit cleaner.
1 parent f24c633 commit 3fbe665

17 files changed

+237
-226
lines changed

‎Docs/ReleaseProcedures.phtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ Test the current version before releasing it:
6262
number in mod_webkit.c to the Webware version.
6363

6464
[ ] Run the above tests on all supported Python versions (currently these are
65-
versions 2.4-2.7 and PyPy 1.5) and on different platforms (e.g. various
66-
flavors of Linux, MacOS, Windows).
65+
Python versions 2.4 to 2.7 and also PyPy) and on different platforms (e.g.
66+
various flavors of Linux, MacOS, Windows).
6767
</pre>
6868

6969

‎MiscUtils/MixIn.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ def foo(self):
4747
# now do whatever you want
4848
4949
"""
50-
assert mixInClass is not pyClass, \
51-
'mixInClass = %r, pyClass = %r' % (mixInClass, pyClass)
50+
assert mixInClass is not pyClass, (
51+
'mixInClass = %r, pyClass = %r' % (mixInClass, pyClass))
5252
if makeAncestor:
5353
if mixInClass not in pyClass.__bases__:
5454
pyClass.__bases__ = (mixInClass,) + pyClass.__bases__

‎MiscUtils/Tests/TestCSVParser.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,24 @@ def testPositives(self):
8585
if '\n' not in input:
8686
# single line
8787
result = self.parse(input)
88-
assert result == output, ('\ninput=%r\nresult=%r\noutput=%r'
88+
self.assertEqual(result, output,
89+
'\ninput=%r\nresult=%r\noutput=%r'
8990
% (input, result, output))
9091
result = self.parse(input+'\n')
91-
assert result == output, ('\ninput=%r\nresult=%r\noutput=%r'
92+
self.assertEqual(result, output,
93+
'\ninput=%r\nresult=%r\noutput=%r'
9294
% (input, result, output))
9395
else:
9496
# multiple lines
9597
gotFields = False
9698
for line in input.splitlines():
97-
assert not gotFields
99+
self.assertFalse(gotFields)
98100
result = self.parse(line)
99101
if result is not None:
100102
gotFields = True
101-
assert gotFields
102-
assert result == output, ('\ninput=%r\nresult=%r\noutput=%r'
103+
self.assertTrue(gotFields)
104+
self.assertEqual(result, output,
105+
'\ninput=%r\nresult=%r\noutput=%r'
103106
% (input, result, output))
104107

105108

‎MiscUtils/Tests/TestDataTable.py

+33-32
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@ class TestTableColumn(unittest.TestCase):
1111

1212
def testWithType(self):
1313
tc = TableColumn('foo:int')
14-
assert tc.name() == 'foo'
15-
assert tc.type() is int
14+
self.assertEqual(tc.name(), 'foo')
15+
self.assertTrue(tc.type() is int)
1616

1717
def testWithoutType(self):
1818
tc = TableColumn('bar')
19-
assert tc.name() == 'bar'
20-
assert tc.type() is None
19+
self.assertEqual(tc.name(), 'bar')
20+
self.assertTrue(tc.type() is None)
2121

2222
def testWrongSpec(self):
2323
self.assertRaises(DataTableError, TableColumn, 'foo:bar')
2424
self.assertRaises(DataTableError, TableColumn, 'foo:bar:baz')
2525

2626
def testValueForRawValue(self):
2727
tc = TableColumn('foo:int')
28-
assert tc.valueForRawValue('') == 0
29-
assert tc.valueForRawValue('1') == 1
30-
assert tc.valueForRawValue(2) == 2
31-
assert tc.valueForRawValue(2.5) == 2
28+
self.assertEqual(tc.valueForRawValue(''), 0)
29+
self.assertEqual(tc.valueForRawValue('1'), 1)
30+
self.assertEqual(tc.valueForRawValue(2), 2)
31+
self.assertEqual(tc.valueForRawValue(2.5), 2)
3232
tc = TableColumn('bar:str')
33-
assert tc.valueForRawValue('') == ''
34-
assert tc.valueForRawValue('1') == '1'
35-
assert tc.valueForRawValue(2) == '2'
36-
assert tc.valueForRawValue('x') == 'x'
33+
self.assertEqual(tc.valueForRawValue(''), '')
34+
self.assertEqual(tc.valueForRawValue('1'), '1')
35+
self.assertEqual( tc.valueForRawValue(2), '2')
36+
self.assertEqual( tc.valueForRawValue('x'), 'x')
3737
tc = TableColumn('bar:float')
38-
assert tc.valueForRawValue('') == 0.0
39-
assert tc.valueForRawValue('1') == 1.0
40-
assert tc.valueForRawValue('1.5') == 1.5
41-
assert tc.valueForRawValue(2.5) == 2.5
42-
assert tc.valueForRawValue(3) == 3.0
38+
self.assertEqual(tc.valueForRawValue(''), 0.0)
39+
self.assertEqual(tc.valueForRawValue('1'), 1.0)
40+
self.assertEqual(tc.valueForRawValue('1.5'), 1.5)
41+
self.assertEqual(tc.valueForRawValue(2.5), 2.5)
42+
self.assertEqual(tc.valueForRawValue(3), 3.0)
4343

4444

4545
class Record(object):
@@ -61,7 +61,7 @@ def _testSource(self, name, src, headings, data):
6161
dt = DataTable()
6262
lines = src.splitlines()
6363
dt.readLines(lines)
64-
assert [col.name() for col in dt.headings()] == headings
64+
self.assertEqual([col.name() for col in dt.headings()], headings)
6565
for i, values in enumerate(dt):
6666
match = data[i]
6767
self.assertEqual(values.asList(), match,
@@ -101,14 +101,15 @@ def _testBasic(self):
101101
t.append(b)
102102
t.append(c)
103103
t.append(d)
104-
assert t[-4]['name'] == 'John'
105-
assert t[-3]['name'] == 'Mary'
106-
assert t[-2]['name'] == 'Fred'
107-
assert t[-1]['name'] == 'Wilma'
108-
assert t[-4].asDict() == {'name': 'John', 'age': 26, 'rating': 7.25}
109-
assert t[-3].asList() == b
110-
assert t[-2].asDict() == c
111-
assert t[-1].asList() == ['Wilma', 27, 9.5]
104+
self.assertEqual(t[-4]['name'], 'John')
105+
self.assertEqual(t[-3]['name'], 'Mary')
106+
self.assertEqual(t[-2]['name'], 'Fred')
107+
self.assertEqual(t[-1]['name'], 'Wilma')
108+
self.assertEqual(t[-4].asDict(),
109+
{'name': 'John', 'age': 26, 'rating': 7.25})
110+
self.assertEqual(t[-3].asList(), b)
111+
self.assertEqual(t[-2].asDict(), c)
112+
self.assertEqual(t[-1].asList(), ['Wilma', 27, 9.5])
112113

113114
# Printing
114115
# print t
@@ -124,13 +125,13 @@ def _testBasic(self):
124125
out = StringIO()
125126
t.writeFile(out)
126127
results = out.getvalue()
127-
assert results == answer, '\n%r\n%r\n' % (results, answer)
128+
self.assertEqual(results, answer, '\n%r\n%r\n' % (results, answer))
128129

129130
# Accessing rows
130131
for row in t:
131-
assert row['name'] == row[0]
132-
assert row['age'] == row[1]
133-
assert row['rating'] == row[2]
132+
self.assertEqual(row['name'], row[0])
133+
self.assertEqual(row['age'], row[1])
134+
self.assertEqual(row['rating'], row[2])
134135
for item in row:
135136
pass
136137

@@ -139,7 +140,7 @@ def _testBasic(self):
139140
t.setHeadings(list('xyz'))
140141
t.append([1, 2, 3])
141142
t.append([4, 5, 6])
142-
assert t[0]['x'] - t[1]['z'] == -5
143+
self.assertEqual(t[0]['x'] - t[1]['z'], -5)
143144

144145
def testBasics(self):
145146
# Basics
@@ -232,7 +233,7 @@ def _testExcel(self):
232233
# print 'Testing Excel...'
233234
xlsfile = os.path.join(os.path.dirname(__file__), 'Sample3.xls')
234235
t = DataTable(xlsfile)
235-
assert t[0][0] == 1.0, t[0]
236+
self.assertEqual(t[0][0], 1.0, t[0])
236237

237238

238239
if __name__ == '__main__':

‎MiscUtils/Tests/TestDateInterval.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@
88
class TestDateInterval(unittest.TestCase):
99

1010
def testTimeEncode(self):
11-
assert timeEncode(1) == '1s'
12-
assert timeEncode(60) == '1m'
13-
assert timeEncode(176403) == '2d1h3s'
14-
assert timeEncode(349380) == '4d1h3m'
15-
assert timeEncode(38898367) == '1y2b3w4d5h6m7s'
11+
self.assertEqual(timeEncode(1), '1s')
12+
self.assertEqual(timeEncode(60), '1m')
13+
self.assertEqual(timeEncode(176403), '2d1h3s')
14+
self.assertEqual(timeEncode(349380), '4d1h3m')
15+
self.assertEqual(timeEncode(38898367), '1y2b3w4d5h6m7s')
1616

1717
def testTimeDecode(self):
18-
assert timeDecode('1s') == 1
19-
assert timeDecode('1h2d3s') == 176403
20-
assert timeDecode('2d1h3s') == 176403
21-
assert timeDecode('1h4d3m') == 349380
22-
assert timeDecode('3m4d1h') == 349380
23-
assert timeDecode('1y2b3w4d5h6m7s') == 38898367
24-
assert timeDecode('0y1b2w3d4h5m6s') == 4075506
25-
assert timeDecode('6s5m4h3d2w1b0y') == 4075506
26-
assert timeDecode('(3s-2d-1h)') == 176403
18+
self.assertEqual(timeDecode('1s'), 1)
19+
self.assertEqual(timeDecode('1h2d3s'), 176403)
20+
self.assertEqual(timeDecode('2d1h3s'), 176403)
21+
self.assertEqual(timeDecode('1h4d3m'), 349380)
22+
self.assertEqual(timeDecode('3m4d1h'), 349380)
23+
self.assertEqual(timeDecode('1y2b3w4d5h6m7s'), 38898367)
24+
self.assertEqual(timeDecode('0y1b2w3d4h5m6s'), 4075506)
25+
self.assertEqual(timeDecode('6s5m4h3d2w1b0y'), 4075506)
26+
self.assertEqual(timeDecode('(3s-2d-1h)'), 176403)
2727
try:
2828
timeDecode('1h5n')
2929
except ValueError, e:
30-
assert str(e) == 'Invalid unit of time: n'
30+
self.assertEqual(str(e), 'Invalid unit of time: n')
3131

3232

3333
if __name__ == '__main__':

‎MiscUtils/Tests/TestDateParser.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ class TestDateTimeParser(unittest.TestCase):
1919

2020
def testReturnType(self):
2121
from datetime import datetime
22-
assert type(parseDateTime(
23-
'Mon Jul 21 02:56:20 1969')) is datetime
22+
self.assertTrue(type(parseDateTime(
23+
'Mon Jul 21 02:56:20 1969')) is datetime)
2424

2525
def assertParses(self, s):
26-
assert parseDateTime(s).isoformat() == '1969-07-21T02:56:20'
26+
self.assertEqual(parseDateTime(s).isoformat(), '1969-07-21T02:56:20')
2727

2828
def testDefaultFormat(self):
2929
self.assertParses('Mon Jul 21 02:56:20 1969')
@@ -63,11 +63,11 @@ class TestDateParser(unittest.TestCase):
6363

6464
def testReturnType(self):
6565
from datetime import date
66-
assert type(parseDate(
67-
'Mon Jul 21 02:56:20 1969')) is date
66+
self.assertTrue(type(parseDate(
67+
'Mon Jul 21 02:56:20 1969')) is date)
6868

6969
def assertParses(self, s):
70-
assert parseDate(s).isoformat() == '1969-07-21'
70+
self.assertEqual(parseDate(s).isoformat(), '1969-07-21')
7171

7272
def testDefaultFormat(self):
7373
self.assertParses('Mon Jul 21 02:56:20 1969')
@@ -94,11 +94,11 @@ class TestTimeParser(unittest.TestCase):
9494

9595
def testReturnType(self):
9696
from datetime import time
97-
assert type(parseTime(
98-
'Mon Jul 21 02:56:20 1969')) is time
97+
self.assertTrue(type(parseTime(
98+
'Mon Jul 21 02:56:20 1969')) is time)
9999

100100
def assertParses(self, s):
101-
assert parseTime(s).isoformat() == '02:56:20'
101+
self.assertEqual(parseTime(s).isoformat(), '02:56:20')
102102

103103
def testDefaultFormat(self):
104104
self.assertParses('Mon Jul 21 02:56:20 1969')

‎MiscUtils/Tests/TestDictForArgs.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,17 @@ def testPyDictForArgs(self):
9797
if case:
9898
source, answer = case.split('==', 1)
9999
answer = eval(answer)
100-
assert PyDictForArgs(source) == answer
100+
self.assertEqual(PyDictForArgs(source), answer)
101101

102102
def testExpandDictWithExtras(self):
103103
d = {'Name': 'foo', 'Extras': 'x=1 y=2'}
104104
result = ExpandDictWithExtras(d)
105-
assert result == {'Name': 'foo', 'x': '1', 'y': '2'}
105+
self.assertEqual(result, {'Name': 'foo', 'x': '1', 'y': '2'})
106106
d = {'Name': 'foo', 'bar': 'z = 3'}
107107
result = ExpandDictWithExtras(d)
108-
assert result == d
108+
self.assertEqual(result, d)
109109
result = ExpandDictWithExtras(d, key='bar', delKey=False)
110-
assert result == {'Name': 'foo', 'bar': 'z = 3', 'z': '3'}
110+
self.assertEqual(result, {'Name': 'foo', 'bar': 'z = 3', 'z': '3'})
111111

112112

113113
if __name__ == '__main__':

‎MiscUtils/Tests/TestError.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ def testValueDict(self):
5555
self.assertEqual('ERROR: ', str(err))
5656
self.assertEqual("ERROR(object=None; message=''; data={'a': 5, 'b': '.'})",
5757
repr(err).replace("{'b': '.', 'a': 5}", "{'a': 5, 'b': '.'}"))
58-
assert err.keys() in [['a', 'b'], ['b', 'a']]
59-
assert isinstance(err['a'], int)
60-
assert isinstance(err['b'], str)
58+
self.assertTrue(err.keys() in [['a', 'b'], ['b', 'a']])
59+
self.assertTrue(isinstance(err['a'], int))
60+
self.assertTrue(isinstance(err['b'], str))
6161

6262
def testVarArgs(self):
6363
err = Error(None, '', {'a': 5}, b='.')
6464
self.assertEqual('ERROR: ', str(err))
6565
self.assertEqual("ERROR(object=None; message=''; data={'a': 5, 'b': '.'})",
6666
repr(err).replace("{'b': '.', 'a': 5}", "{'a': 5, 'b': '.'}"))
67-
assert err.keys() in [['a', 'b'], ['b', 'a']]
68-
assert isinstance(err['a'], int)
69-
assert isinstance(err['b'], str)
67+
self.assertTrue(err.keys() in [['a', 'b'], ['b', 'a']])
68+
self.assertTrue(isinstance(err['a'], int))
69+
self.assertTrue(isinstance(err['b'], str))
7070

7171

7272
if __name__ == '__main__':

‎MiscUtils/Tests/TestFuncs.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ def testHostName(self):
8585

8686
def testLocalIP(self):
8787
ip = localIP()
88-
self.assertTrue(ip and not ip.startswith('127.'))
88+
self.assertTrue(ip)
89+
self.assertFalse(ip.startswith('127.'))
8990
self.assertEqual(localIP(), ip) # second invocation
9091
self.assertEqual(localIP(useCache=None), ip)
9192
self.assertEqual(localIP(remote=None, useCache=None), ip,
@@ -173,7 +174,7 @@ def checkId(i, sha, past):
173174
self.assertEqual(len(i), sha and 40 or 32)
174175
for c in i:
175176
self.assertTrue(c in '0123456789abcdef')
176-
self.assertTrue(i not in past)
177+
self.assertFalse(i in past)
177178
past[i] = i
178179

179180
for sha in (False, True):

‎MiscUtils/Tests/TestNamedValueAccess.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ def checkBasicAccess(self):
101101
for obj in self.objs:
102102

103103
value = func(obj, 'foo')
104-
assert value == 1, 'value = %r, obj = %r' % (value, obj)
104+
self.assertEqual(value, 1, 'value = %r, obj = %r' % (value, obj))
105105

106106
self.assertRaises(NamedValueAccessError, func, obj, 'bar')
107107

108108
value = func(obj, 'bar', 2)
109-
assert value == 2, 'value = %r, obj = %r' % (value, obj)
109+
self.assertEqual(value, 2, 'value = %r, obj = %r' % (value, obj))
110110

111111
def checkBasicAccessRepeated(self):
112112
"""Just repeat checkBasicAccess multiple times to check stability."""
@@ -137,22 +137,22 @@ def checkNamedValueAccess(self):
137137
# test the links
138138
for i in range(len(objs)):
139139
name = 'nextObject.' * i + 'foo'
140-
assert self.lookup(objs[0], name) == 1
140+
self.assertEqual(self.lookup(objs[0], name), 1)
141141

142142
def checkDicts(self):
143143
d = {'origin': {'x': 1, 'y': 2},
144144
'size': {'width': 3, 'height': 4}}
145145
obj = self.objs[0]
146146
obj.rect = d
147147

148-
assert self.lookup(d, 'origin.x') == 1
149-
assert self.lookup(obj, 'rect.origin.x')
148+
self.assertEqual(self.lookup(d, 'origin.x'), 1)
149+
self.assertTrue(self.lookup(obj, 'rect.origin.x'))
150150

151151
self.assertRaises(NamedValueAccessError, self.lookup, d, 'bar')
152152
self.assertRaises(NamedValueAccessError, self.lookup, obj, 'bar')
153153

154-
assert self.lookup(d, 'bar', 2) == 2
155-
assert self.lookup(obj, 'rect.bar', 2) == 2
154+
self.assertEqual(self.lookup(d, 'bar', 2), 2)
155+
self.assertEqual(self.lookup(obj, 'rect.bar', 2), 2)
156156

157157

158158
def makeTestSuite():

0 commit comments

Comments
 (0)