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

Timestamp:

20 Nov 2012, 06:17:36 (12 years ago)

Author:

Henrik Bettermann

Message:

Use new attrs_to_fields function to display gpa and total_credits on level pages.

Location:

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

Files:

• test_browser.py (modified) (1 diff)
• test_export.py (modified) (4 diffs)

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

@@ -767 +767 @@
         # GPA has been properly calculated and is shown on the page
         self.browser.open(self.student_path + '/studycourse/100')
-        self.assertTrue('3.00' in self.browser.contents)
+        self.assertTrue('3.0' in self.browser.contents)
         self.assertEqual(self.student['studycourse']['100'].gpa, 3.0)
         # Carry-over courses will be collected when next level is created

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

@@ -219 +219 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            ',,0,,,,0,\r\n'
+            '0.0,,,0,0,,,,0,\r\n'
             )
         return
@@ -236 +237 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -251 +253 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -265 +268 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,validated_by,validation_date,'
+            'gpa,level,level_session,level_verdict,total_credits,'
+            'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '100,2012,A,,,A111111,1,CERT1\r\n'
+            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return