Skip to content

Commit 0b7247e

Browse files
astaninastanin
committed
refactor input tests: use assert_equal()
1 parent 8422822 commit 0b7247e

File tree

1 file changed

+18
-51
lines changed

1 file changed

+18
-51
lines changed

‎test/test_input.py

Lines changed: 18 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ def test_iterable_of_iterables():
1717
'5 4 3 2 1',
1818
'- - - - -'])
1919
result = tabulate(ii)
20-
print("Expected:\n%s\n" % expected)
21-
print("Got:\n%s\n" % result)
22-
assert expected == result
20+
assert_equal(expected, result)
2321

2422

2523
def test_iterable_of_iterables_headers():
@@ -31,9 +29,7 @@ def test_iterable_of_iterables_headers():
3129
' 0 1 2 3 4',
3230
' 5 4 3 2 1'])
3331
result = tabulate(ii, "abcde")
34-
print("Expected:\n%s\n" % expected)
35-
print("Got:\n%s\n" % result)
36-
assert expected == result
32+
assert_equal(expected, result)
3733

3834

3935
def test_iterable_of_iterables_firstrow():
@@ -45,9 +41,7 @@ def test_iterable_of_iterables_firstrow():
4541
' 0 1 2 3 4',
4642
' 5 4 3 2 1'])
4743
result = tabulate(ii, "firstrow")
48-
print("Expected:\n%s\n" % expected)
49-
print("Got:\n%s\n" % result)
50-
assert expected == result
44+
assert_equal(expected, result)
5145

5246

5347
def test_list_of_lists():
@@ -59,9 +53,7 @@ def test_list_of_lists():
5953
'a one 1',
6054
'b two'])
6155
result = tabulate(ll, headers=["string","number"])
62-
print("Expected:\n%s\n" % expected)
63-
print("Got:\n%s\n" % result)
64-
assert expected == result
56+
assert_equal(expected, result)
6557

6658

6759
def test_list_of_lists_firstrow():
@@ -73,9 +65,7 @@ def test_list_of_lists_firstrow():
7365
'a one 1',
7466
'b two'])
7567
result = tabulate(ll, headers="firstrow")
76-
print("Expected:\n%s\n" % expected)
77-
print("Got:\n%s\n" % result)
78-
assert expected == result
68+
assert_equal(expected, result)
7969

8070

8171
def test_list_of_lists_keys():
@@ -87,9 +77,7 @@ def test_list_of_lists_keys():
8777
'a one 1',
8878
'b two'])
8979
result = tabulate(ll, headers="keys")
90-
print("Expected:\n%s\n" % expected)
91-
print("Got:\n%s\n" % result)
92-
assert expected == result
80+
assert_equal(expected, result)
9381

9482

9583
def test_dict_like():
@@ -129,9 +117,7 @@ def test_numpy_2d():
129117
' 32 62.5 108',
130118
'171.5 256 364.5'])
131119
result = tabulate(na, ["a", "b", "c"])
132-
print("Expected:\n%s\n" % expected)
133-
print("Got:\n%s\n" % result)
134-
assert expected == result
120+
assert_equal(expected, result)
135121
except ImportError:
136122
print("test_numpy_2d is skipped")
137123
pass # this test is optional
@@ -148,9 +134,7 @@ def test_numpy_2d_firstrow():
148134
' 64 125 216',
149135
'343 512 729'])
150136
result = tabulate(na, headers="firstrow")
151-
print("Expected:\n%s\n" % expected)
152-
print("Got:\n%r\n" % result)
153-
assert expected == result
137+
assert_equal(expected, result)
154138
except ImportError:
155139
print("test_numpy_2d_firstrow is skipped")
156140
pass # this test is optional
@@ -168,9 +152,7 @@ def test_numpy_2d_keys():
168152
' 32 62.5 108',
169153
'171.5 256 364.5'])
170154
result = tabulate(na, headers="keys")
171-
print("Expected:\n%s\n" % expected)
172-
print("Got:\n%s\n" % result)
173-
assert expected == result
155+
assert_equal(expected, result)
174156
except ImportError:
175157
print("test_numpy_2d_keys is skipped")
176158
pass # this test is optional
@@ -190,9 +172,7 @@ def test_numpy_record_array():
190172
"Bob 27 175",
191173
"----- -- -----" ])
192174
result = tabulate(na)
193-
print("Expected:\n%s\n" % expected)
194-
print("Got:\n%s\n" % result)
195-
assert expected == result
175+
assert_equal(expected, result)
196176
except ImportError:
197177
print("test_numpy_2d_keys is skipped")
198178
pass # this test is optional
@@ -212,9 +192,7 @@ def test_numpy_record_array_keys():
212192
"Alice 23 169.5",
213193
"Bob 27 175" ])
214194
result = tabulate(na, headers="keys")
215-
print("Expected:\n%s\n" % expected)
216-
print("Got:\n%s\n" % result)
217-
assert expected == result
195+
assert_equal(expected, result)
218196
except ImportError:
219197
print("test_numpy_2d_keys is skipped")
220198
pass # this test is optional
@@ -234,9 +212,7 @@ def test_numpy_record_array_headers():
234212
"Alice 23 169.5",
235213
"Bob 27 175" ])
236214
result = tabulate(na, headers=["person", "years", "cm"])
237-
print("Expected:\n%s\n" % expected)
238-
print("Got:\n%s\n" % result)
239-
assert expected == result
215+
assert_equal(expected, result)
240216
except ImportError:
241217
print("test_numpy_2d_keys is skipped")
242218
pass # this test is optional
@@ -253,9 +229,7 @@ def test_pandas():
253229
'a one 1',
254230
'b two nan'])
255231
result = tabulate(df, headers=["string", "number"])
256-
print("Expected:\n%s\n" % expected)
257-
print("Got:\n%s\n" % result)
258-
assert expected == result
232+
assert_equal(expected, result)
259233
except ImportError:
260234
print("test_pandas is skipped")
261235
pass # this test is optional
@@ -273,9 +247,7 @@ def test_pandas_firstrow():
273247
'--- ----- -----',
274248
'b two nan'])
275249
result = tabulate(df, headers="firstrow")
276-
print("Expected:\n%s\n" % expected)
277-
print("Got:\n%s\n" % result)
278-
assert expected == result
250+
assert_equal(expected, result)
279251
except ImportError:
280252
print("test_pandas_firstrow is skipped")
281253
pass # this test is optional
@@ -294,9 +266,7 @@ def test_pandas_keys():
294266
'a one 1',
295267
'b two nan'])
296268
result = tabulate(df, headers="keys")
297-
print("Expected:\n%s\n" % expected)
298-
print("Got:\n%s\n" % result)
299-
assert expected == result
269+
assert_equal(expected, result)
300270
except ImportError:
301271
print("test_pandas_keys is skipped")
302272
pass # this test is optional
@@ -313,9 +283,7 @@ def test_list_of_namedtuples():
313283
'3 4',
314284
'- -'])
315285
result = tabulate(lt)
316-
print("Expected:\n%s\n" % expected)
317-
print("Got:\n%s\n" % result)
318-
assert expected == result
286+
assert_equal(expected, result)
319287

320288

321289
def test_list_of_namedtuples_keys():
@@ -329,9 +297,8 @@ def test_list_of_namedtuples_keys():
329297
' 1 2',
330298
' 3 4'])
331299
result = tabulate(lt, headers="keys")
332-
print("Expected:\n%s\n" % expected)
333-
print("Got:\n%s\n" % result)
334-
assert expected == result
300+
assert_equal(expected, result)
301+
335302

336303
def test_list_of_dicts():
337304
"Input: a list of dictionaries."

0 commit comments

Comments
 (0)