Skip to content

E
edx-platform
Commit e2ddd790 by Vasyl Nakvasiuk Committed by Alexander Kryklia
Options

add "poll" tests data, add test_export for "poll" module

parent 94b4c751
Showing with 382 additions and 6 deletions
common/lib/xmodule/xmodule/self_assessment_module.py
......@@ -428,7 +428,6 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
'hintprompt': parse('hintprompt'),
}, []
def definition_to_xml(self, resource_fs):
'''Return an xml element representing this definition.'''
elt = etree.Element('selfassessment')
......
common/lib/xmodule/xmodule/stringify.py
from itertools import chain
# -*- coding: utf-8 -*-
from lxml import etree
def stringify_children(node):
'''
Return all contents of an xml tree, without the outside tags.
......@@ -25,4 +27,5 @@ def stringify_children(node):
parts.append(etree.tostring(c, with_tail=True))
# filter removes possible Nones in texts and tails
return ''.join(filter(None, parts))
result = ''.join(filter(None, parts))
return result
common/lib/xmodule/xmodule/tests/test_export.py
......@@ -98,6 +98,9 @@ class RoundTripTestCase(unittest.TestCase):
def test_full_roundtrip(self):
self.check_export_roundtrip(DATA_DIR, "full")
def test_poll_roundtrip(self):
self.check_export_roundtrip(DATA_DIR, "poll")
def test_selfassessment_roundtrip(self):
#Test selfassessment xmodule to see if it exports correctly
self.check_export_roundtrip(DATA_DIR, "self_assessment")
common/lib/xmodule/xmodule/xml_module.py
......@@ -100,9 +100,9 @@ class XmlDescriptor(XModuleDescriptor):
# VS[compat] Remove once unused.
'name', 'slug')
metadata_to_strip = ('data_dir',
metadata_to_strip = ('data_dir',
# cdodge: @TODO: We need to figure out a way to export out 'tabs' and 'grading_policy' which is on the course
'tabs', 'grading_policy', 'is_draft', 'published_by', 'published_date',
'tabs', 'grading_policy', 'is_draft', 'published_by', 'published_date',
'discussion_blackouts',
# VS[compat] -- remove the below attrs once everything is in the CMS
'course', 'org', 'url_name', 'filename',
......@@ -119,7 +119,7 @@ class XmlDescriptor(XModuleDescriptor):
bool_map = AttrMap(to_bool, from_bool)
to_int = lambda val: int(val)
from_int = lambda val: str(val)
from_int = lambda val: str(val)
int_map = AttrMap(to_int, from_int)
xml_attribute_map = {
# type conversion: want True/False in python, "true"/"false" in xml
......
common/test/data/poll/README 0 → 100644
Any place that says "YEAR_SEMESTER" needs to be replaced with something
in the form "2013_Spring". Take note of this name exactly, you'll need to
use it everywhere, precisely - capitalization is very important.
See https://github.com/MITx/mitx/blob/master/doc/xml-format.md for more on all this.
-----------------------
about/: Files that live here will be visible OUTSIDE OF COURSEWARE.
YEAR_SEMESTER/
end_date.html: Specifies in plain-text the end date of the course
overview.html: Text of the overview of the course
short_description.html: 10-15 words about the course
prerequisites.html: Any prerequisites for the course, or None if there are none.
course/
YEAR_SEMESTER.xml: This is your top-level xml page that points at chapters.
Can just be <course/> for now.
course.xml: This top level file points at a file in roots/. See creating_course.xml.
creating_course.xml: Explains how to create course.xml
info/: Files that live here will be visible on the COURSE LANDING PAGE
(Course Info) WITHIN THE COURSEWARE.
YEAR_SEMESTER/
handouts.html: A list of handouts, or an empty file if there are none
(if this file doesn't exist, it displays an error)
updates.html: Course updates.
policies/
YEAR_SEMESTER/
policy.json: See https://github.com/MITx/mitx/blob/master/doc/xml-format.md
for more on the fields specified by this file.
grading_policy.json: Optional -- you don't need it to get a course off the
ground but will eventually. For more info see
https://github.com/MITx/mitx/blob/master/doc/course_grading.md
roots/
YEAR_SEMESTER.xml: Looks something like
<course url_name="YEAR_SEMESTER" org="ORG" course="COURSENUM"/>
where ORG in {"MITx", "HarvardX", "BerkeleyX"}
static/
See README.
images/
course_image.jpg: You MUST have an image named this to be the background
banner image on edx.org
-----------------------
\ No newline at end of file
common/test/data/poll/README.md 0 → 100644
content-harvard-justicex
========================
\ No newline at end of file
common/test/data/poll/about/2013_Spring/overview.html 0 → 100644
<section class="about">
<h2>About ER22x</h2>
<p>Justice is a critical analysis of classical and contemporary theories of justice, including discussion of present-day applications. Topics include affirmative action, income distribution, same-sex marriage, the role of markets, debates about rights (human rights and property rights), arguments for and against equality, dilemmas of loyalty in public and private life. The course invites students to subject their own views on these controversies to critical examination.</p>
<p>The principle readings for the course are texts by Aristotle, John Locke, Immanuel Kant, John Stuart Mill, and John Rawls. Other assigned readings include writings by contemporary philosophers, court cases, and articles about political controversies that raise philosophical questions.</p>
<!--
<p>The assigned readings will be freely available online. They are also collected in an edited volume, <emph>Justice: A Reader</emph> (ed. Michael Sandel, Oxford University Press). Students who would like further guidance on the themes of the lectures can read Michael Sandel, <emph>Justice: What’s the Right Thing to Do?</emph> (Recommended but not required.)
</p>
-->
</section>
<section class="course-staff">
<h2>Course instructor</h3>
<article class="teacher">
<!-- TODO: Need to change image location -->
<!-- First Professor -->
<div class="teacher-image"><img src="/static/images/professor-sandel.jpg"/></div>
<h3>Michael J. Sandel</h3>
<p>Michael J. Sandel is the Anne T. and Robert M. Bass Professor of Government at Harvard University, where he teaches political philosophy.  His course "Justice" has enrolled more than 15,000 Harvard students.  Sandel's writings have been published in 21 languages.  His books include <i>What Money Can't Buy: The Moral Limits of Markets</i> (2012); <i>Justice: What's the Right Thing to Do?</i> (2009); <i>The Case against Perfection: Ethics in the Age of Genetic Engineering</i> (2007); <i>Public Philosophy: Essays on Morality in Politics</i> (2005); <i>Democracy's Discontent</i> (1996); and <i>Liberalism and the Limits of Justice</i>(1982; 2nd ed., 1998). </p>
<p><br></p>
</section>
<section class="faq">
<section class="responses">
<h2>Frequently Asked Questions</h2>
<article class="response">
<h3>How much does it cost to take the course?</h3>
<p>Nothing! The course is free.</p>
</article>
<article class="response">
<h3>Does the course have any prerequisites?</h3>
<p>No. Only an interest in thinking through some of the big ethical and civic questions we face in our everyday lives.</p>
</article>
<article class="response">
<h3>Do I need any other materials to take the course?</h3>
<p>No. As long as you’ve got a computer to access the website, you are ready to take the course.</p>
</article>
<article class="response">
<h3>Is there a textbook for the course?</h3>
<p>All of the course readings that are in the public domain are freely available online, at links provided on the course website. The course can be taken using these free resources alone. For those who wish to purchase a printed version of the assigned readings, an edited volume entitled, Justice: A Reader (ed., Michael Sandel) is available in paperback from Oxford University Press (in bookstores and from online booksellers). Those who would like supplementary readings on the themes of the lectures can find them in Michael Sandel's book Justice: What's the Right Thing to Do?, which is available in various languages throughout the world. This book is not required, and the course can be taken using the free online resources alone.</p>
</article>
<article class="response">
<h3>Do I need to watch the lectures at a specific time?</h3>
<p>No. You can watch the lectures at your leisure.</p>
</article>
<article class="response">
<h3>Will I be able to participate in class discussions?</h3>
<p>Yes, in several ways: </p>
<ol>
<li><p> Each lecture invites you to respond to a poll question related to the themes of the lecture. If you respond to the question, you will be presented with a challenge to the opinion you have expressed, and invited to reply to the challenge. You can also, if you wish, comment on the opinions and responses posted by other students in the course, continuing the discussion.</p></li>
<li><p> In addition to the poll question, each class contains a discussion prompt that invites you to offer your view on a controversial question related to the lecture. If you wish, you can respond to this question, and then see what other students have to say about the argument you present. You can also comment on the opinions posted by other students. One aim of the course is to promote reasoned public dialogue about hard moral and political questions. </p></li>
<li><p> Each week, there will be an optional live dialogue enabling students to interact with instructors and participants from around the world.</p></li>
</ol>
</article>
<article class="response">
<h3>Will certificates be awarded?</h3>
<p>Yes. Online learners who achieve a passing grade in a course can earn a certificate of mastery. These certificates will indicate you have successfully completed the course, but will not include a specific grade. Certificates will be issued by edX under the name of HarvardX, designating the institution from which the course originated. </p>
</article>
</section>
</section>
\ No newline at end of file
common/test/data/poll/about/2013_Spring/short_description.html 0 → 100644
JusticeX is an introduction to moral and political philosophy, including discussion of contemporary dilemmas and controversies.
\ No newline at end of file
common/test/data/poll/about/2013_Spring/video.html 0 → 100644
<iframe width="560" height="315" src="http://www.youtube.com/embed/fajlZMdPkKE#!" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
common/test/data/poll/chapter/Staff.xml 0 → 100644
<chapter>
<sequential url_name="Problem_Demos"/>
</chapter>
common/test/data/poll/course.xml 0 → 120000
roots/2013_Spring.xml
\ No newline at end of file
common/test/data/poll/course/2013_Spring.xml 0 → 100644
<!-- Name this file eg "2012_Fall.xml" or "2013_Spring.xml"
Take note of this name exactly, you'll need to use it everywhere. -->
<course>
<chapter url_name="Staff"/>
</course>
common/test/data/poll/creating_course.xml 0 → 100644
<!-- A file named "course.xml" in your top-level should point
at the appropriate roots file. You can do so like this:
$ rm course.xml
$ ln -s roots/YEAR_SEMESTER.xml course.xml
Ask Sarina for help with this. -->
common/test/data/poll/info/2013_Spring/handouts.html 0 → 100644
<ol>
<li>A list of course handouts, or an empty file if there are none.</li>
</ol>
common/test/data/poll/info/2013_Spring/updates.html 0 → 100644
<!-- If you wish to make a welcome announcement -->
<ol>
<li><h2>December 9</h2>
<section class="update-description">
<p>Announcement text</p>
</section>
</li>
</ol>
common/test/data/poll/policies/2013_Spring/policy.json 0 → 100644
{
"course/2013_Spring": {
"start": "2099-01-01T00:00",
"advertised_start" : "Spring 2013",
"display_name": "Justice"
}
}
common/test/data/poll/roots/2013_Spring.xml 0 → 100644
<course url_name="2013_Spring" org="HarvardX" course="ER22x"/>
common/test/data/poll/sequential/Problem_Demos.xml 0 → 100644
<sequential>
<problem name="test_6" showanswer="never" attempts="10" max_attempts="10" display_name="Melting Point and Pressure 1">
<startouttext/>
<p>How does the melting point of water (H2O) change with increasing pressure?</p>
<endouttext/>
<multiplechoiceresponse direction="vertical" randomize="yes">
<choicegroup type="MultipleChoice">
<choice location="random" correct="true" name="A"><text>decreases</text></choice>
<choice location="random" correct="false" name="B"><text>is unchanged</text></choice>
<choice location="random" correct="false" name="C"><text>increases</text></choice>
<choice location="random" correct="false" name="D"><text>increases and then decreases</text></choice>
</choicegroup>
</multiplechoiceresponse>
</problem>
<problem name="test_7" showanswer="never" attempts="10" max_attempts="10" display_name="Melting Point and Pressure 2">
<startouttext/>
<p>How does the melting point of water (H2O) change with increasing pressure?</p>
<endouttext/>
<multiplechoiceresponse direction="vertical" randomize="yes">
<choicegroup type="MultipleChoice">
<choice location="random" correct="true" name="A"><text>decreases</text></choice>
<choice location="random" correct="false" name="B"><text>is unchanged</text></choice>
<choice location="random" correct="false" name="C"><text>increases</text></choice>
<choice location="random" correct="false" name="D"><text>increases and then decreases</text></choice>
</choicegroup>
</multiplechoiceresponse>
</problem>
<vertical>
<poll_question id="first_poll" display_name="first poll">
<h3>What's the Right Thing to Do?</h3>
<p>Suppose four shipwrecked sailors are stranded at sea in a lifeboat, without
food or water. Would it be wrong for three of them to kill and eat the cabin
boy, in order to save their own lives?</p>
<answer id="Yes">Yes</answer>
<answer id="No">No</answer>
<answer id="Dont_know">Don't know</answer>
</poll_question>
<!-- <conditional condition="answer" required="poll_question/first_poll" answer="Yes">
<test1></test1>
<test2>
<poll_question name="first_yes" display_name="first yes poll">
<h3>Yes?</h3>
<p>Really yes?</p>
<answer name="Yes">Yes</answer>
<answer name="No">No</answer>
</poll_question>
</test2>
</conditional> -->
<!--
<conditional condition="answer" required="poll_question/first_poll" answer="No">
<poll_question name="first_no" display_name="first no poll">
<h3>No?</h3>
<p>Are you sure?</p>
<answer name="Yes">Yes</answer>
<answer name="No">No</answer>
</poll_question>
</conditional>
-->
<!-- <conditional condition="answer" required="poll_question/first_poll" answer_value="not yes, not no">
<html>You can't decide</html>
</conditional> -->
<conditional condition="answer" required="poll_question/first_poll" answer="unanswered">
<html>You can't see this element until you've done the poll</html>
</conditional>
<!-- <conditional condition="answer" required="poll_question/first_poll">
<if answer_to="poll_question/first_poll" is="Yes">
<poll_question name="first_yes">
<h3>Yes?</h3>
<p>Really yes?</p>
<answer name="Yes">Yes</answer>
<answer name="No">No</answer>
</poll_question>
</if>
<if answer_to="poll_question/first_poll" is="no">
<poll_question name="first_no">
<h3>No?</h3>
<p>Are you sure?</p>
<answer name="Yes">Yes</answer>
<answer name="No">No</answer>
</poll_question>
</if>
<if answer_to="poll_question/first_poll" is="anything_else">
<html>You can't decide</html>
</if>
<if answer_to="poll_question/first_poll" is="unanswered">
<html>You can't see this element until you've done the poll</html>
</if>
</conditional>
<conditional condition="answer" required="poll_question/first_poll; poll_question/first_yes">
<if answer_to="poll_question/first_yes" is="Yes">
<html>Third level of question branching, A</html>
</if>
<if answer_to="poll_question/first_yes" is="anything_else">
<html>Third level of question branching, B</html>
</if>
</conditional> -->
</vertical>
<!-- <conditional condition="require_completed" required="problem/test_6; problem/test_7">
<video youtube="1.0:hbpmBYE86go" url_name="A1V1_Video_Resources" display_name="Synthetic diamonds">
<source src="https://s3.amazonaws.com/edx-course-videos/mit-3091x/M-3091X-FA12-SynthDiam_100.mp4"/>
</video>
<problem name="test_cond_1" showanswer="never" attempts="10" max_attempts="10" display_name="Melting Point and Pressure">
<startouttext/>
<p>How does the melting point of water (H2O) change with increasing pressure?</p>
<endouttext/>
<multiplechoiceresponse direction="vertical" randomize="yes">
<choicegroup type="MultipleChoice">
<choice location="random" correct="true" name="A"><text>decreases</text></choice>
<choice location="random" correct="false" name="B"><text>is unchanged</text></choice>
<choice location="random" correct="false" name="C"><text>increases</text></choice>
<choice location="random" correct="false" name="D"><text>increases and then decreases</text></choice>
</choicegroup>
</multiplechoiceresponse>
</problem>
<video youtube="1.0:hbpmBYE86go" url_name="A1V1_Video_Resources1" display_name="Synthetic diamonds1">
<source src="https://s3.amazonaws.com/edx-course-videos/mit-3091x/M-3091X-FA12-SynthDiam_100.mp4"/>
</video>
</conditional> -->
</sequential>
common/test/data/poll/static/README 0 → 100644
Images, handouts, and other statically-served content should go ONLY
in this directory.
Images for the front page should go in static/images. The frontpage
banner MUST be named course_image.jpg
\ No newline at end of file
common/test/data/poll/vertical/Poll_example_1.xml 0 → 100644
<sequential>
<vertical>
<problem showanswer="never" attempts="1" display_name="Melting Point and Pressure">
<startouttext/>
<p>How does the melting point of water (H2O) change with increasing pressure?</p>
<endouttext/>
<multiplechoiceresponse direction="vertical" randomize="yes">
<choicegroup type="MultipleChoice">
<choice location="random" correct="true" name="A"><text>decreases</text></choice>
<choice location="random" correct="false" name="B"><text>is unchanged</text></choice>
<choice location="random" correct="false" name="C"><text>increases</text></choice>
<choice location="random" correct="false" name="D"><text>increases and then decreases</text></choice>
</choicegroup>
</multiplechoiceresponse>
</problem>
</vertical>
<vertical>
<poll>
<question id="1" upvote="2">
<!-- After upvote - follow up question, after downvote - no followup -->
<!-- default is to show plot, upvote=end, downvote = end -->
<h3>What's the Right Thing to Do?</h3>
<p>Suppose four shipwrecked sailors are stranded at sea in a lifeboat, without
food or water. Would it be wrong for three of them to kill and eat the cabin
boy, in order to save their own lives?</p>
</question>
<question id="2" show_stats="no">
Question text
</question>
</poll>
<poll>
<question id="1" upvote="2" downvote="3">
<h3>What's the Right Thing to Do?</h3>
<p>Suppose four shipwrecked sailors are stranded at sea in a lifeboat, without
food or water. Would it be wrong for three of them to kill and eat the cabin
boy, in order to save their own lives?</p>
</question>
<question id="2">
<h3>What's the Right Thing to Do?</h3>
<p>Should they try to swim across the ocean?</p>
</question>
<question id="3" show_stats="no">
<h3>What's the Right Thing to Do?</h3>
<p>Should they try catch fish</p>
</question>
</poll>
</vertical>
<!-- <conditional condition="require_completed" required="tag/url_name1 tag/url_name2">
<video youtube="1.0:80lyCgMVIiA" url_name="A1V1_Video_Resources" display_name="Synthetic diamonds">
<source src="https://s3.amazonaws.com/edx-course-videos/mit-3091x/M-3091X-FA12-SynthDiam_100.mp4"/>
</video>
</conditional> -->
</sequential>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment