Skip to content

Commit df7f6de

Browse files
committed
fix passing of dataverse_id between different class functions in test_api.py
1 parent 4e7a878 commit df7f6de

1 file changed

Lines changed: 23 additions & 11 deletions

File tree

tests/test_api.py

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
from pyDataverse.api import Api
88
from pyDataverse.exceptions import ApiResponseError
99
from pyDataverse.exceptions import ApiUrlError
10-
from pyDataverse.utils import read_file_json
1110
from pyDataverse.utils import dict_to_json
12-
from pyDataverse.utils import json_to_dict
11+
from pyDataverse.utils import read_file_json
1312
import pytest
1413
from requests import Response
1514

@@ -66,6 +65,8 @@ def test_api_connect_base_url_wrong(self):
6665
class TestApiRequests(object):
6766
"""Test the api requests."""
6867

68+
dataset_id = None
69+
6970
@classmethod
7071
def setup_class(cls):
7172
"""Create the api connection for later use."""
@@ -80,7 +81,7 @@ def setup_class(cls):
8081
cls.api = Api(cls.base_url, cls.api_token)
8182
cls.dataverse_id = 'test-pyDataverse-3'
8283
cls.filename_dataverse = TEST_DIR+'/data/create_dataverse_3.json'
83-
cls.dataset_id = 'doi:10.5072/FK2/U6AEZM'
84+
cls.filename_dataset = TEST_DIR+'/data/create_dataset.json'
8485
assert cls.api
8586
assert cls.api_token
8687
assert cls.base_url
@@ -96,23 +97,34 @@ def test_make_get_request(self):
9697
def test_create_dataverse(self):
9798
"""Test successfull `.create_dataverse()` request`."""
9899
metadata = read_file_json(self.filename_dataverse)
99-
query_str = '/dataverses/{0}'.format(self.dataverse_id)
100-
resp = self.api.create_dataverse(query_str, dict_to_json(metadata))
100+
resp = self.api.create_dataverse(
101+
self.dataverse_id, dict_to_json(metadata))
101102
assert isinstance(resp, Response)
102103
assert self.api.get_dataverse(self.dataverse_id).json()
103104

104105
def test_get_dataverse(self):
105106
"""Test successfull `.get_dataverse()` request`."""
106-
query_str = '/dataverses/{0}'.format(self.dataverse_id)
107-
resp = self.api.get_dataverse(query_str)
107+
resp = self.api.get_dataverse(self.dataverse_id)
108+
assert isinstance(resp, Response)
109+
110+
def test_create_dataset(self):
111+
"""Test successfull `.create_dataset()` request`."""
112+
metadata = read_file_json(self.filename_dataset)
113+
resp = self.api.create_dataset(
114+
self.dataverse_id, dict_to_json(metadata))
115+
TestApiRequests.dataset_id = resp.json()['data']['persistentId']
108116
assert isinstance(resp, Response)
117+
global dataset_id
109118

110119
def test_get_dataset(self):
111120
"""Test successfull `.get_dataset()` request`."""
112-
query_str = '/datasets/:persistentId/?persistentId={0}'.format(
113-
self.dataset_id)
114-
resp = self.api.get_dataset(query_str)
115-
assert self.api.status == 'OK'
121+
print(self.dataset_id)
122+
resp = self.api.get_dataset(TestApiRequests.dataset_id)
123+
assert isinstance(resp, Response)
124+
125+
def test_delete_dataset(self):
126+
"""Test successfull `.delete_dataset()` request`."""
127+
resp = self.api.delete_dataset(TestApiRequests.dataset_id)
116128
assert isinstance(resp, Response)
117129

118130
def test_delete_dataverse(self):

0 commit comments

Comments
 (0)