Changeset 15918 for main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

Timestamp:

13 Jan 2020, 13:06:54 (5 years ago)

Author:

Henrik Bettermann

Message:

Add session_levelfilter to StudentStudyLevelExporter.

Adjust tests.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py (modified) (9 diffs)

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

@@ -3760 +3760 @@
             'zope.mgr - students.browser.DatacenterExportJobContainerJobConfig '
             '- exported: bursary (2004, 100, ug_ft, None, None, None, '
-            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3843 +3843 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
         job_id = self.app['datacenter'].running_exports[0][0]
@@ -3859 +3860 @@
             'zope.mgr - students.browser.FacultiesExportJobContainerJobConfig '
             '- exported: bursary (2004, 100, ug_ft, None, None, None, '
-            '13/12/2012, 14/12/2012, all, all, schoolfee, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, schoolfee, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3889 +3890 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
 
     def test_faculty_export(self):
@@ -3941 +3943 @@
             'zope.mgr - students.browser.FacultyExportJobContainerJobConfig '
             '- exported: students (2004, 100, ug_ft, fac1, None, None, '
-            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -4000 +4002 @@
             'zope.mgr - students.browser.DepartmentExportJobContainerJobConfig '
             '- exported: students (2004, 100, ug_ft, None, dep1, None, '
-            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -4047 +4049 @@
             'zope.mgr - students.browser.CertificateExportJobContainerJobConfig '
             '- exported: students '
-            '(2004, 100, None, None, None, CERT1, , , None, None, None, None), '
+            '(2004, 100, None, None, None, CERT1, , , None, None, '
+            'None, None, None), '
             'job_id=%s'
             % job_id in logcontent
@@ -4246 +4249 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
         # ... and discarded
         self.browser.open('http://localhost/app/faculties/exports')
@@ -4272 +4276 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
 
     def test_export_accommodation_officers(self):