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

Timestamp:

5 Oct 2012, 05:42:19 (12 years ago)

Author:

Henrik Bettermann

Message:

Set validated_by when bypassing course validation. Declare validated_by and bypass_validation in IStudentVerdictUpdate.

Location:

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

Files:

• sample_student_data.csv (modified) (1 diff)
• sample_studycourse_data.csv (modified) (1 diff)
• sample_studylevel_data.csv (modified) (1 diff)
• sample_verdict_data.csv (modified) (1 diff)
• test_batching.py (modified) (3 diffs)

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

@@ -8 +8 @@
 X111111,Fabian,Riester,7,1990-01-02,100006,aa@aa.ng,1234,m,courses validated
 X222222,Thomas,Kinderman,8,1990-01-02,100007,aa@aa.ng,1234,m,courses validated
+X333333,Paula,Schall,9,1990-01-02,100008,aa@aa.ng,1234,m,courses registered

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

@@ -9 +9 @@
 7,,CERT1,2008,200
 8,,CERT1,2008,200
+9,,CERT1,2008,200

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

@@ -10 +10 @@
 6,,2008,A,200
 7,,2008,A,200
+9,,2008,A,200

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

@@ -1 @@
-matric_number,current_session,current_level,current_verdict,bypass_validation
-100000,2008,200,0,0
-100001,2008,100,B,False
-100002,2007,200,C,
-100003,2008,200,A,
-100004,2008,200,,
-100005,2008,200,A,1
-100006,2008,200,A,True
-100007,2008,200,A,True
+matric_number,current_session,current_level,current_verdict,bypass_validation,validated_by
+100000,2008,200,0,0,
+100001,2008,100,B,False,
+100002,2007,200,C,,
+100003,2008,200,A,,
+100004,2008,200,,,
+100005,2008,200,A,1,
+100006,2008,200,A,True,
+100007,2008,200,A,True,
+100008,2008,200,A,True,Juliana

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

@@ -360 +360 @@
             self.csv_file, STUDENT_HEADER_FIELDS)
         self.assertEqual(num_warns,0)
-        self.assertEqual(len(self.app['students']), 9)
+        self.assertEqual(len(self.app['students']), 10)
         self.assertEqual(self.app['students']['X666666'].reg_number,'1')
         self.assertEqual(
@@ -980 +980 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, VERDICT_HEADER_FIELDS,'update')
-        content = open(fail_file).read()
+        #content = open(fail_file).read()
+        #import pdb; pdb.set_trace()
         self.assertEqual(num_warns,5)
         self.assertEqual(studycourse.current_verdict, '0')
@@ -994 +995 @@
         self.assertTrue(isinstance(
             student['studycourse']['200'].validation_date, datetime.datetime))
+        student = self.processor.getParent(
+            dict(matric_number='100008'), self.app)
+        self.assertEqual(student['studycourse']['200'].validated_by, 'Juliana')
         content = open(fail_file).read()
         self.assertEqual(
             content,
-            'current_session,current_verdict,bypass_validation,'
-            'matric_number,current_level,--ERRORS--\r\n'
-            '2008,B,False,100001,100,Current level does not correspond.\r\n'
-            '2007,C,<IGNORE>,100002,200,Current session does not correspond.\r\n'
-            '2008,A,<IGNORE>,100003,200,Student in wrong state.\r\n'
-            '2008,<IGNORE>,<IGNORE>,100004,200,No verdict in import file.\r\n'
-            '2008,A,True,100007,200,Study level object is missing.\r\n'
+            'current_session,current_level,bypass_validation,current_verdict,'
+            'matric_number,validated_by,--ERRORS--\r\n'
+            '2008,100,False,B,100001,<IGNORE>,Current level does not correspond.\r\n'
+            '2007,200,<IGNORE>,C,100002,<IGNORE>,Current session does not correspond.\r\n'
+            '2008,200,<IGNORE>,A,100003,<IGNORE>,Student in wrong state.\r\n'
+            '2008,200,<IGNORE>,<IGNORE>,100004,<IGNORE>,No verdict in import file.\r\n'
+            '2008,200,True,A,100007,<IGNORE>,Study level object is missing.\r\n'
             )
         logcontent = open(self.logfile).read()