From 8877ec3500ddf111294ff306086b0fb3ec35b2a0 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Tue, 5 Feb 2013 18:38:21 -0500 Subject: [PATCH 1/5] More robust default version --- common/lib/xmodule/xmodule/combined_open_ended_module.py | 1 + 1 file changed, 1 insertion(+) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 3e0a3b27a5..7ff9df2c24 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -29,6 +29,7 @@ VERSION_TUPLES = ( ) DEFAULT_VERSION = 1 +DEFAULT_VERSION = str(DEFAULT_VERSION) class CombinedOpenEndedModule(XModule): """ From 0fc50095d9e4813ea708925602b846950060b049 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Tue, 5 Feb 2013 18:53:53 -0500 Subject: [PATCH 2/5] Fix combined open ended tests --- common/lib/xmodule/xmodule/combined_open_ended_modulev1.py | 2 +- common/lib/xmodule/xmodule/tests/test_combined_open_ended.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py index e21765f76b..f62c2d309a 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py @@ -137,7 +137,7 @@ class CombinedOpenEndedV1Module(): self.metadata = metadata self.display_name = metadata.get('display_name', "Open Ended") - self.rewrite_content_links = static_data['rewrite_content_links'] + self.rewrite_content_links = static_data.get('rewrite_content_links',"") # Load instance state 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 c89f5ee848..d6e54cdd72 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -4,7 +4,7 @@ import unittest from xmodule.openendedchild import OpenEndedChild from xmodule.open_ended_module import OpenEndedModule -from xmodule.combined_open_ended_module import CombinedOpenEndedModule +from xmodule.combined_open_ended_modulev1 import CombinedOpenEndedV1Module from xmodule.modulestore import Location from lxml import etree @@ -314,7 +314,7 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): descriptor = Mock() def setUp(self): - self.combinedoe = CombinedOpenEndedModule(test_system, self.location, self.definition, self.descriptor, self.static_data, metadata=self.metadata) + self.combinedoe = CombinedOpenEndedV1Module(test_system, self.location, self.definition, self.descriptor, self.static_data, metadata=self.metadata) def test_get_tag_name(self): name = self.combinedoe.get_tag_name("Tag") From a1e73392c1e9f41743fb383a1baf4a0e6065bdd1 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Tue, 5 Feb 2013 19:02:21 -0500 Subject: [PATCH 3/5] Fix descriptor creation --- common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 7ff9df2c24..2da15a4086 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -143,7 +143,7 @@ class CombinedOpenEndedModule(XModule): } self.child_descriptor = descriptors[version_index](self.system) - self.child_definition = CombinedOpenEndedV1Descriptor.definition_from_xml(etree.fromstring(definition['xml_string']), self.system) + self.child_definition = descriptors[version_index].definition_from_xml(etree.fromstring(definition['xml_string']), self.system) self.child_module = modules[version_index](self.system, location, self.child_definition, self.child_descriptor, instance_state = json.dumps(instance_state), metadata = self.metadata, static_data= static_data) From 94e6346cf2bdc0c1b2205c751a1539a3532d4382 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Tue, 5 Feb 2013 19:04:30 -0500 Subject: [PATCH 4/5] Fix combined open ended tests --- common/lib/xmodule/xmodule/tests/test_combined_open_ended.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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 d6e54cdd72..6032e671d1 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -324,14 +324,14 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): response_dict = self.combinedoe.get_last_response(0) self.assertEqual(response_dict['type'], "selfassessment") self.assertEqual(response_dict['max_score'], self.max_score) - self.assertEqual(response_dict['state'], CombinedOpenEndedModule.INITIAL) + self.assertEqual(response_dict['state'], CombinedOpenEndedV1Module.INITIAL) def test_update_task_states(self): changed = self.combinedoe.update_task_states() self.assertFalse(changed) current_task = self.combinedoe.current_task - current_task.change_state(CombinedOpenEndedModule.DONE) + current_task.change_state(CombinedOpenEndedV1Module.DONE) changed = self.combinedoe.update_task_states() self.assertTrue(changed) From ddda9ba55dd3834700152aff830879a9d8c45d16 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Wed, 6 Feb 2013 13:19:37 -0500 Subject: [PATCH 5/5] Try to fix tests --- .../xmodule/xmodule/tests/test_combined_open_ended.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 a80f89d23d..556bf2953b 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -157,6 +157,7 @@ class OpenEndedModuleTest(unittest.TestCase): 'max_score': max_score, 'display_name': 'Name', 'accept_file_upload': False, + 'rewrite_content_links' : "", } oeparam = etree.XML(''' @@ -279,13 +280,15 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): metadata = {'attempts': '10', 'max_score': max_score} - static_data = json.dumps({ + static_data = { 'max_attempts': 20, 'prompt': prompt, 'rubric': rubric, 'max_score': max_score, - 'display_name': 'Name' - }) + 'display_name': 'Name', + 'accept_file_upload' : False, + 'rewrite_content_links' : "", + } oeparam = etree.XML('''