From 865088207b39427b6b932de4f312d82bd5e05a53 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Tue, 3 Oct 2023 13:26:09 -0700 Subject: Refactor for better code organization --- tests/test_file_class.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 tests/test_file_class.py (limited to 'tests') diff --git a/tests/test_file_class.py b/tests/test_file_class.py new file mode 100644 index 0000000..7ad0b87 --- /dev/null +++ b/tests/test_file_class.py @@ -0,0 +1,31 @@ +# 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 . + +from wikiget.file import File + + +def test_file_with_name_only(): + file = File("foobar.jpg") + assert file.name == "foobar.jpg" + assert file.dest == file.name + + +def test_file_with_name_and_dest(): + file = File("foobar.jpg", "bazqux.jpg") + assert file.name == "foobar.jpg" + assert file.dest == "bazqux.jpg" + assert file.dest != file.name -- cgit v1.2.3 From 8e6bb3dcc1c929327425750057c411192c1e69d7 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Mon, 9 Oct 2023 11:16:05 -0700 Subject: Add some tests for download functions --- tests/test_dl.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 tests/test_dl.py (limited to 'tests') diff --git a/tests/test_dl.py b/tests/test_dl.py new file mode 100644 index 0000000..396041d --- /dev/null +++ b/tests/test_dl.py @@ -0,0 +1,78 @@ +# 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 logging +import pytest + +# from wikiget import USER_AGENT +from wikiget.wikiget import construct_parser +# from wikiget.dl import get_dest, query_api, prep_download +from wikiget.dl import get_dest + + +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(SystemExit): + filename, dest, site_name = get_dest(args.FILE, args) + + def test_get_dest_with_different_site(self, caplog): + 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 + + +# TODO: don't hit the actual API when doing tests +# class TestQueryApi: +# parser = construct_parser() +# +# def test_query_api(self, caplog): +# caplog.set_level(logging.DEBUG) +# args = self.parser.parse_args(["File:Example.jpg"]) +# file, site = query_api("Example.jpg", "commons.wikimedia.org", args) +# assert USER_AGENT in caplog.text +# +# +# class TestPrepDownload(): +# parser = construct_parser() +# +# def test_prep_download(self): +# args = self.parser.parse_args(["File:Example.jpg"]) +# file = prep_download(args.FILE, args) +# assert file is not None -- cgit v1.2.3 From 206f0fe0b97610fc371ad0acdd5146ac12eacfe7 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Mon, 9 Oct 2023 13:50:30 -0700 Subject: Style cleanup --- tests/test_dl.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/test_dl.py b/tests/test_dl.py index 396041d..abf8763 100644 --- a/tests/test_dl.py +++ b/tests/test_dl.py @@ -15,13 +15,10 @@ # You should have received a copy of the GNU General Public License # along with Wikiget. If not, see . -# import logging import pytest -# from wikiget import USER_AGENT -from wikiget.wikiget import construct_parser -# from wikiget.dl import get_dest, query_api, prep_download from wikiget.dl import get_dest +from wikiget.wikiget import construct_parser class TestGetDest: @@ -35,9 +32,11 @@ class TestGetDest: 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", - ]) + 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" @@ -48,12 +47,14 @@ class TestGetDest: with pytest.raises(SystemExit): filename, dest, site_name = get_dest(args.FILE, args) - def test_get_dest_with_different_site(self, caplog): - args = self.parser.parse_args([ - "https://commons.wikimedia.org/wiki/File:Example.jpg", - "--site", - "commons.wikimedia.org", - ]) + 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 875748228e509e244c8f444114387f1a03cbb393 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Fri, 13 Oct 2023 12:19:41 -0700 Subject: Update copyright year --- tests/test_validations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_validations.py b/tests/test_validations.py index 1abd96a..9d70f6e 100644 --- a/tests/test_validations.py +++ b/tests/test_validations.py @@ -1,5 +1,5 @@ # wikiget - CLI tool for downloading files from Wikimedia sites -# Copyright (C) 2018-2021 Cody Logan +# Copyright (C) 2018-2023 Cody Logan # SPDX-License-Identifier: GPL-3.0-or-later # # Wikiget is free software: you can redistribute it and/or modify -- cgit v1.2.3 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_dl.py | 69 ++++++++++++++--------------------------------------- tests/test_parse.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 51 deletions(-) create mode 100644 tests/test_parse.py (limited to 'tests') diff --git a/tests/test_dl.py b/tests/test_dl.py index abf8763..fc68733 100644 --- a/tests/test_dl.py +++ b/tests/test_dl.py @@ -15,65 +15,32 @@ # You should have received a copy of the GNU General Public License # along with Wikiget. If not, see . +import logging + import pytest -from wikiget.dl import get_dest +from wikiget import USER_AGENT +from wikiget.dl import prep_download, query_api from wikiget.wikiget import construct_parser -class TestGetDest: +# TODO: don't hit the actual API when doing tests +@pytest.mark.skip +class TestQueryApi: parser = construct_parser() - def test_get_dest_with_filename(self): + def test_query_api(self, caplog): + caplog.set_level(logging.DEBUG) 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" + file, site = query_api("Example.jpg", "commons.wikimedia.org", args) + assert USER_AGENT in caplog.text - def test_get_dest_with_bad_filename(self): - args = self.parser.parse_args(["Example.jpg"]) - with pytest.raises(SystemExit): - 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 +@pytest.mark.skip +class TestPrepDownload: + parser = construct_parser() -# TODO: don't hit the actual API when doing tests -# class TestQueryApi: -# parser = construct_parser() -# -# def test_query_api(self, caplog): -# caplog.set_level(logging.DEBUG) -# args = self.parser.parse_args(["File:Example.jpg"]) -# file, site = query_api("Example.jpg", "commons.wikimedia.org", args) -# assert USER_AGENT in caplog.text -# -# -# class TestPrepDownload(): -# parser = construct_parser() -# -# def test_prep_download(self): -# args = self.parser.parse_args(["File:Example.jpg"]) -# file = prep_download(args.FILE, args) -# assert file is not None + def test_prep_download(self): + args = self.parser.parse_args(["File:Example.jpg"]) + file = prep_download(args.FILE, args) + assert file is not None 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') 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_file_class.py | 10 ++++++++-- tests/test_parse.py | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/test_file_class.py b/tests/test_file_class.py index 7ad0b87..dd30207 100644 --- a/tests/test_file_class.py +++ b/tests/test_file_class.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Wikiget. If not, see . +from wikiget import DEFAULT_SITE from wikiget.file import File @@ -22,10 +23,15 @@ def test_file_with_name_only(): file = File("foobar.jpg") assert file.name == "foobar.jpg" assert file.dest == file.name + assert file.site == DEFAULT_SITE def test_file_with_name_and_dest(): - file = File("foobar.jpg", "bazqux.jpg") - assert file.name == "foobar.jpg" + file = File("foobar.jpg", dest="bazqux.jpg") assert file.dest == "bazqux.jpg" assert file.dest != file.name + + +def test_file_with_name_and_site(): + file = File("foobar.jpg", site="en.wikipedia.org") + assert file.site == "en.wikipedia.org" 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