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

Timestamp:

1 May 2015, 14:32:09 (9 years ago)

Author:

Henrik Bettermann

Message:

Filter students by current level in reports.

Location:

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

Files:

• test_student_payment_statistics.py (modified) (5 diffs)
• test_student_statistics.py (modified) (7 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', 'faccode')
+            2010, 'Undergraduate Full-Time', 0, 'faccode')
         verifyClass(IStudentPaymentStatisticsReport, StudentPaymentStatisticsReport)
         verifyObject(IStudentPaymentStatisticsReport, obj)
@@ -29 +29 @@
     def test_get_student_payment_stats_session_simple(self):
         # we can get a table with one student
-        result1 = get_student_payment_stats(2010, 'Undergraduate Full-Time', 'faccode')
-        result2 = get_student_payment_stats(2009, 'Undergraduate Full-Time', 'faccode')
+        result1 = get_student_payment_stats(
+            2010, 'Undergraduate Full-Time', 0, 'faccode')
+        result2 = get_student_payment_stats(
+            2009, 'Undergraduate Full-Time', 0, 'faccode')
         self.assertEqual(
             result1,
@@ -53 +55 @@
     def test_create_pdf(self):
         report = StudentPaymentStatisticsReport(
-            2010, 'Undergraduate Full-Time', 'faccode')
+            2010, 'Undergraduate Full-Time', 0,  'faccode')
         result = report.create_pdf()
         self.assertTrue(result.startswith('%PDF-'))
@@ -104 +106 @@
                          'application/pdf')
         self.assertTrue(
-            'filename="StudentPaymentStatisticsReport_2004_2005_All_' in
+            'filename="StudentPaymentStatisticsReport_2004_2005_All__' in
             self.browser.headers['content-disposition'])
         self.assertEqual(len(self.app['reports'].running_report_jobs), 1)
@@ -118 +120 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.student_payment_statistics.StudentPaymentStatisticsReportGeneratorPage - '
-            'report %s created: Student Payment Statistics (session=2004, mode=All, breakdown=depcode)'
+            'report %s created: Student Payment Statistics (session=2004, mode=All, level=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_'
+            'report %s downloaded: StudentPaymentStatisticsReport_2004_2005_All__'
             % job_id in logcontent
             )

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

@@ -25 +25 @@
         # ensure we fullfill interface contracts
         obj = StudentStatisticsReport(
-            2010, 'Undergraduate Full-Time', 'faccode')
+            2010, 'Undergraduate Full-Time', 0, 'faccode')
         verifyClass(IStudentStatisticsReport, StudentStatisticsReport)
         verifyObject(IStudentStatisticsReport, obj)
@@ -32 +32 @@
     def test_get_student_stats_session_simple(self):
         # we can get a table with one student
-        result1 = get_student_stats(2010, 'Undergraduate Full-Time', 'faccode')
-        result2 = get_student_stats(2009, 'Undergraduate Full-Time', 'faccode')
+        result1 = get_student_stats(
+            2010, 'Undergraduate Full-Time', 0, 'faccode')
+        result2 = get_student_stats(
+            2009, 'Undergraduate Full-Time', 0, 'faccode')
         self.assertEqual(
             result1,
@@ -51 +53 @@
         # we can get a table with several students
         self.create_cert(u'fac2', u'dep2', u'CERT2')
-        result1 = get_student_stats(2010, 'Undergraduate Full-Time', 'faccode')
-        result2 = get_student_stats(2009, 'Undergraduate Full-Time', 'faccode')
+        result1 = get_student_stats(
+            2010, 'Undergraduate Full-Time', 0, 'faccode')
+        result2 = get_student_stats(
+            2009, 'Undergraduate Full-Time', 0, 'faccode')
         self.assertEqual(
             result1,
@@ -72 +76 @@
         # we can get a table with several students
         self.create_cert(u'fac2', u'dep2', u'CERT2')
-        result1 = get_student_stats(2010, 'Undergraduate Full-Time', 'depcode')
-        result2 = get_student_stats(2009, 'Undergraduate Full-Time', 'depcode')
+        result1 = get_student_stats(2010, 'Undergraduate Full-Time', 0, 'depcode')
+        result2 = get_student_stats(2009, 'Undergraduate Full-Time', 0, 'depcode')
+        self.assertEqual(
+            result1,
+            ((u'fac1/dep1', u'fac2/dep2', u'Total'),
+             self.states,
+             ((1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1),
+              (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+              (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1),)))
+        self.assertEqual(
+            result2,
+            ((u'fac1/dep1', u'fac2/dep2', u'Total'),
+             self.states,
+             ((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+              (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+              (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),)))
+        return
+
+    def test_get_student_stats_session_multiple_dep_breakdown_level_100(self):
+        # we can get a table with several students
+        self.create_cert(u'fac2', u'dep2', u'CERT2')
+        result1 = get_student_stats(2010, 'Undergraduate Full-Time', 0, 'depcode')
+        result2 = get_student_stats(2009, 'Undergraduate Full-Time', 0, 'depcode')
         self.assertEqual(
             result1,
@@ -93 +118 @@
         self.create_cert(u'FAC2', u'dept2', u'CERT2')
         report = StudentStatisticsReport(
-            2010, 'Undergraduate Full-Time', 'faccode')
+            2010, 'Undergraduate Full-Time', 0, 'faccode')
         result = report.create_pdf()
         self.assertTrue(result.startswith('%PDF-'))
@@ -99 +124 @@
         open(path, 'wb').write(result)
         print "Sample PDF student_statistics.pdf written to %s" % path
+        return
+
+    def test_create_100level_pdf(self):
+        self.create_cert(u'FAC2', u'dept2', u'CERT2')
+        report = StudentStatisticsReport(
+            2010, 'Undergraduate Full-Time', 100, 'faccode')
+        result = report.create_pdf()
+        self.assertTrue(result.startswith('%PDF-'))
+        path = os.path.join(samples_dir(), 'student_statistics_100.pdf')
+        open(path, 'wb').write(result)
+        print "Sample PDF student_statistics_100.pdf written to %s" % path
         return
 
@@ -158 +194 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.student_statistics.StudentStatisticsReportGeneratorPage - '
-            'report %s created: Student Statistics (session=2004, mode=All, breakdown=depcode)'
+            'report %s created: Student Statistics (session=2004, mode=All, level=0, breakdown=depcode)'
             % job_id in logcontent
             )
         self.assertTrue(
             'INFO - zope.mgr - students.reports.student_statistics.StudentStatisticsReportPDFView - '
-            'report %s downloaded: StudentStatisticsReport_2004_2005_All_'
+            'report %s downloaded: StudentStatisticsReport_2004_2005_All__'
             % job_id in logcontent
             )