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

Timestamp:

8 Feb 2017, 07:39:08 (8 years ago)

Author:

Henrik Bettermann

Message:

Adjust reports: Change footer and filename formats.

Location:

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

Files:

• test_level_report.py (modified) (2 diffs)
• test_session_results_presentation.py (modified) (4 diffs)
• test_student_statistics.py (modified) (2 diffs)

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

@@ -129 +129 @@
                          'application/pdf')
         self.assertTrue(
-            'filename="LevelReport_fac1_dep1_CERT1_2010_100_' in
+            'filename="LevelReport_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')
@@ -149 +148 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.level_report.LevelReportPDFView - '
-            'report %s downloaded: LevelReport_fac1_dep1_CERT1_2010_100_'
-            % job_id in logcontent
+            'report %s downloaded: LevelReport_rno%s'
+            % (job_id, job_id) in logcontent
             )
         self.assertTrue(

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

@@ -158 +158 @@
                          'application/pdf')
         self.assertTrue(
-            'filename="SessionResultsPresentation_fac1_dep1_CERT1_2010_100_' in
+            'filename="SessionResultsPresentation_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')
@@ -178 +177 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.session_results_presentation.SessionResultsPresentationPDFView - '
-            'report %s downloaded: SessionResultsPresentation_fac1_dep1_CERT1_2010_100_'
-            % job_id in logcontent
+            'report %s downloaded: SessionResultsPresentation_rno%s'
+            % (job_id, job_id) in logcontent
             )
         self.assertTrue(
@@ -199 +198 @@
                          'application/pdf')
         self.assertTrue(
-            'filename="SessionResultsPresentation_fac1_dep1_CERT1_2010_0_' in
+            'filename="SessionResultsPresentation_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')
@@ -219 +217 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.session_results_presentation.SessionResultsPresentationPDFView - '
-            'report %s downloaded: SessionResultsPresentation_fac1_dep1_CERT1_2010_0_'
-            % job_id in logcontent
+            'report %s downloaded: SessionResultsPresentation_rno%s'
+            % (job_id, job_id) in logcontent
             )
         self.assertTrue(

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

@@ -181 +181 @@
                          'application/pdf')
         self.assertTrue(
-            'filename="StudentStatisticsReport_2004_2005_All_' in
+            'filename="StudentStatisticsReport_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')
@@ -200 +199 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.student_statistics.StudentStatisticsReportPDFView - '
-            'report %s downloaded: StudentStatisticsReport_2004_2005_All__'
-            % job_id in logcontent
+            'report %s downloaded: StudentStatisticsReport_rno%s'
+            % (job_id, job_id) in logcontent
             )
         self.assertTrue(