Changeset 14513 for main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests

Timestamp:

8 Feb 2017, 07:38:30 (8 years ago)

Author:

Henrik Bettermann

Message:

Add entry_session and p_session filter to Student Payment Statistics generator.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_student_payment_statistics.py (modified) (5 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_student_payment_statistics.py

@@ -22 +22 @@
         # ensure we fullfill interface contracts
         obj = StudentPaymentStatisticsReport(
-            2010, 'Undergraduate Full-Time', 0, 'faccode')
+            2010, 'Undergraduate Full-Time', 0, 0, 0, 'faccode')
         verifyClass(IStudentPaymentStatisticsReport, StudentPaymentStatisticsReport)
         verifyObject(IStudentPaymentStatisticsReport, obj)
@@ -30 +30 @@
         # we can get a table with one student
         result1 = get_student_payment_stats(
-            2010, 'Undergraduate Full-Time', 0, 'faccode')
+            2010, 'Undergraduate Full-Time', 0, 0, 0, 'faccode')
         result2 = get_student_payment_stats(
-            2009, 'Undergraduate Full-Time', 0, 'faccode')
+            2009, 'Undergraduate Full-Time', 0, 0, 0, 'faccode')
         self.assertEqual(
             result1,
@@ -55 +55 @@
     def test_create_pdf(self):
         report = StudentPaymentStatisticsReport(
-            2010, 'Undergraduate Full-Time', 0,  'faccode')
+            2010, 'Undergraduate Full-Time', 0, 0, 0, 'faccode')
         result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
@@ -106 +106 @@
                          'application/pdf')
         self.assertTrue(
-            'filename="StudentPaymentStatisticsReport_2004_2005_All__' in
+            'filename="StudentPaymentStatisticsReport_rno%s' % job_id in
             self.browser.headers['content-disposition'])
         self.assertEqual(len(self.app['reports'].running_report_jobs), 1)
-        job_id = self.app['reports'].running_report_jobs[0][0]
         # ... and discarded
         self.browser.open('http://localhost/app/reports')
@@ -120 +119 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.student_payment_statistics.StudentPaymentStatisticsReportGeneratorPage - '
-            'report %s created: Student Payment Statistics (session=2004, mode=All, level=0, breakdown=depcode)'
+            'report %s created: Student Payment Statistics '
+            '(session=2004, mode=All, level=0, entry_session=0, '
+            'p_session=0, breakdown=depcode)'
             % job_id in logcontent
             )
         self.assertTrue(
             'INFO - zope.mgr - students.reports.student_payment_statistics.StudentPaymentStatisticsReportPDFView - '
-            'report %s downloaded: StudentPaymentStatisticsReport_2004_2005_All__'
-            % job_id in logcontent
+            'report %s downloaded: StudentPaymentStatisticsReport_rno%s_'
+            % (job_id, job_id) in logcontent
             )
         self.assertTrue(