From 3fb37a1d0237869e8e37864d06c0dfd94bb43189 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 6 Sep 2021 06:12:56 +0200 Subject: Merging upstream version 2.2.0. Signed-off-by: Daniel Baumann --- .../test_delimited_output_adapter.py | 39 +++++++++++++--------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'tests/tabular_output/test_delimited_output_adapter.py') diff --git a/tests/tabular_output/test_delimited_output_adapter.py b/tests/tabular_output/test_delimited_output_adapter.py index 3627b84..86a622e 100644 --- a/tests/tabular_output/test_delimited_output_adapter.py +++ b/tests/tabular_output/test_delimited_output_adapter.py @@ -12,37 +12,44 @@ from cli_helpers.tabular_output import delimited_output_adapter def test_csv_wrapper(): """Test the delimited output adapter.""" # Test comma-delimited output. - data = [['abc', '1'], ['d', '456']] - headers = ['letters', 'number'] - output = delimited_output_adapter.adapter(iter(data), headers, dialect='unix') - assert "\n".join(output) == dedent('''\ + data = [["abc", "1"], ["d", "456"]] + headers = ["letters", "number"] + output = delimited_output_adapter.adapter(iter(data), headers, dialect="unix") + assert "\n".join(output) == dedent( + '''\ "letters","number"\n\ "abc","1"\n\ - "d","456"''') + "d","456"''' + ) # Test tab-delimited output. - data = [['abc', '1'], ['d', '456']] - headers = ['letters', 'number'] + data = [["abc", "1"], ["d", "456"]] + headers = ["letters", "number"] output = delimited_output_adapter.adapter( - iter(data), headers, table_format='csv-tab', dialect='unix') - assert "\n".join(output) == dedent('''\ + iter(data), headers, table_format="csv-tab", dialect="unix" + ) + assert "\n".join(output) == dedent( + '''\ "letters"\t"number"\n\ "abc"\t"1"\n\ - "d"\t"456"''') + "d"\t"456"''' + ) with pytest.raises(ValueError): output = delimited_output_adapter.adapter( - iter(data), headers, table_format='foobar') + iter(data), headers, table_format="foobar" + ) list(output) def test_unicode_with_csv(): """Test that the csv wrapper can handle non-ascii characters.""" - data = [['观音', '1'], ['Ποσειδῶν', '456']] - headers = ['letters', 'number'] + data = [["观音", "1"], ["Ποσειδῶν", "456"]] + headers = ["letters", "number"] output = delimited_output_adapter.adapter(data, headers) - assert "\n".join(output) == dedent('''\ + assert "\n".join(output) == dedent( + """\ letters,number\n\ 观音,1\n\ - Ποσειδῶν,456''') - + Ποσειδῶν,456""" + ) -- cgit v1.2.3