Converting doctests to pytest

Done with first stage.  Still a lot more parsing tests to convert.

It turns out the original problem wasn't a Python 2 vs Python 3 problem, but the fact that pyparsing changed the way the ParseResults.dump() command outputs strings - in version 2.1.10 it switched to putting strings in quotes.

1 files changed, 281 insertions, 0 deletions

diff --git a/tests/test_parsing.py b/tests/test_parsing.py
new file mode 100644
index 00000000..d428fb69
--- /dev/null
+++ b/tests/test_parsing.py
@@ -0,0 +1,281 @@
+# coding=utf-8
+"""
+Unit/functional testing for helper functions/classes in the cmd2.py module.
+
+These are primarily tests related to parsing.  Moreover, they are mostly a port of the old doctest tests which were 
+problematic because they worked properly in Python 2, but not in Python 3.
+
+Copyright 2017 Todd Leonhardt <todd.leonhardt@gmail.com>
+Released under MIT license, see LICENSE file
+"""
+import cmd2
+import pyparsing
+from pytest import fixture
+
+# NOTE: pyparsing's ParseResults.dump() function behaves differently in versions >= 2.1.10
+# In version 2.1.10, changed display of string values to show them in quotes
+
+# Extract pyparsing version and figure out if it has a new or old version of ParseResults.dump() behavior
+(major, minor, release) = (int(v) for v in pyparsing.__version__.split('.'))
+new_pyparsing = True
+if major < 2:
+    new_pyparsing = False
+elif major == 2:
+    if minor < 1:
+        new_pyparsing = False
+    elif minor == 1:
+        if release < 10:
+            new_pyparsing = False
+
+
+@fixture
+def hist():
+    from cmd2 import HistoryItem
+    h = cmd2.History([HistoryItem('first'), HistoryItem('second'), HistoryItem('third'), HistoryItem('fourth')])
+    return h
+
+
+@fixture
+def parser():
+    c = cmd2.Cmd()
+    c.multilineCommands = ['multiline']
+    c.case_insensitive = True
+    c._init_parser()
+    return c.parser
+
+
+def test_remaining_args():
+    assert cmd2.remaining_args('-f bar   bar   cow', ['bar', 'cow']) == 'bar   cow'
+
+
+def test_stubborn_dict_class():
+    d = cmd2.StubbornDict(large='gross', small='klein')
+    assert sorted(d.items()) == [('large', 'gross'), ('small', 'klein')]
+
+    d.append(['plain', '  plaid'])
+    assert sorted(d.items()) == [('large', 'gross'), ('plaid', ''), ('plain', ''), ('small', 'klein')]
+
+    d += '   girl Frauelein, Maedchen\n\n shoe schuh'
+    assert sorted(d.items()) == [('girl', 'Frauelein, Maedchen'), ('large', 'gross'), ('plaid', ''), ('plain', ''),
+                                 ('shoe', 'schuh'), ('small', 'klein')]
+
+def test_stubborn_dict_factory():
+    assert sorted(cmd2.stubbornDict('cow a bovine\nhorse an equine').items()) == [('cow', 'a bovine'),
+                                                                                   ('horse', 'an equine')]
+    assert sorted(cmd2.stubbornDict(['badger', 'porcupine a poky creature']).items()) == [('badger', ''),
+                                                                                          ('porcupine',
+                                                                                           'a poky creature')]
+    assert sorted(cmd2.stubbornDict(turtle='has shell', frog='jumpy').items()) == [('frog', 'jumpy'),
+                                                                                   ('turtle', 'has shell')]
+
+
+def test_history_span(hist):
+    h = hist
+    assert h.span('-2..') == ['third', 'fourth']
+    assert h.span('2..3') == ['second', 'third']
+    assert h.span('3') == ['third']
+    assert h.span(':') == ['first', 'second', 'third', 'fourth']
+    assert h.span('2..') == ['second', 'third', 'fourth']
+    assert h.span('-1') == ['fourth']
+    assert h.span('-2..-3') == ['third', 'second']
+
+def test_history_search(hist):
+    assert hist.search('o') == ['second', 'fourth']
+    assert hist.search('/IR/') == ['first', 'third']
+
+
+def test_parse_empty_string(parser):
+    assert parser.parseString('').dump() == '[]'
+
+def test_parse_comment(parser):
+    assert parser.parseString('/* empty command */').dump() == '[]'
+
+def test_parse_single_word(parser):
+    command = "plainword"
+    if new_pyparsing:
+        command = repr(command)
+    expected = """['plainword', '']
+- command: {0}
+- statement: ['plainword', '']
+  - command: {0}""".format(command)
+    assert parser.parseString('plainword').dump() == expected
+
+def test_parse_word_plus_terminator(parser):
+    command = "termbare"
+    terminator = ";"
+    if new_pyparsing:
+        command = repr(command)
+        terminator = repr(terminator)
+    expected = """['termbare', '', ';', '']
+- command: {0}
+- statement: ['termbare', '', ';']
+  - command: {0}
+  - terminator: {1}
+- terminator: {1}""".format(command, terminator)
+    assert parser.parseString('termbare;').dump() == expected
+
+def test_parse_suffix_after_terminator(parser):
+    command = "termbare"
+    terminator = ";"
+    suffix = "suffx"
+    if new_pyparsing:
+        command = repr(command)
+        terminator = repr(terminator)
+        suffix = repr(suffix)
+    expected = """['termbare', '', ';', 'suffx']
+- command: {0}
+- statement: ['termbare', '', ';']
+  - command: {0}
+  - terminator: {1}
+- suffix: {2}
+- terminator: {1}""".format(command, terminator, suffix)
+    assert parser.parseString('termbare; suffx').dump() == expected
+
+def test_parse_command_with_args(parser):
+    command = "command"
+    args = "with args"
+    if new_pyparsing:
+        command = repr(command)
+        args = repr(args)
+    expected = """['command', 'with args']
+- args: {1}
+- command: {0}
+- statement: ['command', 'with args']
+  - args: {1}
+  - command: {0}""".format(command, args)
+    assert parser.parseString('COMmand with args').dump() == expected
+
+# TODO: Finsih converting all of the old doctest tests below to pytest unit tests
+    '''
+    >>> print(c.parser.parseString('command with args and terminator; and suffix').dump())
+    ['command', 'with args and terminator', ';', 'and suffix']
+    - args: with args and terminator
+    - command: command
+    - statement: ['command', 'with args and terminator', ';']
+      - args: with args and terminator
+      - command: command
+      - terminator: ;
+    - suffix: and suffix
+    - terminator: ;
+    >>> print(c.parser.parseString('simple | piped').dump())
+    ['simple', '', '|', ' piped']
+    - command: simple
+    - pipeTo:  piped
+    - statement: ['simple', '']
+      - command: simple
+    >>> print(c.parser.parseString('double-pipe || is not a pipe').dump())
+    ['double', '-pipe || is not a pipe']
+    - args: -pipe || is not a pipe
+    - command: double
+    - statement: ['double', '-pipe || is not a pipe']
+      - args: -pipe || is not a pipe
+      - command: double
+    >>> print(c.parser.parseString('command with args, terminator;sufx | piped').dump())
+    ['command', 'with args, terminator', ';', 'sufx', '|', ' piped']
+    - args: with args, terminator
+    - command: command
+    - pipeTo:  piped
+    - statement: ['command', 'with args, terminator', ';']
+      - args: with args, terminator
+      - command: command
+      - terminator: ;
+    - suffix: sufx
+    - terminator: ;
+    >>> print(c.parser.parseString('output into > afile.txt').dump())
+    ['output', 'into', '>', 'afile.txt']
+    - args: into
+    - command: output
+    - output: >
+    - outputTo: afile.txt
+    - statement: ['output', 'into']
+      - args: into
+      - command: output
+    >>> print(c.parser.parseString('output into;sufx | pipethrume plz > afile.txt').dump())
+    ['output', 'into', ';', 'sufx', '|', ' pipethrume plz', '>', 'afile.txt']
+    - args: into
+    - command: output
+    - output: >
+    - outputTo: afile.txt
+    - pipeTo:  pipethrume plz
+    - statement: ['output', 'into', ';']
+      - args: into
+      - command: output
+      - terminator: ;
+    - suffix: sufx
+    - terminator: ;
+    >>> print(c.parser.parseString('output to paste buffer >> ').dump())
+    ['output', 'to paste buffer', '>>', '']
+    - args: to paste buffer
+    - command: output
+    - output: >>
+    - statement: ['output', 'to paste buffer']
+      - args: to paste buffer
+      - command: output
+    >>> print(c.parser.parseString('ignore the /* commented | > */ stuff;').dump())
+    ['ignore', 'the /* commented | > */ stuff', ';', '']
+    - args: the /* commented | > */ stuff
+    - command: ignore
+    - statement: ['ignore', 'the /* commented | > */ stuff', ';']
+      - args: the /* commented | > */ stuff
+      - command: ignore
+      - terminator: ;
+    - terminator: ;
+    >>> print(c.parser.parseString('has > inside;').dump())
+    ['has', '> inside', ';', '']
+    - args: > inside
+    - command: has
+    - statement: ['has', '> inside', ';']
+      - args: > inside
+      - command: has
+      - terminator: ;
+    - terminator: ;
+    >>> print(c.parser.parseString('multiline has > inside an unfinished command').dump())
+    ['multiline', ' has > inside an unfinished command']
+    - multilineCommand: multiline
+    >>> print(c.parser.parseString('multiline has > inside;').dump())
+    ['multiline', 'has > inside', ';', '']
+    - args: has > inside
+    - multilineCommand: multiline
+    - statement: ['multiline', 'has > inside', ';']
+      - args: has > inside
+      - multilineCommand: multiline
+      - terminator: ;
+    - terminator: ;
+    >>> print(c.parser.parseString('multiline command /* with comment in progress;').dump())
+    ['multiline', ' command /* with comment in progress;']
+    - multilineCommand: multiline
+    >>> print(c.parser.parseString('multiline command /* with comment complete */ is done;').dump())
+    ['multiline', 'command /* with comment complete */ is done', ';', '']
+    - args: command /* with comment complete */ is done
+    - multilineCommand: multiline
+    - statement: ['multiline', 'command /* with comment complete */ is done', ';']
+      - args: command /* with comment complete */ is done
+      - multilineCommand: multiline
+      - terminator: ;
+    - terminator: ;
+    >>> print(c.parser.parseString('multiline command ends\n\n').dump())
+    ['multiline', 'command ends', '\n', '\n']
+    - args: command ends
+    - multilineCommand: multiline
+    - statement: ['multiline', 'command ends', '\n', '\n']
+      - args: command ends
+      - multilineCommand: multiline
+      - terminator: ['\n', '\n']
+    - terminator: ['\n', '\n']
+    >>> print(c.parser.parseString('multiline command "with term; ends" now\n\n').dump())
+    ['multiline', 'command "with term; ends" now', '\n', '\n']
+    - args: command "with term; ends" now
+    - multilineCommand: multiline
+    - statement: ['multiline', 'command "with term; ends" now', '\n', '\n']
+      - args: command "with term; ends" now
+      - multilineCommand: multiline
+      - terminator: ['\n', '\n']
+    - terminator: ['\n', '\n']
+    >>> print(c.parser.parseString('what if "quoted strings /* seem to " start comments?').dump())
+    ['what', 'if "quoted strings /* seem to " start comments?']
+    - args: if "quoted strings /* seem to " start comments?
+    - command: what
+    - statement: ['what', 'if "quoted strings /* seem to " start comments?']
+      - args: if "quoted strings /* seem to " start comments?
+      - command: what
+    '''