Reorganized some unit tests

Author: kmvanbrunt

tests/test_argparse.py

@@ -194,17 +194,6 @@ def base_bar(self, args):
         """bar subcommand of base command"""
         self.poutput('((%s))' % args.z)
 
-    def base_sport(self, args):
-        """sport subcommand of base command"""
-        self.poutput('Sport is {}'.format(args.sport))
-
-    # noinspection PyUnusedLocal
-    def complete_base_sport(self, text, line, begidx, endidx):
-        """ Adds tab completion to base sport subcommand """
-        sports = ['Football', 'Hockey', 'Soccer', 'Baseball']
-        index_dict = {1: sports}
-        return self.index_based_complete(text, line, begidx, endidx, index_dict)
-
     # create the top-level parser for the base command
     base_parser = argparse.ArgumentParser(prog='base')
     base_subparsers = base_parser.add_subparsers(title='subcommands', help='subcommand help')
@@ -220,11 +209,6 @@ def complete_base_sport(self, text, line, begidx, endidx):
     parser_bar.add_argument('z', help='string')
     parser_bar.set_defaults(func=base_bar)
 
-    # create the parser for the "sport" subcommand
-    parser_sport = base_subparsers.add_parser('sport', help='sport help')
-    parser_sport.add_argument('sport', help='Enter name of a sport')
-    parser_sport.set_defaults(func=base_sport)
-
     @cmd2.with_argparser(base_parser)
     def do_base(self, args):
         """Base command help"""
@@ -236,9 +220,6 @@ def do_base(self, args):
             # No subcommand was provided, so call help
             self.do_help('base')
 
-    def complete_base(self, text, line, begidx, endidx):
-        return self.cmd_with_subs_completer(text, line, begidx, endidx, base='base')
-
 @pytest.fixture
 def subcommand_app():
     app = SubcommandApp()
@@ -279,55 +260,3 @@ def test_subcommand_invalid_help(subcommand_app):
     out = run_cmd(subcommand_app, 'help base baz')
     assert out[0].startswith('usage: base')
     assert out[1].startswith("base: error: invalid choice: 'baz'")
-
-def test_subcommand_tab_completion(subcommand_app):
-    # This makes sure the correct completer for the sport subcommand is called
-    text = 'Foot'
-    line = 'base sport Foot'
-    endidx = len(line)
-    begidx = endidx - len(text)
-    state = 0
-
-    def get_line():
-        return line
-
-    def get_begidx():
-        return begidx
-
-    def get_endidx():
-        return endidx
-
-    with mock.patch.object(readline, 'get_line_buffer', get_line):
-        with mock.patch.object(readline, 'get_begidx', get_begidx):
-            with mock.patch.object(readline, 'get_endidx', get_endidx):
-                # Run the readline tab-completion function with readline mocks in place
-                first_match = subcommand_app.complete(text, state)
-
-    # It is at end of line, so extra space is present
-    assert first_match is not None and subcommand_app.completion_matches == ['Football ']
-
-def test_subcommand_tab_completion_with_no_completer(subcommand_app):
-    # This tests what happens when a subcommand has no completer
-    # In this case, the foo subcommand has no completer defined
-    text = 'Foot'
-    line = 'base foo Foot'
-    endidx = len(line)
-    begidx = endidx - len(text)
-    state = 0
-
-    def get_line():
-        return line
-
-    def get_begidx():
-        return begidx
-
-    def get_endidx():
-        return endidx
-
-    with mock.patch.object(readline, 'get_line_buffer', get_line):
-        with mock.patch.object(readline, 'get_begidx', get_begidx):
-            with mock.patch.object(readline, 'get_endidx', get_endidx):
-                # Run the readline tab-completion function with readline mocks in place
-                first_match = subcommand_app.complete(text, state)
-
-    assert first_match is None

tests/test_completion.py

@@ -36,8 +36,8 @@ def cmd2_app():
 
 
 # List of strings used with completion functions
-food_item_strs = ['Pizza', 'Hamburger', 'Ham', 'Potato', 'Space Food']
-sport_item_strs = ['Bat', 'Basket', 'Basketball', 'Football']
+food_item_strs = ['Pizza', 'Hamburger', 'Ham', 'Potato']
+sport_item_strs = ['Bat', 'Basket', 'Basketball', 'Football', 'Space Ball']
 delimited_strs = ['/home/user/file.txt', '/home/user/prog.c', '/home/otheruser/maps']
 
 # Dictionary used with flag based completion functions
@@ -636,6 +636,15 @@ def base_bar(self, args):
         """bar subcommand of base command"""
         self.poutput('((%s))' % args.z)
 
+    def base_sport(self, args):
+        """sport subcommand of base command"""
+        self.poutput('Sport is {}'.format(args.sport))
+
+    def complete_base_sport(self, text, line, begidx, endidx):
+        """ Adds tab completion to base sport subcommand """
+        index_dict = {1: sport_item_strs}
+        return self.index_based_complete(text, line, begidx, endidx, index_dict)
+
     # create the top-level parser for the base command
     base_parser = argparse.ArgumentParser(prog='base')
     base_subparsers = base_parser.add_subparsers(title='subcommands', help='subcommand help')
@@ -651,6 +660,11 @@ def base_bar(self, args):
     parser_bar.add_argument('z', help='string')
     parser_bar.set_defaults(func=base_bar)
 
+    # create the parser for the "sport" subcommand
+    parser_sport = base_subparsers.add_parser('sport', help='sport help')
+    parser_sport.add_argument('sport', help='Enter name of a sport')
+    parser_sport.set_defaults(func=base_sport)
+
     @cmd2.with_argparser(base_parser)
     def do_base(self, args):
         """Base command help"""
@@ -662,6 +676,9 @@ def do_base(self, args):
             # No sub-command was provided, so as called
             self.do_help('base')
 
+    def complete_base(self, text, line, begidx, endidx):
+        return self.cmd_with_subs_completer(text, line, begidx, endidx, base='base')
+
 
 @pytest.fixture
 def sc_app():
@@ -687,7 +704,7 @@ def test_cmd2_subcommand_completion_multiple(sc_app):
     begidx = endidx - len(text)
 
     first_match = complete_tester(text, line, begidx, endidx, sc_app)
-    assert first_match is not None and sc_app.completion_matches == ['bar', 'foo']
+    assert first_match is not None and sc_app.completion_matches == ['bar', 'foo', 'sport']
 
 def test_cmd2_subcommand_completion_nomatch(sc_app):
     text = 'z'
@@ -712,7 +729,7 @@ def test_cmd2_help_subcommand_completion_multiple(sc_app):
     endidx = len(line)
     begidx = endidx - len(text)
 
-    assert sc_app.complete_help(text, line, begidx, endidx) == ['bar', 'foo']
+    assert sc_app.complete_help(text, line, begidx, endidx) == ['bar', 'foo', 'sport']
 
 
 def test_cmd2_help_subcommand_completion_nomatch(sc_app):
@@ -722,6 +739,28 @@ def test_cmd2_help_subcommand_completion_nomatch(sc_app):
     begidx = endidx - len(text)
     assert sc_app.complete_help(text, line, begidx, endidx) == []
 
+def test_subcommand_tab_completion(sc_app):
+    # This makes sure the correct completer for the sport subcommand is called
+    text = 'Foot'
+    line = 'base sport Foot'
+    endidx = len(line)
+    begidx = endidx - len(text)
+
+    first_match = complete_tester(text, line, begidx, endidx, sc_app)
+
+    # It is at end of line, so extra space is present
+    assert first_match is not None and sc_app.completion_matches == ['Football ']
+
+def test_subcommand_tab_completion_with_no_completer(sc_app):
+    # This tests what happens when a subcommand has no completer
+    # In this case, the foo subcommand has no completer defined
+    text = 'Foot'
+    line = 'base foo Foot'
+    endidx = len(line)
+    begidx = endidx - len(text)
+
+    first_match = complete_tester(text, line, begidx, endidx, sc_app)
+    assert first_match is None
 
 class SecondLevel(cmd2.Cmd):
     """To be used as a second level command class. """