Merge pull request #209 from edx/cale/pep8-fixes
Cleanup pep8 violations in test_correctmap.py
This commit is contained in:
@@ -1,31 +1,44 @@
|
||||
"""
|
||||
Tests to verify that CorrectMap behaves correctly
|
||||
"""
|
||||
|
||||
import unittest
|
||||
from capa.correctmap import CorrectMap
|
||||
import datetime
|
||||
|
||||
|
||||
class CorrectMapTest(unittest.TestCase):
|
||||
"""
|
||||
Tests to verify that CorrectMap behaves correctly
|
||||
"""
|
||||
|
||||
def setUp(self):
|
||||
self.cmap = CorrectMap()
|
||||
|
||||
def test_set_input_properties(self):
|
||||
|
||||
# Set the correctmap properties for two inputs
|
||||
self.cmap.set(answer_id='1_2_1',
|
||||
correctness='correct',
|
||||
npoints=5,
|
||||
msg='Test message',
|
||||
hint='Test hint',
|
||||
hintmode='always',
|
||||
queuestate={'key':'secretstring',
|
||||
'time':'20130228100026'})
|
||||
self.cmap.set(
|
||||
answer_id='1_2_1',
|
||||
correctness='correct',
|
||||
npoints=5,
|
||||
msg='Test message',
|
||||
hint='Test hint',
|
||||
hintmode='always',
|
||||
queuestate={
|
||||
'key': 'secretstring',
|
||||
'time': '20130228100026'
|
||||
}
|
||||
)
|
||||
|
||||
self.cmap.set(answer_id='2_2_1',
|
||||
correctness='incorrect',
|
||||
npoints=None,
|
||||
msg=None,
|
||||
hint=None,
|
||||
hintmode=None,
|
||||
queuestate=None)
|
||||
self.cmap.set(
|
||||
answer_id='2_2_1',
|
||||
correctness='incorrect',
|
||||
npoints=None,
|
||||
msg=None,
|
||||
hint=None,
|
||||
hintmode=None,
|
||||
queuestate=None
|
||||
)
|
||||
|
||||
# Assert that each input has the expected properties
|
||||
self.assertTrue(self.cmap.is_correct('1_2_1'))
|
||||
@@ -62,7 +75,6 @@ class CorrectMapTest(unittest.TestCase):
|
||||
self.assertFalse(self.cmap.is_right_queuekey('2_2_1', ''))
|
||||
self.assertFalse(self.cmap.is_right_queuekey('2_2_1', None))
|
||||
|
||||
|
||||
def test_get_npoints(self):
|
||||
# Set the correctmap properties for 4 inputs
|
||||
# 1) correct, 5 points
|
||||
@@ -70,25 +82,35 @@ class CorrectMapTest(unittest.TestCase):
|
||||
# 3) incorrect, 5 points
|
||||
# 4) incorrect, None points
|
||||
# 5) correct, 0 points
|
||||
self.cmap.set(answer_id='1_2_1',
|
||||
correctness='correct',
|
||||
npoints=5)
|
||||
self.cmap.set(
|
||||
answer_id='1_2_1',
|
||||
correctness='correct',
|
||||
npoints=5
|
||||
)
|
||||
|
||||
self.cmap.set(answer_id='2_2_1',
|
||||
correctness='correct',
|
||||
npoints=None)
|
||||
self.cmap.set(
|
||||
answer_id='2_2_1',
|
||||
correctness='correct',
|
||||
npoints=None
|
||||
)
|
||||
|
||||
self.cmap.set(answer_id='3_2_1',
|
||||
correctness='incorrect',
|
||||
npoints=5)
|
||||
self.cmap.set(
|
||||
answer_id='3_2_1',
|
||||
correctness='incorrect',
|
||||
npoints=5
|
||||
)
|
||||
|
||||
self.cmap.set(answer_id='4_2_1',
|
||||
correctness='incorrect',
|
||||
npoints=None)
|
||||
self.cmap.set(
|
||||
answer_id='4_2_1',
|
||||
correctness='incorrect',
|
||||
npoints=None
|
||||
)
|
||||
|
||||
self.cmap.set(answer_id='5_2_1',
|
||||
correctness='correct',
|
||||
npoints=0)
|
||||
self.cmap.set(
|
||||
answer_id='5_2_1',
|
||||
correctness='correct',
|
||||
npoints=0
|
||||
)
|
||||
|
||||
# Assert that we get the expected points
|
||||
# If points assigned --> npoints
|
||||
@@ -100,7 +122,6 @@ class CorrectMapTest(unittest.TestCase):
|
||||
self.assertEqual(self.cmap.get_npoints('4_2_1'), 0)
|
||||
self.assertEqual(self.cmap.get_npoints('5_2_1'), 0)
|
||||
|
||||
|
||||
def test_set_overall_message(self):
|
||||
|
||||
# Default is an empty string string
|
||||
@@ -118,14 +139,18 @@ class CorrectMapTest(unittest.TestCase):
|
||||
|
||||
def test_update_from_correctmap(self):
|
||||
# Initialize a CorrectMap with some properties
|
||||
self.cmap.set(answer_id='1_2_1',
|
||||
correctness='correct',
|
||||
npoints=5,
|
||||
msg='Test message',
|
||||
hint='Test hint',
|
||||
hintmode='always',
|
||||
queuestate={'key':'secretstring',
|
||||
'time':'20130228100026'})
|
||||
self.cmap.set(
|
||||
answer_id='1_2_1',
|
||||
correctness='correct',
|
||||
npoints=5,
|
||||
msg='Test message',
|
||||
hint='Test hint',
|
||||
hintmode='always',
|
||||
queuestate={
|
||||
'key': 'secretstring',
|
||||
'time': '20130228100026'
|
||||
}
|
||||
)
|
||||
|
||||
self.cmap.set_overall_message("Test message")
|
||||
|
||||
@@ -133,14 +158,17 @@ class CorrectMapTest(unittest.TestCase):
|
||||
# as the first cmap
|
||||
other_cmap = CorrectMap()
|
||||
other_cmap.update(self.cmap)
|
||||
|
||||
|
||||
# Assert that it has all the same properties
|
||||
self.assertEqual(other_cmap.get_overall_message(),
|
||||
self.cmap.get_overall_message())
|
||||
|
||||
self.assertEqual(other_cmap.get_dict(),
|
||||
self.cmap.get_dict())
|
||||
self.assertEqual(
|
||||
other_cmap.get_overall_message(),
|
||||
self.cmap.get_overall_message()
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
other_cmap.get_dict(),
|
||||
self.cmap.get_dict()
|
||||
)
|
||||
|
||||
def test_update_from_invalid(self):
|
||||
# Should get an exception if we try to update() a CorrectMap
|
||||
|
||||
Reference in New Issue
Block a user