Changeset 15066

Timestamp:

28 Jun 2018, 08:24:37 (6 years ago)

Author:

Henrik Bettermann

Message:

Extend tests.

Location:

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

Files:

• batching.py (modified) (1 diff)
• browser.py (modified) (2 diffs)
• tests/sample_studylevel_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (5 diffs)

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

@@ -614 +614 @@
     def addEntry(self, obj, row, site):
         if IGNORE_MARKER == str(row['level']):
-            raise FatalCSVError("Invalid level")
+            raise FatalCSVError("level: Invalid value")
         parent = self.getParent(row, site)
         parent[str(row['level'])] = obj

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

@@ -938 +938 @@
             # handle_certificate_removed does only clear
             # studycourses with certificate code 'studycourse' but not
-            # 'studycourse_1' or 'studycourse_2'.These certificates do
+            # 'studycourse_1' or 'studycourse_2'. These certificates do
             # still exist but have no parents.
             pass
@@ -951 +951 @@
             # handle_certificate_removed does only clear
             # studycourses with certificate code 'studycourse' but not
-            # 'studycourse_1' or 'studycourse_2'.These certificates do
+            # 'studycourse_1' or 'studycourse_2'. These certificates do
             # still exist but have no parents.
             pass

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

@@ -6 +6 @@
 1,,2008,A,111
 1,,2008,A,nonsense
+1,,2008,A,<IGNORE>
 4,,2008,A,200
 5,,2008,A,200

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

@@ -775 +775 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, STUDYLEVEL_HEADER_FIELDS,'create')
-        self.assertEqual(num_warns,2)
+        self.assertEqual(num_warns,3)
         assert self.processor.entryExists(
             dict(reg_number='1', level='100'), self.app) is True
@@ -784 +784 @@
         self.assertEqual(studylevel.level_verdict, '0')
         self.assertEqual(studylevel.level, 100)
-        shutil.rmtree(os.path.dirname(fin_file))
-
         logcontent = open(self.logfile).read()
         # Logging message from updateEntry,
@@ -793 +791 @@
             'level=100, level_verdict=C, level_session=2009'
             in logcontent)
+        content = open(fail_file).read()
+        self.assertEqual(
+            content,
+            'reg_number,level_verdict,level_session,matric_number,level,'
+            '--ERRORS--\r\n'
+            '1,A,2008,<IGNORE>,111,level: Invalid value\r\n'
+            '1,A,2008,<IGNORE>,nonsense,level: Invalid value\r\n'
+            '1,A,2008,<IGNORE>,<IGNORE>,level: Invalid value\r\n'
+            )
+        shutil.rmtree(os.path.dirname(fin_file))
 
     def test_import_update(self):
@@ -803 +811 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, STUDYLEVEL_HEADER_FIELDS,'update')
-        self.assertEqual(num_warns,2)
+        self.assertEqual(num_warns,3)
         studylevel = self.processor.getEntry(
             dict(reg_number='1', level='100'), self.app)
         self.assertEqual(studylevel.level, 100)
+        content = open(fail_file).read()
+        self.assertEqual(
+            content,
+            'reg_number,level_verdict,level_session,matric_number,level,'
+            '--ERRORS--\r\n'
+            '1,A,2008,<IGNORE>,111,level: Invalid value\r\n'
+            '1,A,2008,<IGNORE>,nonsense,level: Invalid value\r\n'
+            '1,A,2008,<IGNORE>,<IGNORE>,Cannot update: no such entry\r\n'
+            )
         shutil.rmtree(os.path.dirname(fin_file))
 
@@ -820 +837 @@
         assert self.processor.entryExists(
             dict(reg_number='1', level='100'), self.app) is False
-        self.assertEqual(num_warns,2)
+        self.assertEqual(num_warns,3)
 
         shutil.rmtree(os.path.dirname(fin_file))