Added unit tests.

Author: kmvanbrunt

cmd2/cmd2.py

@@ -4133,15 +4133,18 @@ def print_topics(self, header: str, cmds: list[str] | None, cmdlen: int, maxcol:
         if not cmds:
             return
 
-        # Add a row that looks like a table header.
-        header_grid = Table.grid()
-        header_grid.add_row(header, style=Cmd2Style.HELP_HEADER)
-        header_grid.add_row(Rule(characters=self.ruler, style=Cmd2Style.TABLE_BORDER))
-        self.poutput(ru.indent(header_grid, 1))
+        # Print a row that looks like a table header.
+        if header:
+            header_grid = Table.grid()
+            header_grid.add_row(header, style=Cmd2Style.HELP_HEADER)
+            header_grid.add_row(Rule(characters=self.ruler, style=Cmd2Style.TABLE_BORDER))
+            self.poutput(ru.indent(header_grid, 1))
+
+        # Subtract 2 from the max column width to account for the
+        # one-space indentation and a one-space right margin.
+        maxcol = min(maxcol, ru.console_width()) - 2
 
         # Print the topics in columns.
-        # Subtract 1 from maxcol to account for indentation.
-        maxcol = min(maxcol, ru.console_width()) - 1
         columnized_cmds = self.render_columns(cmds, maxcol)
         self.poutput(ru.indent(columnized_cmds, 1))
         self.poutput()
@@ -5523,7 +5526,7 @@ class TestMyAppCase(Cmd2TestCase):
         num_transcripts = len(transcripts_expanded)
         plural = '' if len(transcripts_expanded) == 1 else 's'
         self.poutput(
-            Rule("cmd2 transcript test", style=Style.null()),
+            Rule("cmd2 transcript test", characters=self.ruler, style=Style.null()),
             style=Style(bold=True),
         )
         self.poutput(f'platform {sys.platform} -- Python {verinfo}, cmd2-{cmd2.__version__}, readline-{rl_type}')
@@ -5542,7 +5545,7 @@ class TestMyAppCase(Cmd2TestCase):
         if test_results.wasSuccessful():
             self.perror(stream.read(), end="", style=None)
             finish_msg = f'{num_transcripts} transcript{plural} passed in {execution_time:.3f} seconds'
-            self.psuccess(Rule(finish_msg, style=Style.null()))
+            self.psuccess(Rule(finish_msg, characters=self.ruler, style=Style.null()))
         else:
             # Strip off the initial traceback which isn't particularly useful for end users
             error_str = stream.read()

tests/test_rich_utils.py

@@ -1,7 +1,9 @@
 """Unit testing for cmd2/rich_utils.py module"""
 
 import pytest
+import rich.box
 from rich.style import Style
+from rich.table import Table
 from rich.text import Text
 
 from cmd2 import (
@@ -59,6 +61,45 @@ def test_string_to_rich_text() -> None:
     assert ru.string_to_rich_text(input_string).plain == input_string
 
 
+def test_indented_text() -> None:
+    console = ru.Cmd2GeneralConsole()
+
+    # With an indention of 10, text will be evenly split across two lines.
+    console.width = 20
+    text = "A" * 20
+    level = 10
+    indented_text = ru.indent(text, level)
+
+    with console.capture() as capture:
+        console.print(indented_text)
+    result = capture.get().splitlines()
+
+    padding = " " * level
+    expected_line = padding + ("A" * 10)
+    assert result[0] == expected_line
+    assert result[1] == expected_line
+
+
+def test_indented_table() -> None:
+    console = ru.Cmd2GeneralConsole()
+
+    level = 2
+    table = Table("Column", box=rich.box.ASCII)
+    table.add_row("Some Data")
+    indented_table = ru.indent(table, level)
+
+    with console.capture() as capture:
+        console.print(indented_table)
+    result = capture.get().splitlines()
+
+    padding = " " * level
+    assert result[0].startswith(padding + "+-----------+")
+    assert result[1].startswith(padding + "| Column    |")
+    assert result[2].startswith(padding + "|-----------|")
+    assert result[3].startswith(padding + "| Some Data |")
+    assert result[4].startswith(padding + "+-----------+")
+
+
 @pytest.mark.parametrize(
     ('rich_text', 'string'),
     [