Test sqlexecute.run return values, not formatted output.

2 files changed, 113 insertions, 199 deletions

diff --git a/test/test_sqlexecute.py b/test/test_sqlexecute.py
index aebfa1a..f6b1c2c 100644
--- a/test/test_sqlexecute.py
+++ b/test/test_sqlexecute.py
@@ -1,64 +1,45 @@
 # coding=UTF-8
 
+import os
+
 import pytest
 import pymysql
-import os
-from textwrap import dedent
-from utils import run, dbtest, set_expanded_output
+
+from utils import run, dbtest, set_expanded_output, is_expanded_output
 
 
 @dbtest
 def test_conn(executor):
     run(executor, '''create table test(a text)''')
     run(executor, '''insert into test values('abc')''')
-    results = run(executor, '''select * from test''', join=True)
-    assert results == dedent("""\
-        +-----+
-        | a   |
-        +-----+
-        | abc |
-        +-----+
-        1 row in set""")
+    results = run(executor, '''select * from test''')
+
+    expected = [{'title': None, 'headers': ['a'], 'rows': [('abc',)],
+                 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
 def test_bools(executor):
     run(executor, '''create table test(a boolean)''')
     run(executor, '''insert into test values(True)''')
-    results = run(executor, '''select * from test''', join=True)
-    assert results == dedent("""\
-        +---+
-        | a |
-        +---+
-        | 1 |
-        +---+
-        1 row in set""")
+    results = run(executor, '''select * from test''')
 
-
-@dbtest
-def test_binary(executor):
-    run(executor, '''create table bt(geom linestring NOT NULL)''')
-    run(executor, '''INSERT INTO bt VALUES (GeomFromText('LINESTRING(116.37604 39.73979,116.375 39.73965)'));''')
-    results = run(executor, '''select * from bt''', join=True)
-    assert results == dedent("""\
-        +----------------------------------------------------------------------------------------------+
-        | geom                                                                                         |
-        +----------------------------------------------------------------------------------------------+
-        | 0x00000000010200000002000000397f130a11185d4034f44f70b1de43400000000000185d40423ee8d9acde4340 |
-        +----------------------------------------------------------------------------------------------+
-        1 row in set""")
+    expected = [{'title': None, 'headers': ['a'], 'rows': [(1,)],
+                 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
-def test_binary_expanded(executor):
+def test_binary(executor):
     run(executor, '''create table bt(geom linestring NOT NULL)''')
     run(executor, '''INSERT INTO bt VALUES (GeomFromText('LINESTRING(116.37604 39.73979,116.375 39.73965)'));''')
-    results = run(executor, '''select * from bt\G''', join=True)
-    assert results == dedent("""\
-        ***************************[ 1. row ]***************************
-        geom | 0x00000000010200000002000000397f130a11185d4034f44f70b1de43400000000000185d40423ee8d9acde4340
+    results = run(executor, '''select * from bt''')
 
-        1 row in set""")
+    expected = [{'title': None, 'headers': ['geom'],
+                 'rows': [(b'\x00\x00\x00\x00\x01\x02\x00\x00\x00\x02\x00\x00\x009\x7f\x13\n\x11\x18]@4\xf4Op\xb1\xdeC@\x00\x00\x00\x00\x00\x18]@B>\xe8\xd9\xac\xdeC@',)],
+                 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
@@ -97,38 +78,21 @@ def test_unicode_support_in_output(executor):
     run(executor, u"insert into unicodechars (t) values ('é')")
 
     # See issue #24, this raises an exception without proper handling
-    assert u'é' in run(executor, u"select * from unicodechars", join=True)
-
-
-@dbtest
-def test_expanded_output(executor):
-    run(executor, '''create table test(a text)''')
-    run(executor, '''insert into test values('abc')''')
-    results = run(executor, '''select * from test\G''', join=True)
-
-    expected_results = set([
-        dedent("""\
-        -[ RECORD 0 ]
-        a | abc
-
-        1 row in set"""),
-        dedent("""\
-        ***************************[ 1. row ]***************************
-        a | abc
-
-        1 row in set"""),
-    ])
-
-    assert results in expected_results
+    results = run(executor, u"select * from unicodechars")
+    expected = [{'title': None, 'headers': ['t'], 'rows': [(u'é',)],
+                 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
 def test_multiple_queries_same_line(executor):
-    result = run(executor, "select 'foo'; select 'bar'")
-    # 2 for the results and 2 more for status messages.
-    assert len(result) == 4
-    assert "foo" in result[0]
-    assert "bar" in result[2]
+    results = run(executor, "select 'foo'; select 'bar'")
+
+    expected = [{'title': None, 'headers': ['foo'], 'rows': [('foo',)],
+                 'status': '1 row in set'},
+                {'title': None, 'headers': ['bar'], 'rows': [('bar',)],
+                 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
@@ -146,19 +110,19 @@ def test_favorite_query(executor):
     run(executor, "insert into test values('def')")
 
     results = run(executor, "\\fs test-a select * from test where a like 'a%'")
-    assert results == ['Saved.']
+    expected = [{'title': None, 'headers': None,
+                 'rows': None, 'status': 'Saved.'}]
+    assert expected == results
 
-    results = run(executor, "\\f test-a", join=True)
-    assert results == dedent("""\
-           > select * from test where a like 'a%'
-           +-----+
-           | a   |
-           +-----+
-           | abc |
-           +-----+""")
+    results = run(executor, "\\f test-a")
+    expected = [{'title': "> select * from test where a like 'a%'",
+                 'headers': ['a'], 'rows': [('abc',)], 'status': None}]
+    assert expected == results
 
     results = run(executor, "\\fd test-a")
-    assert results == ['test-a: Deleted']
+    expected = [{'title': None, 'headers': None, 'rows': None,
+                 'status': 'test-a: Deleted'}]
+    assert expected == results
 
 
 @dbtest
@@ -168,27 +132,24 @@ def test_favorite_query_multiple_statement(executor):
     run(executor, "insert into test values('abc')")
     run(executor, "insert into test values('def')")
 
-    results = run(executor, "\\fs test-ad select * from test where a like 'a%'; "
-                            "select * from test where a like 'd%'")
-    assert results == ['Saved.']
-
-    results = run(executor, "\\f test-ad", join=True)
-    assert results == dedent("""\
-           > select * from test where a like 'a%'
-           +-----+
-           | a   |
-           +-----+
-           | abc |
-           +-----+
-           > select * from test where a like 'd%'
-           +-----+
-           | a   |
-           +-----+
-           | def |
-           +-----+""")
+    results = run(executor,
+                  "\\fs test-ad select * from test where a like 'a%'; "
+                  "select * from test where a like 'd%'")
+    expected = [{'title': None, 'headers': None,
+                 'rows': None, 'status': 'Saved.'}]
+    assert expected == results
+
+    results = run(executor, "\\f test-ad")
+    expected = [{'title': "> select * from test where a like 'a%'",
+                 'headers': ['a'], 'rows': [('abc',)], 'status': None},
+                {'title': "> select * from test where a like 'd%'",
+                 'headers': ['a'], 'rows': [('def',)], 'status': None}]
+    assert expected == results
 
     results = run(executor, "\\fd test-ad")
-    assert results == ['test-ad: Deleted']
+    expected = [{'title': None, 'headers': None, 'rows': None,
+                 'status': 'test-ad: Deleted'}]
+    assert expected == results
 
 
 @dbtest
@@ -198,156 +159,108 @@ def test_favorite_query_expanded_output(executor):
     run(executor, '''insert into test values('abc')''')
 
     results = run(executor, "\\fs test-ae select * from test")
-    assert results == ['Saved.']
-
-    results = run(executor, "\\f test-ae \G", join=True)
-
-    expected_results = set([
-        dedent("""\
-        > select * from test
-        -[ RECORD 0 ]
-        a | abc
-        """),
-        dedent("""\
-        > select * from test
-        ***************************[ 1. row ]***************************
-        a | abc
-        """),
-    ])
-    set_expanded_output(False)
+    expected = [{'title': None, 'headers': None, 'rows': None,
+                 'status': 'Saved.'}]
+    assert expected == results
 
-    assert results in expected_results
+    results = run(executor, "\\f test-ae \G")
+    assert is_expanded_output() is True
+    expected = [{'title': '> select * from test', 'headers': ['a'],
+                 'rows': [('abc',)], 'status': None}]
+    assert expected == results
+
+    set_expanded_output(False)
 
     results = run(executor, "\\fd test-ae")
-    assert results == ['test-ae: Deleted']
+    expected = [{'title': None, 'headers': None, 'rows': None,
+                 'status': 'test-ae: Deleted'}]
+    assert expected == results
 
 
 @dbtest
 def test_special_command(executor):
     results = run(executor, '\\?')
-    expected_line = u'\n| help'
+    assert results[0]['headers'] == ['Command', 'Shortcut', 'Description']
     assert len(results) == 1
-    assert expected_line in results[0]
 
 
 @dbtest
 def test_cd_command_without_a_folder_name(executor):
     results = run(executor, 'system cd')
-    expected_line = 'No folder name was provided.'
-    assert len(results) == 1
-    assert expected_line in results[0]
+    expected = [{'title': None, 'headers': None, 'rows': None,
+                 'status': 'No folder name was provided.'}]
+    assert expected == results
 
 
 @dbtest
 def test_system_command_not_found(executor):
     results = run(executor, 'system xyz')
+    assert 'OSError: No such file or directory' in results[0]['status']
+    assert results[0]['title'] is None
+    assert results[0]['headers'] is None
+    assert results[0]['rows'] is None
     assert len(results) == 1
-    expected_line = 'OSError:'
-    assert expected_line in results[0]
 
 
 @dbtest
 def test_system_command_output(executor):
     test_file_path = os.path.join(os.path.abspath('.'), 'test', 'test.txt')
     results = run(executor, 'system cat {0}'.format(test_file_path))
-    assert len(results) == 1
-    expected_line = u'mycli rocks!\n'
-    assert expected_line == results[0]
+    expected = [{'title': None, 'headers': None, 'rows': None,
+                 'status': 'mycli rocks!\n'}]
+    assert expected == results
 
 
 @dbtest
 def test_cd_command_current_dir(executor):
     test_path = os.path.join(os.path.abspath('.'), 'test')
-    results = run(executor, 'system cd {0}'.format(test_path))
+    run(executor, 'system cd {0}'.format(test_path))
     assert os.getcwd() == test_path
 
 
 @dbtest
 def test_unicode_support(executor):
-    assert u'日本語' in run(executor, u"SELECT '日本語' AS japanese;", join=True)
-
-
-@dbtest
-def test_favorite_query_multiline_statement(executor):
-    set_expanded_output(False)
-    run(executor, "create table test(a text)")
-    run(executor, "insert into test values('abc')")
-    run(executor, "insert into test values('def')")
-
-    results = run(executor, "\\fs test-ad select * from test where a like 'a%';\n"
-                            "select * from test where a like 'd%'")
-    assert results == ['Saved.']
-
-    results = run(executor, "\\f test-ad", join=True)
-    assert results == dedent("""\
-           > select * from test where a like 'a%'
-           +-----+
-           | a   |
-           +-----+
-           | abc |
-           +-----+
-           > select * from test where a like 'd%'
-           +-----+
-           | a   |
-           +-----+
-           | def |
-           +-----+""")
-
-    results = run(executor, "\\fd test-ad")
-    assert results == ['test-ad: Deleted']
+    results = run(executor, u"SELECT '日本語' AS japanese;")
+    expected = [{'title': None, 'headers': ['japanese'], 'rows': [(u'日本語',)],
+                 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
 def test_timestamp_null(executor):
     run(executor, '''create table ts_null(a timestamp)''')
     run(executor, '''insert into ts_null values(0)''')
-    results = run(executor, '''select * from ts_null''', join=True)
-    assert results == dedent("""\
-        +---------------------+
-        | a                   |
-        +---------------------+
-        | 0000-00-00 00:00:00 |
-        +---------------------+
-        1 row in set""")
+    results = run(executor, '''select * from ts_null''')
+    expected = [{'title': None, 'headers': ['a'],
+                 'rows': [('0000-00-00 00:00:00',)], 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
 def test_datetime_null(executor):
     run(executor, '''create table dt_null(a datetime)''')
     run(executor, '''insert into dt_null values(0)''')
-    results = run(executor, '''select * from dt_null''', join=True)
-    assert results == dedent("""\
-        +---------------------+
-        | a                   |
-        +---------------------+
-        | 0000-00-00 00:00:00 |
-        +---------------------+
-        1 row in set""")
+    results = run(executor, '''select * from dt_null''')
+    expected = [{'title': None, 'headers': ['a'],
+                 'rows': [('0000-00-00 00:00:00',)], 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
 def test_date_null(executor):
     run(executor, '''create table date_null(a date)''')
     run(executor, '''insert into date_null values(0)''')
-    results = run(executor, '''select * from date_null''', join=True)
-    assert results == dedent("""\
-        +------------+
-        | a          |
-        +------------+
-        | 0000-00-00 |
-        +------------+
-        1 row in set""")
+    results = run(executor, '''select * from date_null''')
+    expected = [{'title': None, 'headers': ['a'], 'rows': [('0000-00-00',)],
+                 'status': '1 row in set'}]
+    assert expected == results
 
 
 @dbtest
 def test_time_null(executor):
     run(executor, '''create table time_null(a time)''')
     run(executor, '''insert into time_null values(0)''')
-    results = run(executor, '''select * from time_null''', join=True)
-    assert results == dedent("""\
-        +----------+
-        | a        |
-        +----------+
-        | 00:00:00 |
-        +----------+
-        1 row in set""")
+    results = run(executor, '''select * from time_null''')
+    expected = [{'title': None, 'headers': ['a'], 'rows': [('00:00:00',)],
+                 'status': '1 row in set'}]
+    assert expected == results
diff --git a/test/utils.py b/test/utils.py
index 0d6b6a9..c7a91b5 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -3,7 +3,7 @@ from os import getenv
 import pymysql
 import pytest
 
-from mycli.main import MyCli, special
+from mycli.main import special
 
 PASSWORD = getenv('PYTEST_PASSWORD')
 USER = getenv('PYTEST_USER', 'root')
@@ -13,8 +13,8 @@ CHARSET = getenv('PYTEST_CHARSET', 'utf8')
 
 
 def db_connection(dbname=None):
-    conn = pymysql.connect(user=USER, host=HOST, port=PORT, database=dbname, password=PASSWORD,
-                           charset=CHARSET,
+    conn = pymysql.connect(user=USER, host=HOST, port=PORT, database=dbname,
+                           password=PASSWORD, charset=CHARSET,
                            local_infile=False)
     conn.autocommit = True
     return conn
@@ -40,22 +40,23 @@ def create_db(dbname):
             pass
 
 
-def run(executor, sql, join=False):
+def run(executor, sql, rows_as_list=True):
     """Return string output for the sql to be run."""
     result = []
 
-    # TODO: this needs to go away. `run()` should not test formatted output.
-    # It should test raw results.
-    mycli = MyCli()
     for title, rows, headers, status in executor.run(sql):
-        result.extend(mycli.format_output(title, rows, headers, status,
-                                          special.is_expanded_output()))
+        rows = list(rows) if (rows_as_list and rows) else rows
+        result.append({'title': title, 'rows': rows, 'headers': headers,
+                       'status': status})
 
-    if join:
-        result = '\n'.join(result)
     return result
 
 
 def set_expanded_output(is_expanded):
     """Pass-through for the tests."""
     return special.set_expanded_output(is_expanded)
+
+
+def is_expanded_output():
+    """Pass-through for the tests."""
+    return special.is_expanded_output()