Fixed xml tests.

TNL-708:wq

Fixed xml tests.
TNL-708:wq
2b396453 · Usman Khalid · e6e75978 · 2b396453 · 2b396453 · 2b396453
Commit 2b396453 authored Dec 23, 2014 by Usman Khalid
Hide whitespace changes
Inline Side-by-side

Showing with 80 additions and 50 deletions

openassessment/xblock/test/data/parse_rubric_xml.json
+0 -13

openassessment/xblock/test/data/serialize.json
+76 -35

openassessment/xblock/test/test_xml.py
+4 -2

No files found.
--- a/openassessment/xblock/test/data/parse_rubric_xml.json
+++ b/openassessment/xblock/test/data/parse_rubric_xml.json
@@ -2,7 +2,6 @@
    "simple": {
        "xml": [
            "<rubric>",
-            "<prompt>Test prompt</prompt>",
            "<criterion>",
            "<name>Test criterion</name>",
            "<prompt>Test criterion prompt</prompt>",
@@ -11,7 +10,6 @@
            "</criterion>",
            "</rubric>"
        ],
-        "prompt": "Test prompt",
        "feedbackprompt": null,
        "criteria": [
            {
@@ -43,7 +41,6 @@
    "feedback_prompt": {
        "xml": [
            "<rubric>",
-            "<prompt>Test prompt</prompt>",
            "<criterion>",
            "<name>Test criterion</name>",
            "<prompt>Test criterion prompt</prompt>",
@@ -53,7 +50,6 @@
            "<feedbackprompt>This is the feedback prompt</feedbackprompt>",
            "</rubric>"
        ],
-        "prompt": "Test prompt",
        "feedbackprompt": "This is the feedback prompt",
        "criteria": [
            {
@@ -93,7 +89,6 @@
            "</criterion>",
            "</rubric>"
        ],
-        "prompt": null,
        "feedbackprompt": null,
        "criteria": [
            {
@@ -125,7 +120,6 @@
    "empty_prompt": {
        "xml": [
            "<rubric>",
-            "<prompt></prompt>",
            "<criterion>",
            "<name>Test criterion</name>",
            "<prompt>Test criterion prompt</prompt>",
@@ -134,7 +128,6 @@
            "</criterion>",
            "</rubric>"
        ],
-        "prompt": "",
        "feedbackprompt": null,
        "criteria": [
            {
@@ -166,7 +159,6 @@
    "unicode": {
        "xml": [
            "<rubric>",
-            "<prompt>ՇєรՇ קг๏๓קՇ</prompt>",
            "<criterion>",
            "<name>𝓣𝓮𝓼𝓽 𝓬𝓻𝓲𝓽𝓮𝓻𝓲𝓸𝓷</name>",
            "<prompt>Ŧɇsŧ ȼɍɨŧɇɍɨøn ꝑɍømꝑŧ</prompt>",
@@ -175,7 +167,6 @@
            "</criterion>",
            "</rubric>"
        ],
-        "prompt": "ՇєรՇ קг๏๓קՇ",
        "feedbackprompt": null,
        "criteria": [
            {
@@ -207,7 +198,6 @@
    "multiple_criteria": {
        "xml": [
            "<rubric>",
-            "<prompt>Test prompt</prompt>",
            "<criterion>",
            "<name>Test criterion</name>",
            "<prompt>Test criterion prompt</prompt>",
@@ -221,7 +211,6 @@
            "</criterion>",
            "</rubric>"
        ],
-        "prompt": "Test prompt",
        "feedbackprompt": null,
        "criteria": [
            {
@@ -269,7 +258,6 @@
    "criterion_feedback_optional": {
        "xml": [
            "<rubric>",
-            "<prompt>Test prompt</prompt>",
            "<criterion>",
            "<name>Test criterion</name>",
            "<prompt>Test criterion prompt</prompt>",
@@ -283,7 +271,6 @@
            "</criterion>",
            "</rubric>"
        ],
-        "prompt": "Test prompt",
        "feedbackprompt": null,
        "criteria": [
            {

--- a/openassessment/xblock/test/data/serialize.json
+++ b/openassessment/xblock/test/data/serialize.json
@@ -54,8 +54,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion label</label>",
@@ -121,6 +123,9 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description></description></prompt>",
+            "</prompts>",
            "<rubric>",
                "<criterion>",
                    "<name>Test criterion</name>",
@@ -188,8 +193,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description></description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt></prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -253,8 +260,10 @@
            "<assessments>",
                "<assessment name=\"peer-assessment\"  start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Ṫëṡẗ ṗṛöṁṗẗ</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Ṫëṡẗ ṗṛöṁṗẗ</prompt>",
                "<criterion>",
                    "<name>ՇﻉรՇ ƈɼٱՇﻉɼٱѻก</name>",
                    "<label>Ṫëṡẗ ċṛïẗëṛïöṅ ḷäḅëḷ</label>",
@@ -316,23 +325,25 @@
        ],
        "expected_xml": [
            "<openassessment>",
-            "<title>Foo</title>",
-            "<assessments>",
-            "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
-            "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
-            "</assessments>",
-            "<rubric>",
-            "<prompt>Test prompt</prompt>",
-            "<criterion>",
-            "<name>Test criterion</name>",
-            "<label>Test criterion</label>",
-            "<prompt>Test criterion prompt</prompt>",
-            "<option points=\"0\"><name>No</name><label>No</label><explanation>No explanation</explanation></option>",
-            "<option points=\"2\"><name>Yes</name><label>Yes</label><explanation>Yes explanation</explanation></option>",
-            "</criterion>",
-            "<feedbackprompt></feedbackprompt>",
-            "<feedback_default_text>Test default text...</feedback_default_text>",
-            "</rubric>",
+                "<title>Foo</title>",
+                "<assessments>",
+                    "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
+                    "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
+                "</assessments>",
+                "<prompts>",
+                    "<prompt><description>Test prompt</description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                    "<criterion>",
+                        "<name>Test criterion</name>",
+                        "<label>Test criterion</label>",
+                        "<prompt>Test criterion prompt</prompt>",
+                        "<option points=\"0\"><name>No</name><label>No</label><explanation>No explanation</explanation></option>",
+                        "<option points=\"2\"><name>Yes</name><label>Yes</label><explanation>Yes explanation</explanation></option>",
+                    "</criterion>",
+                    "<feedbackprompt></feedbackprompt>",
+                    "<feedback_default_text>Test default text...</feedback_default_text>",
+                "</rubric>",
            "</openassessment>"
        ]
    },
@@ -389,8 +400,10 @@
                    "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                    "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
                "</assessments>",
+                "<prompts>",
+                    "<prompt><description>Test prompt</description></prompt>",
+                "</prompts>",
                "<rubric>",
-                    "<prompt>Test prompt</prompt>",
                    "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -449,8 +462,10 @@
            "<assessments>",
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-06-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -524,8 +539,10 @@
            "<assessments>",
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-06-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Second criterion</name>",
                    "<label>Second criterion</label>",
@@ -600,8 +617,10 @@
                "<assessment name=\"peer-assessment\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -668,8 +687,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -737,8 +758,10 @@
                "<assessment name=\"peer-assessment\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion feedback=\"optional\">",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -806,8 +829,10 @@
                "<assessment name=\"peer-assessment\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion feedback=\"required\">",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -867,8 +892,10 @@
            "<assessments>",
                "<assessment name=\"student-training\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -967,8 +994,10 @@
                    "</example>",
                "</assessment>",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -1092,8 +1121,10 @@
                    "</example>",
                "</assessment>",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -1201,8 +1232,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -1265,8 +1298,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -1332,8 +1367,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -1399,8 +1436,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",
@@ -1466,8 +1505,10 @@
                "<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
                "<assessment name=\"self-assessment\" start=\"2014-04-01T00:00:00\" due=\"2014-06-01T00:00:00\" />",
            "</assessments>",
+            "<prompts>",
+                "<prompt><description>Test prompt</description></prompt>",
+            "</prompts>",
            "<rubric>",
-                "<prompt>Test prompt</prompt>",
                "<criterion>",
                    "<name>Test criterion</name>",
                    "<label>Test criterion</label>",

--- a/openassessment/xblock/test/test_xml.py
+++ b/openassessment/xblock/test/test_xml.py
@@ -10,6 +10,8 @@ import pytz
 import dateutil.parser
 from django.test import TestCase
 import ddt
+
+from openassessment.xblock.data_conversion import create_prompts_dict
 from openassessment.xblock.openassessmentblock import OpenAssessmentBlock
 from openassessment.xblock.xml import (
    serialize_content, parse_from_xml_str, parse_rubric_xml,
@@ -99,6 +101,7 @@ class TestSerializeContent(TestCase):
    def _configure_xblock(self, data):
        self.oa_block.title = data.get('title', '')
        self.oa_block.prompt = data.get('prompt')
+        self.oa_block.prompts = create_prompts_dict(data.get('prompt'))
        self.oa_block.rubric_feedback_prompt = data.get('rubric_feedback_prompt')
        self.oa_block.rubric_feedback_default_text = data.get('rubric_feedback_default_text')
        self.oa_block.start = _parse_date(data.get('start'))
@@ -361,7 +364,6 @@ class TestParseRubricFromXml(TestCase):
        xml = etree.fromstring("".join(data['xml']))
        rubric = parse_rubric_xml(xml)

-        self.assertEqual(rubric['prompt'], data['prompt'])
        self.assertEqual(rubric['feedbackprompt'], data['feedbackprompt'])
        self.assertEqual(rubric['criteria'], data['criteria'])

@@ -401,7 +403,7 @@ class TestParseFromXml(TestCase):
        # Check that the contents of the modified XBlock are correct
        expected_fields = [
            'title',
-            'prompt',
+            'prompts',
            'start',
            'due',
            'submission_start',