From 442d0fcf4fcc99fc3d530d01b08a8c7e0ee8eec9 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Wed, 10 Apr 2013 17:41:10 -0400 Subject: [PATCH] Add tests for orderings with only one task --- .../xmodule/tests/test_combined_open_ended.py | 61 +++++++++++++------ 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py index 8c192929b0..e55dc66145 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -356,9 +356,13 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): full_definition = definition_template.format(prompt=prompt, rubric=rubric, task1=task_xml1, task2=task_xml2) definition_oe = {'prompt': etree.XML(prompt), 'rubric': etree.XML(rubric), 'task_xml': [task_xml2, task_xml2]} definition_sa = {'prompt': etree.XML(prompt), 'rubric': etree.XML(rubric), 'task_xml': [task_xml1, task_xml1]} + definition_sa_only = {'prompt': etree.XML(prompt), 'rubric': etree.XML(rubric), 'task_xml': [task_xml1]} + definition_oe_only = {'prompt': etree.XML(prompt), 'rubric': etree.XML(rubric), 'task_xml': [task_xml2]} descriptor = Mock(data=full_definition) descriptor_oe = Mock(data=definition_oe) descriptor_sa = Mock(data=definition_sa) + descriptor_oe_only = Mock(data=definition_oe) + descriptor_sa_only = Mock(data=definition_sa) test_system = test_system() combinedoe_container = CombinedOpenEndedModule(test_system, location, @@ -375,21 +379,6 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): static_data=self.static_data, metadata=self.metadata, instance_state=self.static_data) - self.combinedoe_oe = CombinedOpenEndedV1Module(self.test_system, - self.location, - self.definition_oe, - self.descriptor_oe, - static_data=self.static_data, - metadata=self.metadata, - instance_state=self.static_data) - self.combinedoe_sa = CombinedOpenEndedV1Module(self.test_system, - self.location, - self.definition_sa, - self.descriptor_sa, - static_data=self.static_data, - metadata=self.metadata, - instance_state=self.static_data) - def test_get_tag_name(self): name = self.combinedoe.get_tag_name("Tag") self.assertEqual(name, "t") @@ -432,11 +421,49 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): self.assertEqual(score_dict['total'], None) def test_open_ended_task_order(self): - changed = self.combinedoe_oe.update_task_states() + combinedoe_oe = CombinedOpenEndedV1Module(self.test_system, + self.location, + self.definition_oe, + self.descriptor_oe, + static_data=self.static_data, + metadata=self.metadata, + instance_state=self.static_data) + changed = combinedoe_oe.update_task_states() self.assertFalse(changed) def test_self_assessment_task_order(self): - changed = self.combinedoe_sa.update_task_states() + combinedoe_sa = CombinedOpenEndedV1Module(self.test_system, + self.location, + self.definition_sa, + self.descriptor_sa, + static_data=self.static_data, + metadata=self.metadata, + instance_state=self.static_data) + + changed = combinedoe_sa.update_task_states() + self.assertFalse(changed) + + def test_open_ended_only_task_order(self): + combinedoe_oe = CombinedOpenEndedV1Module(self.test_system, + self.location, + self.definition_oe_only, + self.descriptor_oe_only, + static_data=self.static_data, + metadata=self.metadata, + instance_state=self.static_data) + changed = combinedoe_oe.update_task_states() + self.assertFalse(changed) + + def test_self_assessment_only_task_order(self): + combinedoe_sa = CombinedOpenEndedV1Module(self.test_system, + self.location, + self.definition_sa_only, + self.descriptor_sa_only, + static_data=self.static_data, + metadata=self.metadata, + instance_state=self.static_data) + + changed = combinedoe_sa.update_task_states() self.assertFalse(changed)