diff options
Diffstat (limited to 'python/tests')
26 files changed, 74 insertions, 74 deletions
diff --git a/python/tests/api_annotations.py b/python/tests/api_annotations.py index 0d3c5046..e5566eef 100644 --- a/python/tests/api_annotations.py +++ b/python/tests/api_annotations.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/api_containers.py b/python/tests/api_containers.py index ed2b2675..0850fab7 100644 --- a/python/tests/api_containers.py +++ b/python/tests/api_containers.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/api_creators.py b/python/tests/api_creators.py index 28be6a91..1ce6380a 100644 --- a/python/tests/api_creators.py +++ b/python/tests/api_creators.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/api_editgroups.py b/python/tests/api_editgroups.py index 5346d909..d82c9233 100644 --- a/python/tests/api_editgroups.py +++ b/python/tests/api_editgroups.py @@ -4,8 +4,8 @@ import pytest import datetime from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * @@ -52,9 +52,9 @@ def test_editgroup_submit(api): assert eg3.submitted assert eg3.changelog_index - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.update_editgroup(eg.editgroup_id, eg3, submit=True) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): eg3.description = "something" api.update_editgroup(eg.editgroup_id, eg3) diff --git a/python/tests/api_editor.py b/python/tests/api_editor.py index 637736e4..64bb2759 100644 --- a/python/tests/api_editor.py +++ b/python/tests/api_editor.py @@ -4,8 +4,8 @@ import pytest import datetime from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/api_entity_editing.py b/python/tests/api_entity_editing.py index 83f38695..d5377e18 100644 --- a/python/tests/api_entity_editing.py +++ b/python/tests/api_entity_editing.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * @@ -23,7 +23,7 @@ def test_multiple_edits_same_group(api): c3 = CreatorEntity(display_name="right") edit = api.update_creator(eg.editgroup_id, c1.ident, c2) # should fail with existing - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.update_creator(eg.editgroup_id, c1.ident, c3) # ... but succeed after deleting api.delete_creator_edit(edit.editgroup_id, edit.edit_id) @@ -54,7 +54,7 @@ def test_edit_after_accept(api): try: api.create_creator(eg.editgroup_id, c2) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 # TODO: need better message #assert "accepted" in e.body @@ -116,7 +116,7 @@ def test_delete_accepted_edit(api): try: api.delete_creator_edit(edit.editgroup_id, edit.edit_id) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "accepted" in e.body diff --git a/python/tests/api_entity_state.py b/python/tests/api_entity_state.py index 9ff99dab..d5ba6301 100644 --- a/python/tests/api_entity_state.py +++ b/python/tests/api_entity_state.py @@ -1,8 +1,8 @@ import pytest -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * @@ -70,7 +70,7 @@ def test_redirect_entity(api): # get by orcid res = api.lookup_creator(orcid=o1) assert res.ident == c1.ident - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): res = api.lookup_creator(orcid=o2) # update first; check that get on second updates @@ -163,14 +163,14 @@ def test_delete_entity(api): # delete eg = quick_eg(api) api.delete_creator(eg.editgroup_id, c1.ident) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): # can't re-delete in same editgroup api.delete_creator(eg.editgroup_id, c1.ident) api.accept_editgroup(eg.editgroup_id) res = api.get_creator(c1.ident) assert res.state == "deleted" assert res.display_name is None - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): res = api.lookup_creator(orcid=c1.orcid) # re-delete @@ -180,7 +180,7 @@ def test_delete_entity(api): api.delete_creator(eg.editgroup_id, c1.ident) #api.accept_editgroup(eg.editgroup_id) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 # error is 4xx # undelete @@ -250,11 +250,11 @@ def test_recursive_redirects_entity(api): c2_redirect = CreatorEntity(redirect=c1.ident) eg = quick_eg(api) api.update_creator(eg.editgroup_id, c2.ident, c2_redirect) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.accept_editgroup(eg.editgroup_id) res = api.get_creator(c2.ident) assert res.display_name == "test two" - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): res = api.lookup_creator(orcid=o3) res = api.lookup_creator(orcid=o2) assert res.ident == c2.ident @@ -263,7 +263,7 @@ def test_recursive_redirects_entity(api): c1_redirect = CreatorEntity(redirect=c3.ident) eg = quick_eg(api) api.update_creator(eg.editgroup_id, c1.ident, c1_redirect) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.accept_editgroup(eg.editgroup_id) res = api.get_creator(c1.ident) assert res.display_name == "test one" @@ -291,7 +291,7 @@ def test_recursive_redirects_entity(api): res = api.get_creator(c3.ident) assert res.state == "redirect" assert res.display_name is None - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): res = api.lookup_creator(orcid=o2) # undelete second; check that third updated @@ -329,7 +329,7 @@ def test_recursive_redirects_entity(api): res = api.get_creator(c3.ident) assert res.state == "redirect" assert res.display_name is None - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): res = api.lookup_creator(orcid=o2) eg = quick_eg(api) api.delete_creator(eg.editgroup_id, c3.ident) @@ -358,7 +358,7 @@ def test_self_redirect(api): # redirect first to itself; should error on PUT c1_redirect = CreatorEntity(redirect=c1.ident) eg = quick_eg(api) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): merge_edit = api.update_creator(eg.editgroup_id, c1.ident, c1_redirect) @@ -382,7 +382,7 @@ def test_wip_redirect(api): try: api.update_creator(eg.editgroup_id, c1.ident, c1_redirect) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "WIP" in e.body @@ -401,7 +401,7 @@ def test_create_redirect(api): try: api.create_creator(eg.editgroup_id, c2) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "redirect" in e.body @@ -415,7 +415,7 @@ def test_create_redirect(api): try: api.create_release(eg.editgroup_id, r2) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "redirect" in e.body @@ -428,7 +428,7 @@ def test_required_entity_fields(api): c1 = CreatorEntity() api.create_creator(eg.editgroup_id, c1) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "display_name" in e.body @@ -437,7 +437,7 @@ def test_required_entity_fields(api): c1 = ContainerEntity() api.create_container(eg.editgroup_id, c1) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "name" in e.body @@ -446,7 +446,7 @@ def test_required_entity_fields(api): c1 = ReleaseEntity(ext_ids=ReleaseExtIds()) api.create_release(eg.editgroup_id, c1) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "title" in e.body @@ -465,6 +465,6 @@ def test_revert_current_status(api): try: api.update_creator(eg.editgroup_id, c1.ident, c1_revert) assert False - except fatcat_client.rest.ApiException as e: + except fatcat_openapi_client.rest.ApiException as e: assert 400 <= e.status < 500 assert "current" in e.body diff --git a/python/tests/api_files.py b/python/tests/api_files.py index dd10058b..74865daa 100644 --- a/python/tests/api_files.py +++ b/python/tests/api_files.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/api_filesets.py b/python/tests/api_filesets.py index 48f58cc8..7f3235cb 100644 --- a/python/tests/api_filesets.py +++ b/python/tests/api_filesets.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * @@ -98,6 +98,6 @@ def test_bad_fileset(api): ] for b in bad_list: - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.create_fileset(eg.editgroup_id, b) diff --git a/python/tests/api_misc.py b/python/tests/api_misc.py index 6fea9d29..11f85fd6 100644 --- a/python/tests/api_misc.py +++ b/python/tests/api_misc.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/api_releases.py b/python/tests/api_releases.py index f2a370c3..2df08698 100644 --- a/python/tests/api_releases.py +++ b/python/tests/api_releases.py @@ -4,8 +4,8 @@ import pytest import datetime from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * @@ -151,14 +151,14 @@ def test_release_examples(api): # failed lookup exception type try: api.lookup_release(pmid='5432100') - except fatcat_client.rest.ApiException as ae: + except fatcat_openapi_client.rest.ApiException as ae: assert ae.status == 404 assert "DatabaseRowNotFound" in ae.body # failed lookup formatting try: api.lookup_release(doi='blah') - except fatcat_client.rest.ApiException as ae: + except fatcat_openapi_client.rest.ApiException as ae: assert ae.status == 400 assert "MalformedExternalId" in ae.body @@ -182,10 +182,10 @@ def test_empty_fields(api): ext_ids=ReleaseExtIds()) r1edit = api.create_release(eg.editgroup_id, r1) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): r2 = ReleaseEntity(title="", ext_ids=ReleaseExtIds()) api.create_release(eg.editgroup_id, r2) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): r2 = ReleaseEntity(title="something", contribs=[ReleaseContrib(raw_name="")], ext_ids=ReleaseExtIds()) api.create_release(eg.editgroup_id, r2) @@ -194,19 +194,19 @@ def test_controlled_vocab(api): eg = quick_eg(api) r1 = ReleaseEntity(title="something", release_type="journal-thingie", ext_ids=ReleaseExtIds()) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.create_release(eg.editgroup_id, r1) r1.release_type = "article" api.create_release(eg.editgroup_id, r1) r2 = ReleaseEntity(title="something else", release_stage="pre-print", ext_ids=ReleaseExtIds()) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.create_release(eg.editgroup_id, r2) r2.release_stage = "published" api.create_release(eg.editgroup_id, r2) r3 = ReleaseEntity(title="something else", withdrawn_status="boondogle", ext_ids=ReleaseExtIds()) - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.create_release(eg.editgroup_id, r3) r3.withdrawn_status = "spam" api.create_release(eg.editgroup_id, r3) diff --git a/python/tests/api_webcaptures.py b/python/tests/api_webcaptures.py index 7734398b..1054b41f 100644 --- a/python/tests/api_webcaptures.py +++ b/python/tests/api_webcaptures.py @@ -4,8 +4,8 @@ import pytest import datetime from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * @@ -155,7 +155,7 @@ def test_bad_webcapture(api): api.create_webcapture(eg.editgroup_id, good) for b in bad_list: - with pytest.raises(fatcat_client.rest.ApiException): + with pytest.raises(fatcat_openapi_client.rest.ApiException): api.create_webcapture(eg.editgroup_id, b) with pytest.raises(ValueError): diff --git a/python/tests/citation_efficiency.py b/python/tests/citation_efficiency.py index b447ca56..aefb7d15 100644 --- a/python/tests/citation_efficiency.py +++ b/python/tests/citation_efficiency.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/fixtures.py b/python/tests/fixtures.py index d958b5dc..78742114 100644 --- a/python/tests/fixtures.py +++ b/python/tests/fixtures.py @@ -6,9 +6,9 @@ import signal import pytest from dotenv import load_dotenv import fatcat_web -import fatcat_client +import fatcat_openapi_client -from fatcat_client import * +from fatcat_openapi_client import * from fatcat_tools import authenticated_api @pytest.fixture @@ -85,6 +85,6 @@ def test_get_changelog_entry(api): ## Helpers ################################################################## def quick_eg(api_inst): - eg = api_inst.create_editgroup(fatcat_client.Editgroup()) + eg = api_inst.create_editgroup(fatcat_openapi_client.Editgroup()) return eg diff --git a/python/tests/subentity_state.py b/python/tests/subentity_state.py index aca0379c..614f88f1 100644 --- a/python/tests/subentity_state.py +++ b/python/tests/subentity_state.py @@ -3,8 +3,8 @@ import json import pytest from copy import copy -from fatcat_client import * -from fatcat_client.rest import ApiException +from fatcat_openapi_client import * +from fatcat_openapi_client.rest import ApiException from fixtures import * """ diff --git a/python/tests/tools_api.py b/python/tests/tools_api.py index f9ccffb3..fd26b8ee 100644 --- a/python/tests/tools_api.py +++ b/python/tests/tools_api.py @@ -1,7 +1,7 @@ import pytest -from fatcat_client import EditgroupAnnotation -from fatcat_client.rest import ApiException +from fatcat_openapi_client import EditgroupAnnotation +from fatcat_openapi_client.rest import ApiException from fatcat_tools import public_api, authenticated_api diff --git a/python/tests/transform_csl.py b/python/tests/transform_csl.py index 9601f19b..6f29cba7 100644 --- a/python/tests/transform_csl.py +++ b/python/tests/transform_csl.py @@ -2,7 +2,7 @@ import json import pytest from fatcat_tools import * -from fatcat_client import * +from fatcat_openapi_client import * from fixtures import api from import_crossref import crossref_importer diff --git a/python/tests/transform_tests.py b/python/tests/transform_tests.py index c36137ba..5e657190 100644 --- a/python/tests/transform_tests.py +++ b/python/tests/transform_tests.py @@ -2,7 +2,7 @@ import json import pytest from fatcat_tools import * -from fatcat_client import * +from fatcat_openapi_client import * from fixtures import api from import_journal_metadata import journal_metadata_importer diff --git a/python/tests/web_auth.py b/python/tests/web_auth.py index b5839c6f..029803c3 100644 --- a/python/tests/web_auth.py +++ b/python/tests/web_auth.py @@ -2,7 +2,7 @@ import json import pytest import responses -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/web_citation_csl.py b/python/tests/web_citation_csl.py index 241f450f..3279ebea 100644 --- a/python/tests/web_citation_csl.py +++ b/python/tests/web_citation_csl.py @@ -2,7 +2,7 @@ import json import tempfile import pytest -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/web_editgroup.py b/python/tests/web_editgroup.py index 2ce90fcb..cbdd2176 100644 --- a/python/tests/web_editgroup.py +++ b/python/tests/web_editgroup.py @@ -1,7 +1,7 @@ import json import pytest -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * def test_editgroup_basics(app): diff --git a/python/tests/web_editing.py b/python/tests/web_editing.py index d69f18be..1ee20405 100644 --- a/python/tests/web_editing.py +++ b/python/tests/web_editing.py @@ -1,7 +1,7 @@ import json import pytest -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/web_editor.py b/python/tests/web_editor.py index de094488..2614be96 100644 --- a/python/tests/web_editor.py +++ b/python/tests/web_editor.py @@ -1,7 +1,7 @@ import json import pytest -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/web_entity_views.py b/python/tests/web_entity_views.py index 6bbd6848..6555eeeb 100644 --- a/python/tests/web_entity_views.py +++ b/python/tests/web_entity_views.py @@ -1,7 +1,7 @@ import json import pytest -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * from fatcat_web.forms import ReleaseEntityForm, FileEntityForm, ContainerEntityForm diff --git a/python/tests/web_routes.py b/python/tests/web_routes.py index 3af5369b..026776ee 100644 --- a/python/tests/web_routes.py +++ b/python/tests/web_routes.py @@ -1,7 +1,7 @@ import json import pytest -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * diff --git a/python/tests/web_search.py b/python/tests/web_search.py index 5828007d..bdd858d0 100644 --- a/python/tests/web_search.py +++ b/python/tests/web_search.py @@ -2,7 +2,7 @@ import json import pytest import responses -from fatcat_client.rest import ApiException +from fatcat_openapi_client.rest import ApiException from fixtures import * @responses.activate |