Skip to content

Commit fab1a15

Browse files
committed
update test_versions.py
1 parent d4c413b commit fab1a15

1 file changed

Lines changed: 37 additions & 37 deletions

File tree

tests/test_api/test_versions.py

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ def dummy_task_fallback(dummy_task_v1, dummy_task_v2) -> DummyTaskV1API:
3434
return FallbackProxy(dummy_task_v2, dummy_task_v1)
3535

3636

37-
def _publish(resource):
37+
def test_v1_publish(dummy_task_v1, use_api_v1):
38+
resource = dummy_task_v1
3839
resource_name = resource.resource_type.value
3940
resource_files = {"description": "Resource Description File"}
4041
resource_id = 123
@@ -65,7 +66,8 @@ def _publish(resource):
6566
)
6667

6768

68-
def _delete(resource):
69+
def test_v1_delete(dummy_task_v1, use_api_v1):
70+
resource = dummy_task_v1
6971
resource_name = resource.resource_type.value
7072
resource_id = 123
7173

@@ -94,7 +96,9 @@ def _delete(resource):
9496
files=None,
9597
)
9698

97-
def _tag(resource):
99+
100+
def test_v1_tag(dummy_task_v1, use_api_v1):
101+
resource = dummy_task_v1
98102
resource_id = 123
99103
resource_tag = "TAG"
100104

@@ -130,7 +134,8 @@ def _tag(resource):
130134
)
131135

132136

133-
def _untag(resource):
137+
def test_v1_untag(dummy_task_v1, use_api_v1):
138+
resource = dummy_task_v1
134139
resource_id = 123
135140
resource_tag = "TAG"
136141

@@ -165,54 +170,49 @@ def _untag(resource):
165170
)
166171

167172

168-
169-
def test_v1_publish(dummy_task_v1, use_api_v1):
170-
_publish(dummy_task_v1)
171-
172-
173-
def test_v1_delete(dummy_task_v1, use_api_v1):
174-
_delete(dummy_task_v1)
175-
176-
177-
def test_v1_tag(dummy_task_v1, use_api_v1):
178-
_tag(dummy_task_v1)
179-
180-
181-
def test_v1_untag(dummy_task_v1, use_api_v1):
182-
_untag(dummy_task_v1)
183-
184-
185-
def test_v2_publish_not_supported(dummy_task_v2, use_api_v2):
173+
def test_v2_publish(dummy_task_v2, use_api_v2):
186174
with pytest.raises(OpenMLNotSupportedError):
187-
_publish(dummy_task_v2)
175+
dummy_task_v2.publish(path=None, files=None)
188176

189177

190-
def test_v2_delete_not_supported(dummy_task_v2, use_api_v2):
178+
def test_v2_delete(dummy_task_v2, use_api_v2):
191179
with pytest.raises(OpenMLNotSupportedError):
192-
_delete(dummy_task_v2)
180+
dummy_task_v2.delete(resource_id=None)
193181

194182

195-
def test_v2_tag_not_supported(dummy_task_v2, use_api_v2):
183+
def test_v2_tag(dummy_task_v2, use_api_v2):
196184
with pytest.raises(OpenMLNotSupportedError):
197-
_tag(dummy_task_v2)
185+
dummy_task_v2.tag(resource_id=None, tag=None)
198186

199187

200-
def test_v2_untag_not_supported(dummy_task_v2, use_api_v2):
188+
def test_v2_untag(dummy_task_v2, use_api_v2):
201189
with pytest.raises(OpenMLNotSupportedError):
202-
_untag(dummy_task_v2)
190+
dummy_task_v2.untag(resource_id=None, tag=None)
203191

204192

205-
def test_fallback_publish(dummy_task_fallback, use_api_v1):
206-
_publish(dummy_task_fallback)
193+
def test_fallback_publish(dummy_task_fallback):
194+
with patch.object(ResourceV1API, "publish") as mock_publish:
195+
mock_publish.return_value = None
196+
dummy_task_fallback.publish(path=None, files=None)
197+
mock_publish.assert_called_once_with(path=None, files=None)
207198

208199

209-
def test_fallback_delete(dummy_task_fallback, use_api_v1):
210-
_delete(dummy_task_fallback)
200+
def test_fallback_delete(dummy_task_fallback):
201+
with patch.object(ResourceV1API, "delete") as mock_delete:
202+
mock_delete.return_value = None
203+
dummy_task_fallback.delete(resource_id=None)
204+
mock_delete.assert_called_once_with(resource_id=None)
211205

212206

213-
def test_fallback_tag(dummy_task_fallback, use_api_v1):
214-
_tag(dummy_task_fallback)
207+
def test_fallback_tag(dummy_task_fallback):
208+
with patch.object(ResourceV1API, "tag") as mock_tag:
209+
mock_tag.return_value = None
210+
dummy_task_fallback.tag(resource_id=None, tag=None)
211+
mock_tag.assert_called_once_with(resource_id=None, tag=None)
215212

216213

217-
def test_fallback_untag(dummy_task_fallback, use_api_v1):
218-
_untag(dummy_task_fallback)
214+
def test_fallback_untag(dummy_task_fallback):
215+
with patch.object(ResourceV1API, "untag") as mock_untag:
216+
mock_untag.return_value = None
217+
dummy_task_fallback.untag(resource_id=None, tag=None)
218+
mock_untag.assert_called_once_with(resource_id=None, tag=None)

0 commit comments

Comments
 (0)