From 3ec2a2902caaf3e70deea650425339299af5d821 Mon Sep 17 00:00:00 2001 From: zlg Date: Thu, 18 Oct 2018 16:36:39 -0700 Subject: Catch when an invalid list filter is passed Before, vgstash.DB.list_games() would default to 'allgames' and silently hide it when a filter wasn't found. This commit ensures that the vgstash package and CLI both indicate when an invalid filter is passed to them: * vgstash.DB.list_games() will return False on a failure to match; * vgstash_cli uses Click's Choice object to enforce the constraint --- tests/test_vgstash.py | 4 ++++ tests/test_vgstash_cli.py | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'tests') diff --git a/tests/test_vgstash.py b/tests/test_vgstash.py index 74f3c43..43cd639 100644 --- a/tests/test_vgstash.py +++ b/tests/test_vgstash.py @@ -129,6 +129,10 @@ def test_db_list_games(vgstash_db): assert isinstance(res, list) assert isinstance(res[0], sqlite3.Row) +def test_db_list_games_not_found(vgstash_db): + res = vgstash_db.list_games("derp") + assert res == False + def test_db_add_filter(vgstash_db): assert vgstash_db.add_filter("db_add_filter", "SELECT * FROM games WHERE system = 'system2'") assert vgstash_db.has_filter("db_add_filter") diff --git a/tests/test_vgstash_cli.py b/tests/test_vgstash_cli.py index 02f0d81..f34f2d1 100644 --- a/tests/test_vgstash_cli.py +++ b/tests/test_vgstash_cli.py @@ -99,6 +99,13 @@ def test_list_filter(): 'The Legend of Zelda|NES|2|2|\n', )) +def test_list_filter_invalid(): + runner = CliRunner() + result = runner.invoke(vgstash_cli.cli, ['list', '-r', 'derp']) + if verbose: + print(result.output) + assert result.exit_code != 0 + def test_list_pretty(): runner = CliRunner() -- cgit v1.2.3-54-g00ecf