Changeset 7952

Timestamp:

22 Mar 2012, 07:46:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Improve tests (and remove bugs found by testing).

Location:

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

Files:

• batching.py (modified) (1 diff)
• tests/sample_student_data.csv (modified) (1 diff)
• tests/sample_verdict_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -681 +681 @@
         for key, value in row.items():
             # Skip fields not declared in interface plus
-            # current_verdict and current_level
+            # current_session and current_level
             if hasattr(obj, key) and not key in [
-                'current_verdict','current_level']:
+                'current_session','current_level']:
                 setattr(obj, key, value)
             items_changed += '%s=%s, ' % (key,value)

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

@@ -3 +3 @@
 ,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234,courses validated
 ,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234,courses validated
+,Else,Mueller,4,1990-01-05,100003,aa@aa.ng,1234,courses registered

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

@@ -1 +1 @@
 matric_number,current_session,current_level,current_verdict
 100000,2008,200,A
-100001,2008,200,B
-100002,2008,200,C
+100001,2008,100,B
+100002,2007,200,C
+100003,2008,200,A

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

@@ -241 +241 @@
             self.csv_file, STUDENT_HEADER_FIELDS)
         self.assertEqual(num_warns,0)
-        assert len(self.app['students'].keys()) == 4
+        assert len(self.app['students'].keys()) == 5
         self.assertEqual(self.app['students']['X666666'].reg_number,'1')
         shutil.rmtree(os.path.dirname(fin_file))
@@ -383 +383 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, VERDICT_HEADER_FIELDS,'update')
-        self.assertEqual(num_warns,0)
-        studycourse = self.processor.getEntry(dict(reg_number='1'), self.app)
-        self.assertEqual(studycourse.certificate.code, u'CERT1')
+        self.assertEqual(num_warns,3)
+        studycourse = self.processor.getEntry(dict(matric_number='100000'), self.app)
+        student = self.processor.getParent(dict(matric_number='100000'), self.app)
+        self.assertEqual(studycourse.current_verdict, 'A')
+        self.assertEqual(student.state, 'returning')
         shutil.rmtree(os.path.dirname(fin_file))