Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/tests/test_export.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/applicants/tests/test_export.py (modified) (6 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/tests/test_export.py

@@ -120 +120 @@
         applicant.course_admitted = self.certificate
         applicant.notice = u'Some notice\nin lines.'
+        applicant.screening_score = 98
+        applicant.screening_venue = u'Exam Room'
         applicant.password = 'any password'
         result_entry = ResultEntry(
@@ -142 +144 @@
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,state,'
-            'student_id,suspended,container_code\r\n'
+            'reg_number,screening_score,screening_venue,sex,state,'
+            'student_id,container_code\r\n'
             'dp2011_654321,,654321,,,,,Anna Tester,,Anna,'
             in result)
         self.assertTrue(
             'Application initialized by system\'],Tester,'
-            '0,,,,,,,initialized,,0,dp2011\r\n'
+            '0,,,,,,,,,initialized,,dp2011\r\n'
             in result)
         return
@@ -166 +168 @@
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,state,'
-            'student_id,suspended,container_code\r\n'
+            'reg_number,screening_score,screening_venue,sex,state,'
+            'student_id,container_code\r\n'
             'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
             'Anna M. Tester,anna@sample.com,Anna,'
@@ -174 +176 @@
             'Application initialized by system\'],'
             'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,initialized,,0,dp2011\r\n'
+            '+234-123-12345,123456,98,Exam Room,f,initialized,,dp2011\r\n'
             in result)
 
@@ -190 +192 @@
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,state,'
-            'student_id,suspended,container_code\r\n'
+            'reg_number,screening_score,screening_venue,sex,state,'
+            'student_id,container_code\r\n'
             'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
             'Anna M. Tester,anna@sample.com,Anna,'
@@ -198 +200 @@
             'Application initialized by system\'],'
             'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,initialized,,0,dp2011\r\n'
-            in result)
-        return
+            '+234-123-12345,123456,98,Exam Room,f,initialized,,dp2011\r\n'
+            in result)
+        return