Skip to content

Commit e6b0ba1

Browse files
authored
chore: pytestify task_request (#1726)
Co-authored-by: Jordan Woods <13803242+jorwoods@users.noreply.github.com>
1 parent 19aaa33 commit e6b0ba1

File tree

1 file changed

+56
-42
lines changed

1 file changed

+56
-42
lines changed
Lines changed: 56 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,61 @@
1-
import unittest
21
import xml.etree.ElementTree as ET
32
from unittest.mock import Mock
3+
4+
import pytest
5+
46
from tableauserverclient.server.request_factory import TaskRequest
57

68

7-
class TestTaskRequest(unittest.TestCase):
8-
def setUp(self):
9-
self.task_request = TaskRequest()
10-
self.xml_request = ET.Element("tsRequest")
11-
12-
def test_refresh_req_default(self):
13-
result = self.task_request.refresh_req()
14-
self.assertEqual(result, ET.tostring(self.xml_request))
15-
16-
def test_refresh_req_incremental(self):
17-
with self.assertRaises(ValueError):
18-
self.task_request.refresh_req(incremental=True)
19-
20-
def test_refresh_req_with_parent_srv_version_3_25(self):
21-
parent_srv = Mock()
22-
parent_srv.check_at_least_version.return_value = True
23-
result = self.task_request.refresh_req(incremental=True, parent_srv=parent_srv)
24-
expected_xml = ET.Element("tsRequest")
25-
task_element = ET.SubElement(expected_xml, "extractRefresh")
26-
task_element.attrib["incremental"] = "true"
27-
self.assertEqual(result, ET.tostring(expected_xml))
28-
29-
def test_refresh_req_with_parent_srv_version_3_25_non_incremental(self):
30-
parent_srv = Mock()
31-
parent_srv.check_at_least_version.return_value = True
32-
result = self.task_request.refresh_req(incremental=False, parent_srv=parent_srv)
33-
expected_xml = ET.Element("tsRequest")
34-
ET.SubElement(expected_xml, "extractRefresh")
35-
self.assertEqual(result, ET.tostring(expected_xml))
36-
37-
def test_refresh_req_with_parent_srv_version_below_3_25(self):
38-
parent_srv = Mock()
39-
parent_srv.check_at_least_version.return_value = False
40-
with self.assertRaises(ValueError):
41-
self.task_request.refresh_req(incremental=True, parent_srv=parent_srv)
42-
43-
def test_refresh_req_with_parent_srv_version_below_3_25_non_incremental(self):
44-
parent_srv = Mock()
45-
parent_srv.check_at_least_version.return_value = False
46-
result = self.task_request.refresh_req(incremental=False, parent_srv=parent_srv)
47-
self.assertEqual(result, ET.tostring(self.xml_request))
9+
@pytest.fixture
10+
def task_request() -> TaskRequest:
11+
return TaskRequest()
12+
13+
14+
@pytest.fixture
15+
def xml_request() -> ET.Element:
16+
return ET.Element("tsRequest")
17+
18+
19+
def test_refresh_req_default(task_request: TaskRequest, xml_request: ET.Element) -> None:
20+
result = task_request.refresh_req()
21+
assert result == ET.tostring(xml_request)
22+
23+
24+
def test_refresh_req_incremental(task_request: TaskRequest) -> None:
25+
with pytest.raises(ValueError):
26+
task_request.refresh_req(incremental=True)
27+
28+
29+
def test_refresh_req_with_parent_srv_version_3_25(task_request: TaskRequest) -> None:
30+
parent_srv = Mock()
31+
parent_srv.check_at_least_version.return_value = True
32+
result = task_request.refresh_req(incremental=True, parent_srv=parent_srv)
33+
expected_xml = ET.Element("tsRequest")
34+
task_element = ET.SubElement(expected_xml, "extractRefresh")
35+
task_element.attrib["incremental"] = "true"
36+
assert result == ET.tostring(expected_xml)
37+
38+
39+
def test_refresh_req_with_parent_srv_version_3_25_non_incremental(task_request: TaskRequest) -> None:
40+
parent_srv = Mock()
41+
parent_srv.check_at_least_version.return_value = True
42+
result = task_request.refresh_req(incremental=False, parent_srv=parent_srv)
43+
expected_xml = ET.Element("tsRequest")
44+
ET.SubElement(expected_xml, "extractRefresh")
45+
assert result == ET.tostring(expected_xml)
46+
47+
48+
def test_refresh_req_with_parent_srv_version_below_3_25(task_request: TaskRequest) -> None:
49+
parent_srv = Mock()
50+
parent_srv.check_at_least_version.return_value = False
51+
with pytest.raises(ValueError):
52+
task_request.refresh_req(incremental=True, parent_srv=parent_srv)
53+
54+
55+
def test_refresh_req_with_parent_srv_version_below_3_25_non_incremental(
56+
task_request: TaskRequest, xml_request: ET.Element
57+
) -> None:
58+
parent_srv = Mock()
59+
parent_srv.check_at_least_version.return_value = False
60+
result = task_request.refresh_req(incremental=False, parent_srv=parent_srv)
61+
assert result == ET.tostring(xml_request)

0 commit comments

Comments
 (0)