Changeset 13359 for main/waeup.aaue/trunk/src/waeup/aaue/students/tests

Timestamp:

28 Oct 2015, 20:54:47 (9 years ago)

Author:

Henrik Bettermann

Message:

Use second matriculation number counter and configure constructMatricNumber method.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students/tests

Files:

• test_browser.py (modified) (1 diff)
• test_utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -462 +462 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
-        path = os.path.join(samples_dir(), 'transcript.pdf')
+        path = os.path.join(samples_dir(), 'matric_number_slip.pdf')
         open(path, 'wb').write(self.browser.contents)
         print "Sample PDF matric_number_slip.pdf written to %s" % path

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -116 +116 @@
         utils = getUtility(IStudentsUtils)
         site['configuration'].next_matric_integer = 1
+        site['configuration'].next_matric_integer_2 = 1
         self.student.matric_number = None
-        # So far we don't set matric numbers of ft students.
+        # Regular ft students have a matric number without leading constant.
         msg, mnumber = utils.setMatricNumber(self.student)
-        self.assertEqual(msg, 'Matriculation number cannot be set.')
-        self.assertEqual(mnumber, None)
-        #self.assertEqual(msg, None)
-        #self.assertEqual(mnumber, 1)
-        #self.assertEqual(self.student.matric_number, 'fac1/dep1/04/00001')
-        #self.assertEqual(site['configuration'].next_matric_integer, 2)
-        # Part time have an extended matric number
+        self.assertEqual(self.student.matric_number, 'fac1/dep1/04/00001')
+        self.assertEqual(msg, None)
+        # Part time have an extended matric number with leading 'PTP'
+        # and a different counter which is next_matric_integer.
         self.student.matric_number = None
         self.student['studycourse'].certificate.study_mode = 'ug_pt'
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(self.student.matric_number, 'PTP/fac1/dep1/04/00001')
+        self.assertEqual(site['configuration'].next_matric_integer, 2)
+        # Students in faculty FBM an extended matric number with leading 'CMS'
+        # and the regular counter which is next_matric_integer_2.
+        self.app['faculties']['fac1'].code = 'FBM'
+        self.student['studycourse'].certificate.study_mode = 'ug_ft'
+        self.student.matric_number = None
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(self.student.matric_number, 'CMS/FBM/dep1/04/00002')
+        self.assertEqual(site['configuration'].next_matric_integer_2, 3)
         # Foundation programme students don't get matric number.
         self.student.matric_number = None