Changeset 6926 for main/waeup.custom/trunk/src/waeup/custom/students

Timestamp:

22 Oct 2011, 08:43:54 (13 years ago)

Author:

Henrik Bettermann

Message:

Test coverage now 100%

Location:

main/waeup.custom/trunk/src/waeup/custom/students

Files:

• tests.py (modified) (3 diffs)
• utils.py (modified) (1 diff)

main/waeup.custom/trunk/src/waeup/custom/students/tests.py

@@ -10 +10 @@
     def test_manage_payments(self):
 
+        # Managers can add online payment tickets
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_student_path)
+        self.browser.getLink("Manage").click()
+        self.browser.getControl("Add online payment ticket").click()
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Session configuration object is not available...',
+                           self.browser.contents)
+
         # Set up SessionConfiguration object
         configuration = SessionConfiguration()
@@ -16 +25 @@
         self.app['configuration'].addSessionConfiguration(configuration)
 
-        # Managers can add online payment tickets
-        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_student_path)
         self.browser.getLink("Manage").click()
@@ -46 +53 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_student_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['gown']
+        self.browser.getControl("Create ticket").click()
+        self.browser.open(self.payments_student_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['transfer']
+        self.browser.getControl("Create ticket").click()
+        self.browser.open(self.payments_student_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['hostel_maintenance']
+        self.browser.getControl("Create ticket").click()
+        self.certificate.study_mode = 'ug_pt'
+        self.browser.open(self.payments_student_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Amount could not be determined...',
+                           self.browser.contents)
+
+

main/waeup.custom/trunk/src/waeup/custom/students/utils.py

@@ -26 +26 @@
         surcharge_1 = academic_session.surcharge_1
         surcharge_2 = academic_session.surcharge_2
-        try:
-            amount = getSchoolFee(student, surcharge_1 + surcharge_2)
-            code = student['studycourse'].certificate.code
-        except AttributeError:
-            return 0, None, None, 0, 0, 0, 'School Fee could not be determined.'
+        amount = getSchoolFee(student, surcharge_1 + surcharge_2)
+        code = student['studycourse'].certificate.code
         #session_string = academic_sessions_vocab.by_value[p_session + 1].title
         p_item = code