fix lexing, sort of

2 files changed, 39 insertions, 1 deletions

diff --git a/test/mitmproxy/test_command_lexer.py b/test/mitmproxy/test_command_lexer.py
new file mode 100644
index 00000000..3f009f88
--- /dev/null
+++ b/test/mitmproxy/test_command_lexer.py
@@ -0,0 +1,38 @@
+import pyparsing
+import pytest
+
+from mitmproxy import command_lexer
+
+
+@pytest.mark.parametrize(
+    "test_input,valid", [
+        ("'foo'", True),
+        ('"foo"', True),
+        ("'foo' bar'", False),
+        ("'foo\\' bar'", True),
+        ("'foo' 'bar'", False),
+        ("'foo'x", False),
+        ('''"foo    ''', True),
+        ('''"foo 'bar'   ''', True),
+    ]
+)
+def test_partial_quoted_string(test_input, valid):
+    if valid:
+        assert command_lexer.PartialQuotedString.parseString(test_input, parseAll=True)[0] == test_input
+    else:
+        with pytest.raises(pyparsing.ParseException):
+            command_lexer.PartialQuotedString.parseString(test_input, parseAll=True)
+
+
+@pytest.mark.parametrize(
+    "test_input,expected", [
+        ("'foo'", ["'foo'"]),
+        ('"foo"', ['"foo"']),
+        ("'foo' 'bar'", ["'foo'", ' ', "'bar'"]),
+        ("'foo'x", ["'foo'", 'x']),
+        ('''"foo''', ['"foo']),
+        ('''"foo 'bar' ''', ['''"foo 'bar' ''']),
+    ]
+)
+def test_expr(test_input, expected):
+    assert list(command_lexer.expr.parseString(test_input, parseAll=True)) == expected
diff --git a/test/mitmproxy/tools/console/test_commander.py b/test/mitmproxy/tools/console/test_commander.py
index 6b42de76..060e4b9b 100644
--- a/test/mitmproxy/tools/console/test_commander.py
+++ b/test/mitmproxy/tools/console/test_commander.py
@@ -269,7 +269,7 @@ class TestCommandBuffer:
             cb.text = "foo"
             assert cb.render()
 
-            cb.text = 'set view_filter=~bq test'
+            cb.text = 'set view_filter ~bq test'
             ret = cb.render()
             assert ret[0] == ('commander_command', 'set')
             assert ret[1] == ('text', ' ')