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

Timestamp:

26 Apr 2012, 14:13:51 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename reg_state to state to be in accordance with applicants.

Location:

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

Files:

• sample_student_data.csv (modified) (1 diff)
• sample_student_data_migration.csv (modified) (1 diff)
• sample_student_data_update.csv (modified) (1 diff)
• test_batching.py (modified) (4 diffs)

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

@@ -1 @@
-student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,sex,reg_state
+student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,sex,state
 X666666,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,m,courses validated
 Y777777,Claus,Finau,2,1990-01-03,100001,aa@aa.ng,1234,m,courses validated

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

@@ -1 @@
-student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,password,sex,reg_state
+student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,password,sex,state
 A123456,Aaren,Pieri,1,1990-01-02#,100000,aa@aa.ng,1234,mypw1,m,clearance started
 B123456,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234,mypw1,m,cleared

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

@@ -1 @@
-reg_number,date_of_birth,matric_number,reg_state
+reg_number,date_of_birth,matric_number,state
 1,1980-01-02,10,admitted
 2,1980-01-03,11,

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

@@ -220 +220 @@
     def test_checkConversion(self):
         errs, inv_errs, conv_dict = self.processor.checkConversion(
-            dict(reg_number='1', reg_state='admitted'))
-        self.assertEqual(len(errs),0)
-        # Empty reg_state is allowed
-        errs, inv_errs, conv_dict = self.processor.checkConversion(
-            dict(reg_number='1', reg_state=''))
-        self.assertEqual(len(errs),0)
-        #self.assertTrue(('reg_state', 'no value provided') in errs)
-        errs, inv_errs, conv_dict = self.processor.checkConversion(
-            dict(reg_number='1', reg_state='nonsense'))
+            dict(reg_number='1', state='admitted'))
+        self.assertEqual(len(errs),0)
+        # Empty state is allowed
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(reg_number='1', state=''))
+        self.assertEqual(len(errs),0)
+        #self.assertTrue(('state', 'no value provided') in errs)
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(reg_number='1', state='nonsense'))
         self.assertEqual(len(errs),1)
-        self.assertTrue(('reg_state', 'not allowed') in errs)
+        self.assertTrue(('state', 'not allowed') in errs)
 
     def test_delEntry(self):
@@ -254 +254 @@
             self.csv_file_update, STUDENT_HEADER_FIELDS_UPDATE, 'update')
         self.assertEqual(num_warns,0)
-        # reg_state has changed
+        # state has changed
         self.assertEqual(self.app['students']['X666666'].state,'admitted')
-        # reg_state has not changed
+        # state has not changed
         self.assertEqual(self.app['students']['Y777777'].state,'courses validated')
         shutil.rmtree(os.path.dirname(fin_file))
@@ -301 +301 @@
         self.assertEqual(
             content,
-            'reg_number,firstname,student_id,sex,email,phone,date_of_birth,reg_state,lastname,password,matric_number,--ERRORS--\r\n'
-            '4,John,D123456,m,aa@aa.ng,1234,1990-01-05,nonsense,Wolter,mypw1,100003,reg_state: not allowed\r\n'
-            '5,John,E123456,x,aa@aa.ng,1234,1990-01-06,,Kennedy,,100004,sex: Invalid value\r\n'
+            'reg_number,firstname,student_id,sex,email,phone,state,date_of_birth,lastname,password,matric_number,--ERRORS--\r\n'
+            '4,John,D123456,m,aa@aa.ng,1234,nonsense,1990-01-05,Wolter,mypw1,100003,state: not allowed\r\n'
+            '5,John,E123456,x,aa@aa.ng,1234,,1990-01-06,Kennedy,,100004,sex: Invalid value\r\n'
             )
         self.assertTrue('A123456' in self.app['students'].keys())
@@ -317 +317 @@
         self.assertTrue(
             "State 'clearance started' set by system" in history)
-        # reg_state was empty and student is thus in state created
+        # state was empty and student is thus in state created
         self.assertEqual(self.app['students']['F123456'].state,'created')
         shutil.rmtree(os.path.dirname(fin_file))