Merge commit '60361edf68cf5822d96e215d71fe14260df01ec4' into completion

# By Terry Howe
# Via Doug Hellmann (1) and Terry Howe (1)
* commit '60361edf68cf5822d96e215d71fe14260df01ec4':
  code style fixes
  code style fixes
  various python code optimizations; shuffle I/O to shell classes
  add bash complete

1 files changed, 129 insertions, 0 deletions

diff --git a/cliff/tests/test_complete.py b/cliff/tests/test_complete.py
new file mode 100644
index 0000000..7a650d6
--- /dev/null
+++ b/cliff/tests/test_complete.py
@@ -0,0 +1,129 @@
+"""Bash completion tests
+"""
+
+import mock
+
+from cliff.app import App
+from cliff.commandmanager import CommandManager
+from cliff import complete
+
+
+def test_complete_dictionary():
+    sot = complete.CompleteDictionary()
+    sot.add_command("image delete".split(),
+                    [mock.Mock(option_strings=["1"])])
+    sot.add_command("image list".split(),
+                    [mock.Mock(option_strings=["2"])])
+    sot.add_command("image create".split(),
+                    [mock.Mock(option_strings=["3"])])
+    sot.add_command("volume type create".split(),
+                    [mock.Mock(option_strings=["4"])])
+    sot.add_command("volume type delete".split(),
+                    [mock.Mock(option_strings=["5"])])
+    assert "image volume" == sot.get_commands()
+    result = sot.get_data()
+    assert "image" == result[0][0]
+    assert "create delete list" == result[0][1]
+    assert "image_create" == result[1][0]
+    assert "3" == result[1][1]
+    assert "image_delete" == result[2][0]
+    assert "1" == result[2][1]
+    assert "image_list" == result[3][0]
+    assert "2" == result[3][1]
+
+
+class FakeStdout:
+    def __init__(self):
+        self.content = []
+
+    def write(self, text):
+        self.content.append(text)
+
+    def make_string(self):
+        result = ''
+        for line in self.content:
+            result = result + line
+        return result
+
+
+def given_cmdo_data():
+    cmdo = "image server"
+    data = [("image", "create"),
+            ("image_create", "--eolus"),
+            ("server", "meta ssh"),
+            ("server_meta_delete", "--wilson"),
+            ("server_ssh", "--sunlight")]
+    return cmdo, data
+
+
+def then_data(content):
+    assert "  cmds='image server'\n" in content
+    assert "  cmds_image='create'\n" in content
+    assert "  cmds_image_create='--eolus'\n" in content
+    assert "  cmds_server='meta ssh'\n" in content
+    assert "  cmds_server_meta_delete='--wilson'\n" in content
+    assert "  cmds_server_ssh='--sunlight'\n" in content
+
+
+def test_complete_no_code():
+    output = FakeStdout()
+    sot = complete.CompleteNoCode("doesNotMatter", output)
+    sot.write(*given_cmdo_data())
+    then_data(output.content)
+
+
+def test_complete_bash():
+    output = FakeStdout()
+    sot = complete.CompleteBash("openstack", output)
+    sot.write(*given_cmdo_data())
+    then_data(output.content)
+    assert "_openstack()\n" in output.content[0]
+    assert "complete -F _openstack openstack\n" in output.content[-1]
+
+
+def test_complete_command_parser():
+    sot = complete.CompleteCommand(mock.Mock(), mock.Mock())
+    parser = sot.get_parser('nothing')
+    assert "nothing" == parser.prog
+    assert "print bash completion command\n    " == parser.description
+
+
+def given_complete_command():
+    cmd_mgr = CommandManager('cliff.tests')
+    app = App('testing', '1', cmd_mgr, stdout=FakeStdout())
+    sot = complete.CompleteCommand(app, mock.Mock())
+    cmd_mgr.add_command('complete', complete.CompleteCommand)
+    return sot, app, cmd_mgr
+
+
+def then_actions_equal(actions):
+    optstr = ' '.join(opt for action in actions
+                      for opt in action.option_strings)
+    assert '-h --help --name --shell' == optstr
+
+
+def test_complete_command_get_actions():
+    sot, app, cmd_mgr = given_complete_command()
+    app.interactive_mode = False
+    actions = sot.get_actions(["complete"])
+    then_actions_equal(actions)
+
+
+def test_complete_command_get_actions_interactive():
+    sot, app, cmd_mgr = given_complete_command()
+    app.interactive_mode = True
+    actions = sot.get_actions(["complete"])
+    then_actions_equal(actions)
+
+
+def test_complete_command_take_action():
+    sot, app, cmd_mgr = given_complete_command()
+    parsed_args = mock.Mock()
+    parsed_args.name = "test_take"
+    content = app.stdout.content
+    assert 0 == sot.take_action(parsed_args)
+    assert "_test_take()\n" in content[0]
+    assert "complete -F _test_take test_take\n" in content[-1]
+    assert "  cmds='complete help'\n" in content
+    assert "  cmds_complete='-h --help --name --shell'\n" in content
+    assert "  cmds_help='-h --help'\n" in content