From 6ec3b94d0c0df050257fffc9deab4783206777ef Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Tue, 5 Mar 2013 11:47:41 -0500
Subject: [PATCH] Added test for capa module closed() method; modified closed()
 to handle edge cases

---
 common/lib/xmodule/xmodule/capa_module.py     |  2 +-
 .../xmodule/xmodule/tests/test_capa_module.py | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 8e2f8825de..5e0e2e9ac4 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -419,7 +419,7 @@ class CapaModule(XModule):
 
     def closed(self):
         ''' Is the student still allowed to submit answers? '''
-        if self.attempts == self.max_attempts:
+        if self.max_attempts is not None and self.attempts >= self.max_attempts:
             return True
         if self.is_past_due():
             return True
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index afe4a73725..803b91d139 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -286,6 +286,34 @@ class CapaModuleTest(unittest.TestCase):
         self.assertTrue(still_in_grace.answer_available())
 
 
+    def test_closed(self):
+
+        # Attempts < Max attempts --> NOT closed
+        module = CapaFactory.create(max_attempts="1", attempts="0")
+        self.assertFalse(module.closed())
+
+        # Attempts < Max attempts --> NOT closed
+        module = CapaFactory.create(max_attempts="2", attempts="1")
+        self.assertFalse(module.closed())
+
+        # Attempts = Max attempts --> closed
+        module = CapaFactory.create(max_attempts="1", attempts="1")
+        self.assertTrue(module.closed())
+
+        # Attempts > Max attempts --> closed
+        module = CapaFactory.create(max_attempts="1", attempts="2")
+        self.assertTrue(module.closed())
+
+        # Max attempts = 0 --> closed
+        module = CapaFactory.create(max_attempts="0", attempts="2")
+        self.assertTrue(module.closed())
+
+        # Past due --> closed
+        module = CapaFactory.create(max_attempts="1", attempts="0",
+                                    due=self.yesterday_str)
+        self.assertTrue(module.closed())
+
+
     def test_parse_get_params(self):
 
         # Valid GET param dict
@@ -522,3 +550,21 @@ class CapaModuleTest(unittest.TestCase):
 
         # Expect that the problem was NOT reset
         self.assertTrue('success' in result and not result['success'])
+
+
+    def test_save_problem(self):
+        module = CapaFactory.create()
+
+        # Simulate 
+
+
+    def test_save_problem_closed(self):
+        self.fail()
+
+
+    def test_save_problem_submitted_with_randomize(self):
+        self.fail()
+
+
+    def test_save_problem_submitted_no_randomize(self):
+        self.fail()