inline assert_in and cleanup print

Author: Stefan Sullivan

test/common.py

@@ -3,14 +3,6 @@
 import warnings
 
 
-def assert_in(result, expected_set):
-    nums = range(1, len(expected_set) + 1)
-    for i, expected in zip(nums, expected_set):
-        print("Expected %d:\n%s\n" % (i, expected))
-    print("Got:\n%s\n" % result)
-    assert result in expected_set
-
-
 def cols_to_pipe_str(cols):
     return "|".join([str(col) for col in cols])
 

test/test_api.py

@@ -14,9 +14,8 @@
 
 
 def test_tabulate_formats():
-    "API: tabulate_formats is a list of strings" ""
+    "API: tabulate_formats is a list of strings"
     supported = tabulate_formats
-    print("tabulate_formats = %r" % supported)
     assert type(supported) is list
     for fmt in supported:
         assert type(fmt) is str  # noqa
@@ -26,7 +25,6 @@ def _check_signature(function, expected_sig):
     if not signature:
         skip("")
     actual_sig = signature(function)
-    print(f"expected: {expected_sig}\nactual: {str(actual_sig)}\n")
 
     assert len(actual_sig.parameters) == len(expected_sig)
 

test/test_input.py

@@ -1,13 +1,9 @@
 """Test support of the various forms of tabular data."""
 
 from tabulate import tabulate
-from common import assert_in, raises, skip
+from common import raises, skip
 
-try:
-    from collections import UserDict
-except ImportError:
-    # Python2
-    from UserDict import UserDict
+from collections import UserDict
 
 
 def test_iterable_of_iterables():
@@ -103,8 +99,7 @@ def test_dict_like():
         ["  b    a", "---  ---", "101    0", "102    1", "103    2", "104"]
     )
     result = tabulate(dd, "keys")
-    print("Keys' order: %s" % dd.keys())
-    assert_in(result, [expected1, expected2])
+    assert result in [expected1, expected2]
 
 
 def test_numpy_2d():
@@ -377,7 +372,7 @@ def test_list_of_dicts():
     expected1 = "\n".join(["-  -", "1  2", "3  4", "-  -"])
     expected2 = "\n".join(["-  -", "2  1", "4  3", "-  -"])
     result = tabulate(lod)
-    assert_in(result, [expected1, expected2])
+    assert result in [expected1, expected2]
 
 
 def test_list_of_userdicts():
@@ -386,7 +381,7 @@ def test_list_of_userdicts():
     expected1 = "\n".join(["-  -", "1  2", "3  4", "-  -"])
     expected2 = "\n".join(["-  -", "2  1", "4  3", "-  -"])
     result = tabulate(lod)
-    assert_in(result, [expected1, expected2])
+    assert result in [expected1, expected2]
 
 
 def test_list_of_dicts_keys():
@@ -399,7 +394,7 @@ def test_list_of_dicts_keys():
         ["  bar    foo", "-----  -----", "    2      1", "    4      3"]
     )
     result = tabulate(lod, headers="keys")
-    assert_in(result, [expected1, expected2])
+    assert result in [expected1, expected2]
 
 
 def test_list_of_userdicts_keys():
@@ -412,7 +407,7 @@ def test_list_of_userdicts_keys():
         ["  bar    foo", "-----  -----", "    2      1", "    4      3"]
     )
     result = tabulate(lod, headers="keys")
-    assert_in(result, [expected1, expected2])
+    assert result in [expected1, expected2]
 
 
 def test_list_of_dicts_with_missing_keys():
@@ -442,7 +437,7 @@ def test_list_of_dicts_firstrow():
         ["  BAR    FOO    baz", "-----  -----  -----", "    4      3      5"]
     )
     result = tabulate(lod, headers="firstrow")
-    assert_in(result, [expected1, expected2])
+    assert result in [expected1, expected2]
 
 
 def test_list_of_dicts_with_dict_of_headers():
@@ -456,7 +451,7 @@ def test_list_of_dicts_with_dict_of_headers():
         ["LETTERS      DIGITS", "---------  --------", "ABCDE         12345"]
     )
     result = tabulate(table, headers=headers)
-    assert_in(result, [expected1, expected2])
+    assert result in [expected1, expected2]
 
 
 def test_list_of_dicts_with_list_of_headers():

test/test_regression.py

@@ -16,7 +16,6 @@ def test_ansi_color_in_table_cells():
             "| test   | \x1b[31mtest\x1b[0m   | \x1b[32mtest\x1b[0m   |",
         ]
     )
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted
 
 
@@ -39,7 +38,6 @@ def test_alignment_of_colored_cells():
             "+--------+--------+--------+",
         ]
     )
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted
 
 
@@ -62,7 +60,6 @@ def test_alignment_of_link_cells():
             "+--------+--------+--------+",
         ]
     )
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted
 
 
@@ -85,7 +82,6 @@ def test_alignment_of_link_text_cells():
             "+--------+----------+--------+",
         ]
     )
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted
 
 
@@ -112,7 +108,6 @@ def mk_headers():
             "  0    1    2",
         ]
     )
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted
 
 
@@ -131,7 +126,6 @@ def test_datetime_values():
             "-------------------  ----------  --------",
         ]
     )
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted
 
 
@@ -142,7 +136,6 @@ def test_simple_separated_format():
     fmt = simple_separated_format("!")
     expected = "spam!eggs"
     formatted = tabulate([["spam", "eggs"]], tablefmt=fmt)
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted
 
 
@@ -200,7 +193,6 @@ def test_88_256_ANSI_color_codes():
             "| \x1b[48;5;196mred\x1b[49m          | \x1b[38;5;196mred\x1b[39m          |",
         ]
     )
-    print(f"expected: {expected!r}\n\ngot:      {formatted!r}\n")
     assert expected == formatted