From 630541499a58f98c55d5cc372d21e745c106d250 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Fri, 13 Oct 2023 12:24:13 -0700 Subject: Refactor parsing logic and revise exception handling --- tests/test_parse.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/test_parse.py (limited to 'tests/test_parse.py') diff --git a/tests/test_parse.py b/tests/test_parse.py new file mode 100644 index 0000000..064b85c --- /dev/null +++ b/tests/test_parse.py @@ -0,0 +1,60 @@ +# wikiget - CLI tool for downloading files from Wikimedia sites +# Copyright (C) 2023 Cody Logan +# SPDX-License-Identifier: GPL-3.0-or-later +# +# Wikiget is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Wikiget is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Wikiget. If not, see . + +import pytest + +from wikiget.exceptions import ParseError +from wikiget.parse import get_dest +from wikiget.wikiget import construct_parser + + +class TestGetDest: + parser = construct_parser() + + def test_get_dest_with_filename(self): + args = self.parser.parse_args(["File:Example.jpg"]) + filename, dest, site_name = get_dest(args.FILE, args) + assert filename == "Example.jpg" + assert dest == "Example.jpg" + assert site_name == "commons.wikimedia.org" + + def test_get_dest_with_url(self): + args = self.parser.parse_args( + [ + "https://en.wikipedia.org/wiki/File:Example.jpg", + ] + ) + filename, dest, site_name = get_dest(args.FILE, args) + assert filename == "Example.jpg" + assert dest == "Example.jpg" + assert site_name == "en.wikipedia.org" + + def test_get_dest_with_bad_filename(self): + args = self.parser.parse_args(["Example.jpg"]) + with pytest.raises(ParseError): + filename, dest, site_name = get_dest(args.FILE, args) + + def test_get_dest_with_different_site(self, caplog: pytest.LogCaptureFixture): + args = self.parser.parse_args( + [ + "https://commons.wikimedia.org/wiki/File:Example.jpg", + "--site", + "commons.wikimedia.org", + ] + ) + filename, dest, site_name = get_dest(args.FILE, args) + assert "target is a URL, ignoring site specified with --site" in caplog.text -- cgit v1.2.3 From 06335ba0176cabd84f5b548995f465ac1c09bc8e Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Tue, 17 Oct 2023 14:00:14 -0700 Subject: Clean up exception handling and error messages --- tests/test_parse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_parse.py') diff --git a/tests/test_parse.py b/tests/test_parse.py index 064b85c..c47678e 100644 --- a/tests/test_parse.py +++ b/tests/test_parse.py @@ -57,4 +57,4 @@ class TestGetDest: ] ) filename, dest, site_name = get_dest(args.FILE, args) - assert "target is a URL, ignoring site specified with --site" in caplog.text + assert "Target is a URL, ignoring site specified with --site" in caplog.text -- cgit v1.2.3 From 05457af0d73ff3a820c0b465e6607fc5832a6e74 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Fri, 20 Oct 2023 16:23:28 -0700 Subject: Reorganize File class --- tests/test_parse.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/test_parse.py') diff --git a/tests/test_parse.py b/tests/test_parse.py index c47678e..757b361 100644 --- a/tests/test_parse.py +++ b/tests/test_parse.py @@ -27,10 +27,10 @@ class TestGetDest: def test_get_dest_with_filename(self): args = self.parser.parse_args(["File:Example.jpg"]) - filename, dest, site_name = get_dest(args.FILE, args) - assert filename == "Example.jpg" - assert dest == "Example.jpg" - assert site_name == "commons.wikimedia.org" + file = get_dest(args.FILE, args) + assert file.name == "Example.jpg" + assert file.dest == "Example.jpg" + assert file.site == "commons.wikimedia.org" def test_get_dest_with_url(self): args = self.parser.parse_args( @@ -38,15 +38,15 @@ class TestGetDest: "https://en.wikipedia.org/wiki/File:Example.jpg", ] ) - filename, dest, site_name = get_dest(args.FILE, args) - assert filename == "Example.jpg" - assert dest == "Example.jpg" - assert site_name == "en.wikipedia.org" + file = get_dest(args.FILE, args) + assert file.name == "Example.jpg" + assert file.dest == "Example.jpg" + assert file.site == "en.wikipedia.org" def test_get_dest_with_bad_filename(self): args = self.parser.parse_args(["Example.jpg"]) with pytest.raises(ParseError): - filename, dest, site_name = get_dest(args.FILE, args) + _ = get_dest(args.FILE, args) def test_get_dest_with_different_site(self, caplog: pytest.LogCaptureFixture): args = self.parser.parse_args( @@ -56,5 +56,5 @@ class TestGetDest: "commons.wikimedia.org", ] ) - filename, dest, site_name = get_dest(args.FILE, args) + _ = get_dest(args.FILE, args) assert "Target is a URL, ignoring site specified with --site" in caplog.text -- cgit v1.2.3