Changeset 8286 for main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests

Timestamp:

26 Apr 2012, 13:58:25 (12 years ago)

Author:

Henrik Bettermann

Message:

Roll back r8282. Also in students the registration state is simply called state.

Location:

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

Files:

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

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

@@ -662 +662 @@
         self.assertMatches('...paid...',
                            self.browser.contents)
-        app_state = IWorkflowState(self.applicant).getState()
-        self.assertTrue(app_state == 'paid')
+        state = IWorkflowState(self.applicant).getState()
+        self.assertTrue(state == 'paid')
 
     def test_final_submit(self):

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

@@ -141 +141 @@
         # into two parts.
         self.assertTrue(
-            'app_state,applicant_id,application_date,application_number,course1,course2,'
+            'applicant_id,application_date,application_number,course1,course2,'
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,screening_score,screening_venue,sex,'
+            'reg_number,screening_score,screening_venue,sex,state,'
             'student_id\r\n'
-            'initialized,dp2011_654321,,654321,,,,,Anna Tester,,Anna,'
+            'dp2011_654321,,654321,,,,,Anna Tester,,Anna,'
             in result)
         self.assertTrue(
             'Application initialized by system\'],Tester,'
-            '0,,,,,,,,,\r\n'
+            '0,,,,,,,,,initialized,\r\n'
             in result)
         return
@@ -164 +164 @@
         # history dict. We skip the date and split the comparison
         # into two parts.
-        print result
-        self.assertTrue(
-            'app_state,applicant_id,application_date,application_number,course1,course2,'
+        self.assertTrue(
+            'applicant_id,application_date,application_number,course1,course2,'
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,screening_score,screening_venue,sex,'
+            'reg_number,screening_score,screening_venue,sex,state,'
             'student_id\r\n'
-            'initialized,dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04,'
+            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04,'
             'Anna M. Tester,anna@sample.com,Anna,'
             in result)
@@ -177 +176 @@
             'Application initialized by system\'],'
             'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345,123456,98,Exam Room,f,\r\n'
+            '+234-123-12345,123456,98,Exam Room,f,initialized,\r\n'
             in result)
 
@@ -190 +189 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'app_state,applicant_id,application_date,application_number,course1,course2,'
+            'applicant_id,application_date,application_number,course1,course2,'
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,screening_score,screening_venue,sex,'
+            'reg_number,screening_score,screening_venue,sex,state,'
             'student_id\r\n'
-            'initialized,dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04,'
+            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04,'
             'Anna M. Tester,anna@sample.com,Anna,'
             in result)
@@ -201 +200 @@
             'Application initialized by system\'],'
             'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345,123456,98,Exam Room,f,\r\n'
-            in result)
-        return
+            '+234-123-12345,123456,98,Exam Room,f,initialized,\r\n'
+            in result)
+        return