full tests for pretty

Author: samuelcolvin

devtools/prettier.py

@@ -24,16 +24,15 @@ def __init__(self,
                  indent_step=4,
                  indent_char=' ',
                  repr_strings=False,
-                 simple_cuttoff=10,
+                 simple_cutoff=10,
                  max_width=120,
                  yield_from_generators=True):
-        # TODO colours
         self._colorize = colorize
         self._indent_step = indent_step
         self._c = indent_char
         self._repr_strings = repr_strings
         self._repr_generators = not yield_from_generators
-        self._simple_cuttoff = simple_cuttoff
+        self._simple_cutoff = simple_cutoff
         self._max_width = max_width
         self._type_lookup = [
             (dict, self._format_dict),
@@ -56,7 +55,7 @@ def _format(self, value: Any, indent_current: int, indent_first: bool):
             self._stream.write(indent_current * self._c)
 
         value_repr = repr(value)
-        if len(value_repr) <= self._simple_cuttoff and not isinstance(value, collections.Generator):
+        if len(value_repr) <= self._simple_cutoff and not isinstance(value, collections.Generator):
             self._stream.write(value_repr)
         else:
             indent_new = indent_current + self._indent_step

tests/test_prettier.py

@@ -2,7 +2,7 @@
 
 import numpy
 
-from devtools.prettier import PrettyFormat, pformat
+from devtools.prettier import PrettyFormat, pformat, pprint
 
 
 def test_dict():
@@ -15,6 +15,13 @@ def test_dict():
         '}')
 
 
+def test_print(capsys):
+    pprint({1: 2, 3: 4})
+    stdout, stderr = capsys.readouterr()
+    assert stdout.startswith('\x1b')
+    assert stderr == ''
+
+
 def test_list():
     v = pformat(list(range(6)))
     assert v == (
@@ -29,18 +36,29 @@ def test_list():
 
 
 def test_set():
-    v = pformat(set(range(6)))
+    v = pformat(set(range(5)))
     assert v == (
         '{\n'
         '    0,\n'
         '    1,\n'
         '    2,\n'
         '    3,\n'
         '    4,\n'
-        '    5,\n'
         '}')
 
 
+def test_tuple():
+    v = pformat(tuple(range(5)))
+    assert v == (
+        '(\n'
+        '    0,\n'
+        '    1,\n'
+        '    2,\n'
+        '    3,\n'
+        '    4,\n'
+        ')')
+
+
 def test_generator():
     v = pformat((i for i in range(3)))
     assert v == (
@@ -51,6 +69,12 @@ def test_generator():
         ')')
 
 
+def test_generator_no_yield():
+    pformat_ = PrettyFormat(yield_from_generators=False)
+    v = pformat_((i for i in range(3)))
+    assert v.startswith('<generator object test_generator_no_yield.<locals>.<genexpr> at ')
+
+
 def test_str():
     pformat_ = PrettyFormat(max_width=12)
     v = pformat_(string.ascii_lowercase + '\n' + string.digits)
@@ -61,25 +85,41 @@ def test_str():
         ")")
 
 
+def test_str_repr():
+    pformat_ = PrettyFormat(repr_strings=True)
+    v = pformat_(string.ascii_lowercase + '\n' + string.digits)
+    assert v == "'abcdefghijklmnopqrstuvwxyz\\n0123456789'"
+
+
 def test_bytes():
     pformat_ = PrettyFormat(max_width=12)
     v = pformat_(string.ascii_lowercase.encode())
-    assert v == (
-        "(\n"
-        "    b'abcde'\n"
-        "    b'fghij'\n"
-        "    b'klmno'\n"
-        "    b'pqrst'\n"
-        "    b'uvwxy'\n"
-        "    b'z'\n"
-        ")")
+    assert v == """(
+    b'abcde'
+    b'fghij'
+    b'klmno'
+    b'pqrst'
+    b'uvwxy'
+    b'z'
+)"""
+
+
+def test_short_bytes():
+    assert "b'abcdefghijklmnopqrstuvwxyz'" == pformat(string.ascii_lowercase.encode())
 
 
 def test_indent_numpy():
     v = pformat({'numpy test': numpy.array(range(20))})
-    assert v == ("{\n"
-                 "    'numpy test': (\n"
-                 "        array([ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,\n"
-                 "               17, 18, 19])\n"
-                 "    ),\n"
-                 "}")
+    assert v == """{
+    'numpy test': (
+        array([ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+               17, 18, 19])
+    ),
+}"""
+
+
+def test_indent_numpy_short():
+    v = pformat({'numpy test': numpy.array(range(10))})
+    assert v == """{
+    'numpy test': array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]),
+}"""