@@ -13,36 +11,28 @@
- % if state == 'unsubmitted':
-
- % elif state == 'correct':
-
- % elif state == 'incorrect':
-
- % elif state == 'incomplete':
-
- % endif
- % if hidden:
-
+ % if status == 'unsubmitted':
+
+ % elif status == 'correct':
+
+ % elif status == 'incorrect':
+
+ % elif status == 'incomplete':
+
% endif
- % if state == 'unsubmitted':
+ % if status == 'unsubmitted':
unanswered
- % elif state == 'correct':
+ % elif status == 'correct':
correct
- % elif state == 'incorrect':
+ % elif status == 'incorrect':
incorrect
- % elif state == 'incomplete':
+ % elif status == 'incomplete':
incomplete
% endif
@@ -52,7 +42,7 @@
% if msg:
${msg|n}
% endif
-% if state in ['unsubmitted', 'correct', 'incorrect', 'incomplete'] or hidden:
+% if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']:
% endif
diff --git a/common/lib/capa/capa/tests/__init__.py b/common/lib/capa/capa/tests/__init__.py
index c72d2a1538..b06975f6ce 100644
--- a/common/lib/capa/capa/tests/__init__.py
+++ b/common/lib/capa/capa/tests/__init__.py
@@ -4,13 +4,23 @@ import os
from mock import Mock
+import xml.sax.saxutils as saxutils
+
TEST_DIR = os.path.dirname(os.path.realpath(__file__))
+def tst_render_template(template, context):
+ """
+ A test version of render to template. Renders to the repr of the context, completely ignoring
+ the template name. To make the output valid xml, quotes the content, and wraps it in a
+ """
+ return '
{0}
'.format(saxutils.escape(repr(context)))
+
+
test_system = Mock(
ajax_url='courses/course_id/modx/a_location',
track_function=Mock(),
get_module=Mock(),
- render_template=Mock(),
+ render_template=tst_render_template,
replace_urls=Mock(),
user=Mock(),
filestore=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")),
diff --git a/common/lib/capa/capa/tests/test_customrender.py b/common/lib/capa/capa/tests/test_customrender.py
new file mode 100644
index 0000000000..7208ab2941
--- /dev/null
+++ b/common/lib/capa/capa/tests/test_customrender.py
@@ -0,0 +1,76 @@
+from lxml import etree
+import unittest
+import xml.sax.saxutils as saxutils
+
+from . import test_system
+from capa import customrender
+
+# just a handy shortcut
+lookup_tag = customrender.registry.get_class_for_tag
+
+def extract_context(xml):
+ """
+ Given an xml element corresponding to the output of test_system.render_template, get back the
+ original context
+ """
+ return eval(xml.text)
+
+def quote_attr(s):
+ return saxutils.quoteattr(s)[1:-1] # don't want the outer quotes
+
+class HelperTest(unittest.TestCase):
+ '''
+ Make sure that our helper function works!
+ '''
+ def check(self, d):
+ xml = etree.XML(test_system.render_template('blah', d))
+ self.assertEqual(d, extract_context(xml))
+
+ def test_extract_context(self):
+ self.check({})
+ self.check({1, 2})
+ self.check({'id', 'an id'})
+ self.check({'with"quote', 'also"quote'})
+
+
+class SolutionRenderTest(unittest.TestCase):
+ '''
+ Make sure solutions render properly.
+ '''
+
+ def test_rendering(self):
+ solution = 'To compute unicorns, count them.'
+ xml_str = """
{s} """.format(s=solution)
+ element = etree.fromstring(xml_str)
+
+ renderer = lookup_tag('solution')(test_system, element)
+
+ self.assertEqual(renderer.id, 'solution_12')
+
+ # our test_system "renders" templates to a div with the repr of the context
+ xml = renderer.get_html()
+ context = extract_context(xml)
+ self.assertEqual(context, {'id' : 'solution_12'})
+
+
+class MathRenderTest(unittest.TestCase):
+ '''
+ Make sure math renders properly.
+ '''
+
+ def check_parse(self, latex_in, mathjax_out):
+ xml_str = """
{tex} """.format(tex=latex_in)
+ element = etree.fromstring(xml_str)
+
+ renderer = lookup_tag('math')(test_system, element)
+
+ self.assertEqual(renderer.mathstr, mathjax_out)
+
+ def test_parsing(self):
+ self.check_parse('$abc$', '[mathjaxinline]abc[/mathjaxinline]')
+ self.check_parse('$abc', '$abc')
+ self.check_parse(r'$\displaystyle 2+2$', '[mathjax] 2+2[/mathjax]')
+
+
+ # NOTE: not testing get_html yet because I don't understand why it's doing what it's doing.
+
diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 9ef642d468..b3d7702246 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -1,50 +1,30 @@
"""
-Tests of input types (and actually responsetypes too)
+Tests of input types.
+
+TODO:
+- test unicode in values, parameters, etc.
+- test various html escapes
+- test funny xml chars -- should never get xml parse error if things are escaped properly.
"""
-from datetime import datetime
-import json
-from mock import Mock
-from nose.plugins.skip import SkipTest
-import os
+from lxml import etree
import unittest
+import xml.sax.saxutils as saxutils
from . import test_system
from capa import inputtypes
-from lxml import etree
-
-def tst_render_template(template, context):
- """
- A test version of render to template. Renders to the repr of the context, completely ignoring the template name.
- """
- return repr(context)
+# just a handy shortcut
+lookup_tag = inputtypes.registry.get_class_for_tag
-system = Mock(render_template=tst_render_template)
+def quote_attr(s):
+ return saxutils.quoteattr(s)[1:-1] # don't want the outer quotes
class OptionInputTest(unittest.TestCase):
'''
Make sure option inputs work
'''
- def test_rendering_new(self):
- xml = """
"""
- element = etree.fromstring(xml)
-
- value = 'Down'
- status = 'answered'
- context = inputtypes._optioninput(element, value, status, test_system.render_template)
- print 'context: ', context
-
- expected = {'value': 'Down',
- 'options': [('Up', 'Up'), ('Down', 'Down')],
- 'state': 'answered',
- 'msg': '',
- 'inline': '',
- 'id': 'sky_input'}
-
- self.assertEqual(context, expected)
-
def test_rendering(self):
xml_str = """
"""
@@ -53,16 +33,451 @@ class OptionInputTest(unittest.TestCase):
state = {'value': 'Down',
'id': 'sky_input',
'status': 'answered'}
- option_input = inputtypes.OptionInput(system, element, state)
+ option_input = lookup_tag('optioninput')(test_system, element, state)
context = option_input._get_render_context()
expected = {'value': 'Down',
'options': [('Up', 'Up'), ('Down', 'Down')],
- 'state': 'answered',
+ 'status': 'answered',
'msg': '',
'inline': '',
'id': 'sky_input'}
self.assertEqual(context, expected)
+class ChoiceGroupTest(unittest.TestCase):
+ '''
+ Test choice groups, radio groups, and checkbox groups
+ '''
+
+ def check_group(self, tag, expected_input_type, expected_suffix):
+ xml_str = """
+ <{tag}>
+
This is foil One.
+
This is foil Two.
+
This is foil Three.
+
+ """.format(tag=tag)
+
+ element = etree.fromstring(xml_str)
+
+ state = {'value': 'foil3',
+ 'id': 'sky_input',
+ 'status': 'answered'}
+
+ the_input = lookup_tag(tag)(test_system, element, state)
+
+ context = the_input._get_render_context()
+
+ expected = {'id': 'sky_input',
+ 'value': 'foil3',
+ 'status': 'answered',
+ 'input_type': expected_input_type,
+ 'choices': [('foil1', '
This is foil One. '),
+ ('foil2', '
This is foil Two. '),
+ ('foil3', 'This is foil Three.'),],
+ 'name_array_suffix': expected_suffix, # what is this for??
+ }
+
+ self.assertEqual(context, expected)
+
+ def test_choicegroup(self):
+ self.check_group('choicegroup', 'radio', '')
+
+ def test_radiogroup(self):
+ self.check_group('radiogroup', 'radio', '[]')
+
+ def test_checkboxgroup(self):
+ self.check_group('checkboxgroup', 'checkbox', '[]')
+
+
+
+class JavascriptInputTest(unittest.TestCase):
+ '''
+ The javascript input is a pretty straightforward pass-thru, but test it anyway
+ '''
+
+ def test_rendering(self):
+ params = "(1,2,3)"
+
+ problem_state = "abc12',12&hi
"
+ display_class = "a_class"
+ display_file = "my_files/hi.js"
+
+ xml_str = """