Skip to content

Commit 04b7e8f

Browse files
committed
"assignment_info" => "assignment"
1 parent aefbbc5 commit 04b7e8f

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

codePost_api/helpers.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def get_course_roster_by_name(course_name, course_period, api_key=None):
171171
return course_info
172172

173173
@_util.api_key_decorator()
174-
def get_assignment_info_by_id(assignment_id, api_key=None):
174+
def get_assignment_by_id(assignment_id, api_key=None):
175175
"""
176176
Returns the assignment information dictionary, given the assignment's ID.
177177
"""
@@ -192,14 +192,14 @@ def get_assignment_info_by_id(assignment_id, api_key=None):
192192
except Exception as exc:
193193
raise RuntimeError(
194194
"""
195-
get_assignment_info_by_id: Unexpected exception while retrieving the
195+
get_assignment_by_id: Unexpected exception while retrieving the
196196
assignment info from the provided id ({: d}):
197197
{}
198198
""".format(assignment_id, exc)
199199
)
200200

201201
@_util.api_key_decorator()
202-
def get_assignment_info_by_name(course_name, course_period, assignment_name, api_key=None):
202+
def get_assignment_by_name(course_name, course_period, assignment_name, api_key=None):
203203
"""
204204
Returns the assignment information dictionary, given a(course name, course period,
205205
assignment name) tuple. This contains, in particular, the ID of the assignment that
@@ -218,7 +218,7 @@ def get_assignment_info_by_name(course_name, course_period, assignment_name, api
218218
if len(courses) == 0:
219219
raise RuntimeError(
220220
"""
221-
get_assignment_info_by_name: Either no course with the
221+
get_assignment_by_name: Either no course with the
222222
specified course({}) and period({}) exists, or the provided
223223
API key({:.5}...) does not have access to it.
224224
""".format(course_name, course_period,
@@ -228,7 +228,7 @@ def get_assignment_info_by_name(course_name, course_period, assignment_name, api
228228
elif len(courses) > 1:
229229
raise RuntimeError(
230230
"""
231-
get_assignment_info_by_name: Request the provided course
231+
get_assignment_by_name: Request the provided course
232232
name({}) and period({}) resulted in more than one result({}).
233233
""".format(course_name, course_period, len(courses))
234234
)
@@ -245,7 +245,7 @@ def get_assignment_info_by_name(course_name, course_period, assignment_name, api
245245
try:
246246
for aid in assignments:
247247

248-
ret = get_assignment_info_by_id(assignment_id=aid, api_key=api_key)
248+
ret = get_assignment_by_id(assignment_id=aid, api_key=api_key)
249249

250250
if ret.get("name") == assignment_name:
251251
selected_assignment = ret
@@ -255,7 +255,7 @@ def get_assignment_info_by_name(course_name, course_period, assignment_name, api
255255

256256
raise RuntimeError(
257257
"""
258-
get_assignment_info_by_name: Unexpected exception while listing the
258+
get_assignment_by_name: Unexpected exception while listing the
259259
available assignments and searching for '{}' in course '{}', period
260260
'{}':
261261
{}
@@ -832,11 +832,11 @@ def get_course_grades(course_name, course_period, only_finalized=True, api_key=N
832832
# u'points': 20,
833833
# u'rubricCategories': [519, 640, 641, 642, 643, 644, 645],
834834
# u'sortKey': 1}
835-
assignment_info = get_assignment_info_by_id(
835+
assignment = get_assignment_by_id(
836836
api_key=api_key,
837837
assignment_id=aid)
838838

839-
assignment_name = assignment_info["name"]
839+
assignment_name = assignment["name"]
840840

841841
# Submission object:
842842
# {u'assignment': 92,

tests/test_helpers.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ def test_get_course_roster_by_name_course_conflict(mock_get_available_courses):
161161
course_period="S2019")
162162
)
163163
#############################################################################
164-
# Function tested: helpers.get_assignment_info_by_id
164+
# Function tested: helpers.get_assignment_by_id
165165
# Notes:
166166
#
167167
#############################################################################
168168
@patch('codePost_api.helpers._requests.get')
169-
def test_get_assignment_info_by_id(mock_get):
169+
def test_get_assignment_by_id(mock_get):
170170
assignment = {'id': 1}
171171

172172
mock_get.return_value.status_code = 200
@@ -176,32 +176,32 @@ def test_get_assignment_info_by_id(mock_get):
176176
_assert.assertEqual(assignment, response)
177177

178178
#############################################################################
179-
# Function tested: helpers.get_assignment_info_by_name
179+
# Function tested: helpers.get_assignment_by_name
180180
# Notes:
181181
#
182182
#############################################################################
183-
@patch('codePost_api.helpers.get_assignment_info_by_id')
183+
@patch('codePost_api.helpers.get_assignment_by_id')
184184
@patch('codePost_api.helpers.get_available_courses')
185-
def test_get_assignment_info_by_name(mock_get_available_courses, mock_get_assignment_info_by_id):
185+
def test_get_assignment_by_name(mock_get_available_courses, mock_get_assignment_by_id):
186186

187187
# mock get_available_courses
188188
course2 = {'id' : 2, 'name' : 'COS226', 'period' : 'S2019', 'assignments': [3,4,5]}
189189
mock_get_available_courses.return_value = [course2]
190190

191-
# mock get_assignment_info_by_id
191+
# mock get_assignment_by_id
192192
def side_effect(api_key, assignment_id):
193193
return {
194194
'id': assignment_id,
195195
'name': 'assignment-%d' % assignment_id,
196196
}
197197

198-
mock_get_assignment_info_by_id.side_effect = side_effect
199-
response = helpers.get_assignment_info_by_name('COS226', 'S2019', 'assignment-4', api_key=TEST_API_KEY)
198+
mock_get_assignment_by_id.side_effect = side_effect
199+
response = helpers.get_assignment_by_name('COS226', 'S2019', 'assignment-4', api_key=TEST_API_KEY)
200200

201201
_assert.assertEqual({'id': 4, 'name' : 'assignment-4'}, response)
202202

203203
@patch('codePost_api.helpers.get_available_courses')
204-
def test_get_assignment_info_by_name_course_conflict(mock_get_available_courses):
204+
def test_get_assignment_by_name_course_conflict(mock_get_available_courses):
205205

206206
# mock get_available_courses
207207
course1 = {"id" : 1, "name" : "COS126", "period" : "S2019", "assignments": [1,2]}
@@ -211,23 +211,23 @@ def test_get_assignment_info_by_name_course_conflict(mock_get_available_courses)
211211
_assert.assertRaises(
212212
RuntimeError,
213213
lambda:
214-
helpers.get_assignment_info_by_name(
214+
helpers.get_assignment_by_name(
215215
api_key=TEST_API_KEY,
216216
course_name="COS226",
217217
course_period="S2019",
218218
assignment_name="test-assignment")
219219
)
220220

221221
@patch('codePost_api.helpers.get_available_courses')
222-
def test_get_assignment_info_by_name_no_course(mock_get_available_courses):
222+
def test_get_assignment_by_name_no_course(mock_get_available_courses):
223223

224224
# mock get_available_courses
225225
mock_get_available_courses.return_value = []
226226

227227
_assert.assertRaises(
228228
RuntimeError,
229229
lambda:
230-
helpers.get_assignment_info_by_name(
230+
helpers.get_assignment_by_name(
231231
api_key=TEST_API_KEY,
232232
course_name='COS226',
233233
course_period='S2019',
@@ -470,7 +470,7 @@ def test_submission_list_is_unclaimed():
470470
#
471471
#############################################################################
472472
@patch('codePost_api.helpers.get_assignment_submissions')
473-
@patch('codePost_api.helpers.get_assignment_info_by_id')
473+
@patch('codePost_api.helpers.get_assignment_by_id')
474474
@patch('codePost_api.helpers.get_course_roster_by_name')
475475
def test_get_course_grades(mock_roster, mock_assignment, mock_submissions):
476476
roster = {
@@ -483,7 +483,7 @@ def test_get_course_grades(mock_roster, mock_assignment, mock_submissions):
483483
mock_roster.return_value.status_code = 200
484484
mock_roster.return_value = roster
485485

486-
# mock get_assignment_info_by_id
486+
# mock get_assignment_by_id
487487
def side_effect(api_key, assignment_id):
488488
return {
489489
'id': assignment_id,

0 commit comments

Comments
 (0)