Skip to content

Commit dd10c7b

Browse files
author
adam-t-shaw
committed
Formatting
1 parent 5a66444 commit dd10c7b

5 files changed

Lines changed: 36 additions & 74 deletions

File tree

‎tests/sample_data.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@
3333

3434
test_project = json.loads('''{"name": "Test_Project_Name",
3535
"description": "This is a test project"
36-
}'''
37-
)
36+
}''')

‎tests/test_challenge_api.py‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ def test_create_virtual_challenge(self, mock_request, api_instance=api):
6868
mock_request.assert_called_once_with(
6969
f'{self.url}/virtualchallenge',
7070
json=test_challenge_model,
71-
params=None
72-
)
71+
params=None)
7372

7473
@patch('maproulette.api.maproulette_server.requests.Session.get')
7574
def test_get_challenge_by_name(self, mock_request, api_instance=api):
@@ -78,17 +77,15 @@ def test_get_challenge_by_name(self, mock_request, api_instance=api):
7877
api_instance.get_challenge_by_name(test_project_id, test_challenge_name)
7978
mock_request.assert_called_once_with(
8079
f'{self.url}/project/{test_project_id}/challenge/{test_challenge_name}',
81-
params=None
82-
)
80+
params=None)
8381

8482
@patch('maproulette.api.maproulette_server.requests.Session.get')
8583
def test_get_virtual_challenge_by_id(self, mock_request, api_instance=api):
8684
test_virtual_challenge_id = '12345'
8785
api_instance.get_virtual_challenge_by_id(test_virtual_challenge_id)
8886
mock_request.assert_called_once_with(
8987
f'{self.url}/virtualchallenge/{test_virtual_challenge_id}',
90-
params=None
91-
)
88+
params=None)
9289

9390
@patch('maproulette.api.maproulette_server.requests.Session.get')
9491
def test_get_challenge_listing(self, mock_request, api_instance=api):
@@ -126,8 +123,7 @@ def test_extract_challenge_comments(self, mock_request, api_instance=api):
126123
mock_request.assert_called_once_with(
127124
f'{self.url}/challenge/{test_challenge_id}/comments/extract',
128125
params={'limit': '10',
129-
'page': '0'}
130-
)
126+
'page': '0'})
131127

132128
@patch('maproulette.api.maproulette_server.requests.Session.get')
133129
def test_extract_task_summaries(self, mock_request, api_instance=api):
@@ -141,8 +137,7 @@ def test_extract_task_summaries(self, mock_request, api_instance=api):
141137
'reviewStatus': '',
142138
'priority': '',
143139
'exportProperties': '',
144-
'taskPropertySearch': ''}
145-
)
140+
'taskPropertySearch': ''})
146141

147142
@patch('maproulette.api.maproulette_server.requests.Session.get')
148143
def test_get_challenge_geojson(self, mock_request, api_instance=api):
@@ -153,8 +148,7 @@ def test_get_challenge_geojson(self, mock_request, api_instance=api):
153148
params={'status': '',
154149
'reviewStatus': '',
155150
'priority': '',
156-
'taskPropertySearch': ''}
157-
)
151+
'taskPropertySearch': ''})
158152

159153
@patch('maproulette.api.maproulette_server.requests.Session.put')
160154
def test_update_task_priorities(self, mock_request, api_instance=api):
@@ -163,8 +157,7 @@ def test_update_task_priorities(self, mock_request, api_instance=api):
163157
mock_request.assert_called_once_with(
164158
f'{self.url}/challenge/{test_challenge_id}/updateTaskPriorities',
165159
json=None,
166-
params=None
167-
)
160+
params=None)
168161

169162
@patch('maproulette.api.maproulette_server.requests.Session.put')
170163
def test_reset_task_instructions(self, mock_request, api_instance=api):
@@ -173,26 +166,23 @@ def test_reset_task_instructions(self, mock_request, api_instance=api):
173166
mock_request.assert_called_once_with(
174167
f'{self.url}/challenge/{test_challenge_id}/resetTaskInstructions',
175168
json=None,
176-
params=None
177-
)
169+
params=None)
178170

179171
@patch('maproulette.api.maproulette_server.requests.Session.delete')
180172
def test_delete_challenge(self, mock_request, api_instance=api):
181173
test_challenge_id = '12345'
182174
api_instance.delete_challenge(test_challenge_id)
183175
mock_request.assert_called_once_with(
184176
f'{self.url}/challenge/{test_challenge_id}',
185-
params={'immediate': 'false'}
186-
)
177+
params={'immediate': 'false'})
187178

188179
@patch('maproulette.api.maproulette_server.requests.Session.delete')
189180
def test_delete_challenge_tasks(self, mock_request, api_instance=api):
190181
test_challenge_id = '12345'
191182
api_instance.delete_challenge_tasks(test_challenge_id)
192183
mock_request.assert_called_once_with(
193184
f'{self.url}/challenge/{test_challenge_id}/tasks',
194-
params={'statusFilters': ''}
195-
)
185+
params={'statusFilters': ''})
196186

197187
@patch('maproulette.api.maproulette_server.requests.Session.put')
198188
def test_update_challenge(self, mock_request, api_instance=api):
@@ -205,5 +195,4 @@ def test_update_challenge(self, mock_request, api_instance=api):
205195
mock_request.assert_called_once_with(
206196
f'{self.url}/challenge/{test_challenge_id}',
207197
json=json.loads(create_challenge_output),
208-
params=None
209-
)
198+
params=None)

‎tests/test_project_api.py‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ def test_get_project_by_id(self, mock_request, api_instance=api):
1616
api_instance.get_project_by_id(test_project_id)
1717
mock_request.assert_called_once_with(
1818
f'{self.url}/project/{test_project_id}',
19-
params=None
20-
)
19+
params=None)
2120

2221
@patch('maproulette.api.maproulette_server.requests.Session.get')
2322
def test_get_project_by_name(self, mock_request, api_instance=api):
2423
test_project_name = 'Maptime!'
2524
api_instance.get_project_by_name(test_project_name)
2625
mock_request.assert_called_once_with(
2726
f'{self.url}/projectByName/{test_project_name}',
28-
params=None
29-
)
27+
params=None)
3028

3129
@patch('maproulette.api.maproulette_server.requests.Session.get')
3230
def test_find_project(self, mock_request, api_instance=api):
@@ -37,9 +35,7 @@ def test_find_project(self, mock_request, api_instance=api):
3735
params={'search': test_search,
3836
'limit': '10',
3937
'page': '0',
40-
'onlyEnabled': 'true'
41-
}
42-
)
38+
'onlyEnabled': 'true'})
4339

4440
@patch('maproulette.api.maproulette_server.requests.Session.get')
4541
def test_get_project_challenges(self, mock_request, api_instance=api):
@@ -48,8 +44,7 @@ def test_get_project_challenges(self, mock_request, api_instance=api):
4844
mock_request.assert_called_once_with(
4945
f'{self.url}/project/{test_project_id}/challenges',
5046
params={'limit': '10',
51-
'page': '0'}
52-
)
47+
'page': '0'})
5348

5449
@patch('maproulette.api.maproulette_server.requests.Session.post')
5550
def test_create_project(self, mock_request, api_instance=api):
@@ -59,8 +54,7 @@ def test_create_project(self, mock_request, api_instance=api):
5954
mock_request.assert_called_once_with(
6055
f'{self.url}/project',
6156
json=test_project,
62-
params=None
63-
)
57+
params=None)
6458

6559
@patch('maproulette.api.maproulette_server.requests.Session.post')
6660
def test_add_challenge_to_project(self, mock_request, api_instance=api):
@@ -74,8 +68,7 @@ def test_add_challenge_to_project(self, mock_request, api_instance=api):
7468
mock_request.assert_called_once_with(
7569
f'{self.url}/project/{test_virtual_project_id}/challenge/{test_challenge_id}/add',
7670
json=None,
77-
params=None
78-
)
71+
params=None)
7972

8073
@patch('maproulette.api.maproulette_server.requests.Session.post')
8174
def test_remove_challenge_from_project(self, mock_request, api_instance=api):
@@ -88,8 +81,7 @@ def test_remove_challenge_from_project(self, mock_request, api_instance=api):
8881
mock_request.assert_called_once_with(
8982
f'{self.url}/project/{test_virtual_project_id}/challenge/{test_challenge_id}/remove',
9083
json=None,
91-
params=None
92-
)
84+
params=None)
9385

9486
@patch('maproulette.api.maproulette_server.requests.Session.delete')
9587
def test_delete_project(self, mock_request, api_instance=api):
@@ -98,8 +90,7 @@ def test_delete_project(self, mock_request, api_instance=api):
9890
api_instance.delete_project(test_project_id)
9991
mock_request.assert_called_once_with(
10092
f'{self.url}/project/{test_project_id}',
101-
params=None
102-
)
93+
params=None)
10394

10495
@patch('maproulette.api.maproulette_server.requests.Session.put')
10596
def test_update_project(self, mock_request, api_instance=api):
@@ -111,17 +102,15 @@ def test_update_project(self, mock_request, api_instance=api):
111102
mock_request.assert_called_once_with(
112103
f'{self.url}/project/{test_project_model_id}',
113104
json={'name': test_updated_project_name},
114-
params=None
115-
)
105+
params=None)
116106

117107
@patch('maproulette.api.maproulette_server.requests.Session.get')
118108
def test_get_project_by_ids(self, mock_request, api_instance=api):
119109
test_project_ids = '1234,2468,1356'
120110
api_instance.get_projects_by_ids(test_project_ids)
121111
mock_request.assert_called_once_with(
122112
f'{self.url}/projectsById',
123-
params={'projectIds': test_project_ids}
124-
)
113+
params={'projectIds': test_project_ids})
125114

126115
@patch('maproulette.api.maproulette_server.requests.Session.get')
127116
def test_get_random_tasks(self, mock_request, api_instance=api):
@@ -133,5 +122,4 @@ def test_get_random_tasks(self, mock_request, api_instance=api):
133122
f'{self.url}/project/{test_project_id}/tasks',
134123
params={'limit': '1',
135124
'proximity': '-1',
136-
'search': ''}
137-
)
125+
'search': ''})

‎tests/test_task_api.py‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ def test_get_task_by_id(self, mock_request, api_instance=api):
1616
api_instance.get_task_by_id(test_task_id)
1717
mock_request.assert_called_once_with(
1818
f'{self.url}/task/{test_task_id}',
19-
params=None
20-
)
19+
params=None)
2120

2221
@patch('maproulette.api.maproulette_server.requests.Session.get')
2322
def test_get_task_history(self, mock_request, api_instance=api):
2423
test_task_id = '42914448'
2524
api_instance.get_task_history(test_task_id)
2625
mock_request.assert_called_once_with(
2726
f'{self.url}/task/{test_task_id}/history',
28-
params=None
29-
)
27+
params=None)
3028

3129
@patch('maproulette.api.maproulette_server.requests.Session.post')
3230
def test_create_tasks(self, mock_request, api_instance=api):
@@ -45,8 +43,7 @@ def test_create_tasks(self, mock_request, api_instance=api):
4543
mock_request.assert_called_once_with(
4644
f'{self.url}/tasks',
4745
json=input_json_list,
48-
params=None
49-
)
46+
params=None)
5047

5148
@patch('maproulette.api.maproulette_server.requests.Session.put')
5249
def test_update_tasks(self, mock_request, api_instance=api):
@@ -58,8 +55,7 @@ def test_update_tasks(self, mock_request, api_instance=api):
5855
mock_request.assert_called_once_with(
5956
f'{self.url}/tasks',
6057
json=test_task_model,
61-
params=None
62-
)
58+
params=None)
6359

6460

6561
@patch('maproulette.api.maproulette_server.requests.Session.get')
@@ -68,8 +64,7 @@ def test_get_task_tags(self, mock_request, api_instance=api):
6864
api_instance.get_task_tags(test_task_id)
6965
mock_request.assert_called_once_with(
7066
f'{self.url}/task/{test_task_id}/tags',
71-
params=None
72-
)
67+
params=None)
7368

7469
@patch('maproulette.api.maproulette_server.requests.Session.delete')
7570
def test_delete_task_tags(self, mock_request, api_instance=api):
@@ -78,8 +73,7 @@ def test_delete_task_tags(self, mock_request, api_instance=api):
7873
api_instance.delete_task_tags(task_id, tags)
7974
mock_request.assert_called_once_with(
8075
f'{self.url}/task/{task_id}/tags',
81-
params={'tags': tags}
82-
)
76+
params={'tags': tags})
8377

8478
@patch('maproulette.api.maproulette_server.requests.Session.get')
8579
def test_get_tasks_by_tags(self, mock_request, api_instance=api):
@@ -89,8 +83,7 @@ def test_get_tasks_by_tags(self, mock_request, api_instance=api):
8983
f'{self.url}/tasks/tags',
9084
params={'tags': tags,
9185
'limit': '10',
92-
'page': '0'}
93-
)
86+
'page': '0'})
9487

9588
@patch('maproulette.api.maproulette_server.requests.Session.get')
9689
def test_update_task_tags(self, mock_request, api_instance=api):
@@ -99,8 +92,7 @@ def test_update_task_tags(self, mock_request, api_instance=api):
9992
api_instance.update_task_tags(task_id, tags)
10093
mock_request.assert_called_once_with(
10194
f'{self.url}/task/{task_id}/tags/update',
102-
params={'tags': tags}
103-
)
95+
params={'tags': tags})
10496

10597
@patch('maproulette.api.maproulette_server.requests.Session.put')
10698
def test_update_task_status(self, mock_request, api_instance=api):
@@ -112,17 +104,15 @@ def test_update_task_status(self, mock_request, api_instance=api):
112104
params={'comment': 'None',
113105
'tags': 'None',
114106
'requestReview': 'None'},
115-
json=None
116-
)
107+
json=None)
117108

118109
@patch('maproulette.api.maproulette_server.requests.Session.get')
119110
def test_get_task_comments(self, mock_request, api_instance=api):
120111
task_id = '42914448'
121112
api_instance.get_task_comments(task_id)
122113
mock_request.assert_called_once_with(
123114
f'{self.url}/task/{task_id}/comments',
124-
params=None
125-
)
115+
params=None)
126116

127117
def test_batch_generator(self, api_instance=api):
128118

‎tests/test_user_api.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ def test_find_user_by_username(self, mock_request, api_instance=api):
1616
mock_request.assert_called_once_with(
1717
f'{self.url}/users/find/{test_username}',
1818
params={'limit': '10',
19-
'page': '0'
20-
}
21-
)
19+
'page': '0'})
2220

2321
@patch('maproulette.api.maproulette_server.requests.Session.post')
2422
def test_add_user_to_project(self, mock_request, api_instance=api):
@@ -32,8 +30,7 @@ def test_add_user_to_project(self, mock_request, api_instance=api):
3230
mock_request.assert_called_once_with(
3331
f'{self.url}/user/{test_user_id}/project/{test_project_id}/{test_group}',
3432
json=None,
35-
params={'isOSMUserId': 'true'}
36-
)
33+
params={'isOSMUserId': 'true'})
3734

3835
@patch('maproulette.api.maproulette_server.requests.Session.put')
3936
def test_add_user_list_to_project(self, mock_request, api_instance=api):
@@ -47,5 +44,4 @@ def test_add_user_list_to_project(self, mock_request, api_instance=api):
4744
mock_request.assert_called_once_with(
4845
f'{self.url}/user/project/{test_project_id}/{test_group}',
4946
params={'isOSMUserId': 'true'},
50-
json=test_user_ids
51-
)
47+
json=test_user_ids)

0 commit comments

Comments
 (0)