Changeset 10479 for main/waeup.kofa/trunk/src/waeup/kofa/students/tests

Timestamp:

12 Aug 2013, 08:57:26 (11 years ago)

Author:

Henrik Bettermann

Message:

Reinvent temporary/unrectified/momentary/sessional gpa as a property attribute of study levels. The sessional gpa shown on transcript slips is now called 'rectified sessional gpa'.

Location:

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

Files:

• test_browser.py (modified) (4 diffs)
• test_export.py (modified) (5 diffs)

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

@@ -799 +799 @@
         self.browser.open(self.student_path + '/studycourse/100')
         # total credits
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[1], 23)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[1], 23)
         # weigheted credits = 3 * 10 + 4 * 13
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[2], 82.0)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[2], 82.0)
         # sgpa = 82 / 23
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.57)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 3.57)
         # Carry-over courses will be collected when next level is created
         self.browser.open(self.student_path + '/studycourse/manage')
@@ -833 +833 @@
         studylevel['COURSE1'].score = studylevel['COURSE1'].passmark + 1
         # GPA is 1.
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 1.0)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 1.0)
         # Set score below passmark.
         studylevel['COURSE1'].score = studylevel['COURSE1'].passmark - 1
         # GPA is still 0.
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 0.0)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 0.0)
         studylevel2 = createObject(u'waeup.StudentStudyLevel')
         studylevel2.level = 200
@@ -847 +847 @@
         # The score of the carry-over course is now used for calculation of the
         # GPA at level 100 ...
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 4.0)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 4.0)
         # ... but not at level 200
-        self.assertEqual(self.student['studycourse']['200'].gpa_params[0], 0.0)
+        self.assertEqual(self.student['studycourse']['200'].gpa_params_rectified[0], 0.0)
         return
 
@@ -1897 +1897 @@
         self.student['studycourse']['110']['COURSE2'] = courseticket
         self.student['studycourse']['100']['COURSE1'].score = 55
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.0)
-        self.assertEqual(self.student['studycourse']['110'].gpa_params[0], 4.0)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 3.0)
+        self.assertEqual(self.student['studycourse']['110'].gpa_params_rectified[0], 4.0)
         # Get transcript data
         td = self.student['studycourse'].getTranscriptData()

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -403 +403 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,total_credits,'
+            'gpa,level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            ',,0,0,,,,0,\r\n'
+            '0.0,,,0,0,,,,0,\r\n'
             )
         return
@@ -421 +421 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,total_credits,'
+            'gpa,level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -437 +437 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,total_credits,'
+            'gpa,level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -452 +452 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,total_credits,'
+            'gpa,level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -471 +471 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,total_credits,'
+            'gpa,level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return