Update comments and add new OpenEndedChild tests

common/lib/xmodule/xmodule/openendedchild.py

@@ -112,7 +112,7 @@ class OpenEndedChild(object):
         pass
 
     def latest_answer(self):
-        """None if not available"""
+        """Empty string if not available"""
         if not self.history:
             return ""
         return self.history[-1].get('answer', "")
@@ -124,7 +124,7 @@ class OpenEndedChild(object):
         return self.history[-1].get('score')
 
     def latest_post_assessment(self, system):
-        """None if not available"""
+        """Empty string if not available"""
         if not self.history:
             return ""
         return self.history[-1].get('post_assessment', "")

common/lib/xmodule/xmodule/tests/test_combined_open_ended.py

@@ -31,43 +31,94 @@ class OpenEndedChildTest(unittest.TestCase):
     definition = Mock()
     descriptor = Mock()
 
+    def setUp(self):
+        self.openendedchild = OpenEndedChild(test_system, self.location, 
+                self.definition, self.descriptor, self.static_data, self.metadata) 
+ 
 
     def test_latest_answer_empty(self):
-        openendedchild = OpenEndedChild(test_system, self.location, 
-                self.definition, self.descriptor, self.static_data, self.metadata) 
-        answer = openendedchild.latest_answer()
+        answer = self.openendedchild.latest_answer()
         self.assertEqual(answer, "")
 
-    def test_latest_answer_nonempty(self):
-        metadata = json.dumps({ 'attempts': 10,
-                'history': [{'answer': "Two"}, {'answer': "Three"}]})
-        openendedchild = OpenEndedChild(test_system, self.location, 
-                self.definition, self.descriptor, self.static_data, metadata) 
-        answer = openendedchild.latest_answer()
-        self.assertEqual(answer, "Three")
 
     def test_latest_score_empty(self):
-        openendedchild = OpenEndedChild(test_system, self.location, 
-                self.definition, self.descriptor, self.static_data, self.metadata) 
-        answer = openendedchild.latest_score()
+        answer = self.openendedchild.latest_score()
         self.assertEqual(answer, None)
 
 
-    def test_latest_score_nonempty(self):
-        metadata = json.dumps({ 'attempts': 10,
-                'history': [{'score': 3}, {'score': 2}]})
-        openendedchild = OpenEndedChild(test_system, self.location, 
-                self.definition, self.descriptor, self.static_data, metadata) 
-        answer = openendedchild.latest_score()
-        self.assertEqual(answer, 2)
+    def test_latest_post_assessment_empty(self):
+        answer = self.openendedchild.latest_post_assessment(test_system)
+        self.assertEqual(answer, "")
 
 
     def test_new_history_entry(self):
-        openendedchild = OpenEndedChild(test_system, self.location, 
-                self.definition, self.descriptor, self.static_data, self.metadata) 
         new_answer = "New Answer"
-        openendedchild.new_history_entry(new_answer)
-        answer = openendedchild.latest_answer()
+        self.openendedchild.new_history_entry(new_answer)
+        answer = self.openendedchild.latest_answer()
         self.assertEqual(answer, new_answer)
 
-    #def test_record_latest_score(self):
+        new_answer = "Newer Answer"
+        self.openendedchild.new_history_entry(new_answer)
+        answer = self.openendedchild.latest_answer()
+        self.assertEqual(new_answer, answer)
+
+    def test_record_latest_score(self):
+        new_answer = "New Answer"
+        self.openendedchild.new_history_entry(new_answer)
+        new_score = 3
+        self.openendedchild.record_latest_score(new_score)
+        score = self.openendedchild.latest_score()
+        self.assertEqual(score, 3)
+
+        new_score = 4
+        self.openendedchild.new_history_entry(new_answer)
+        self.openendedchild.record_latest_score(new_score)
+        score = self.openendedchild.latest_score()
+        self.assertEqual(score, 4)
+
+
+    def test_record_latest_post_assessment(self):
+        new_answer = "New Answer"
+        self.openendedchild.new_history_entry(new_answer)
+
+        post_assessment = "Post assessment"
+        self.openendedchild.record_latest_post_assessment(post_assessment)
+        self.assertEqual(post_assessment,
+                self.openendedchild.latest_post_assessment(test_system))
+
+    def test_get_score(self):
+        new_answer = "New Answer"
+        self.openendedchild.new_history_entry(new_answer)
+
+        score = self.openendedchild.get_score()
+        self.assertEqual(score['score'], 0)
+        self.assertEqual(score['total'], self.static_data['max_score'])
+
+        new_score = 4
+        self.openendedchild.new_history_entry(new_answer)
+        self.openendedchild.record_latest_score(new_score)
+        score = self.openendedchild.get_score()
+        self.assertEqual(score['score'], new_score)
+        self.assertEqual(score['total'], self.static_data['max_score'])
+
+        
+    def test_reset(self):
+        self.openendedchild.reset(test_system)
+        state = json.loads(self.openendedchild.get_instance_state())
+        self.assertEqual(state['state'], OpenEndedChild.INITIAL)
+        
+
+    def test_is_last_response_correct(self):
+        new_answer = "New Answer"
+        self.openendedchild.new_history_entry(new_answer)
+        self.openendedchild.record_latest_score(self.static_data['max_score'])
+        self.assertEqual(self.openendedchild.is_last_response_correct(),
+                'correct')
+
+        self.openendedchild.new_history_entry(new_answer)
+        self.openendedchild.record_latest_score(0)
+        self.assertEqual(self.openendedchild.is_last_response_correct(),
+                'incorrect')
+
+
+