Changeset 13858 for main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests

Timestamp:

11 May 2016, 06:37:34 (9 years ago)

Author:

Henrik Bettermann

Message:

Distinguish male and female students.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_student_level_statistics.py (modified) (7 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_student_level_statistics.py

@@ -18 +18 @@
     layer = FunctionalLayer
 
-    levels = (100, 200, 300, 400, 500, 'Total')
+    levels = (u'100 male', u'100 female', u'200 male', u'200 female', u'300 male', u'300 female',
+              u'400 male', u'400 female', u'500 male', u'500 female', u'Total male', u'Total female')
 
     def test_iface(self):
@@ -28 +29 @@
 
     def test_get_student_stats_session_simple(self):
+        self.student['studycourse'].current_level = 110
+        self.student.sex = 'm'
         # we can get a table with one student
         result1 = get_student_stats(2010, 'faccode')
@@ -35 +38 @@
             ((u'fac1', u'Total',),
              self.levels,
-             ((1, 0, 0, 0, 0, 1),
-              (1, 0, 0, 0, 0, 1),)
-             ))
+             ((1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0),
+              (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0))
+            ))
         self.assertEqual(
             result2,
             ((u'fac1', u'Total'),
              self.levels,
-             ((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(self):
-        # we can get a table with several students
+        # we can get a table with several faculties
         self.create_cert(u'fac2', u'dep2', u'CERT2')
+        self.student.sex = 'm'
         result1 = get_student_stats(2010, 'faccode')
         result2 = get_student_stats(2009, 'faccode')
@@ -56 +60 @@
             ((u'fac1', u'fac2', u'Total'),
              self.levels,
-             ((1, 0, 0, 0, 0, 1),
-              (0, 0, 0, 0, 0, 0),
-              (1, 0, 0, 0, 0, 1),)
-             ))
+             ((1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0),
+              (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+              (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0))
+            ))
         self.assertEqual(
             result2,
             ((u'fac1', u'fac2', u'Total'),
              self.levels,
-             ((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, 0, 0, 0, 0, 0, 0),
+              (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+            ))
         return
 
@@ -73 +77 @@
         # we can get a table with several students
         self.create_cert(u'fac2', u'dep2', u'CERT2')
+        self.student.sex = 'm'
         result1 = get_student_stats(2010, 'depcode')
         result2 = get_student_stats(2009, 'depcode')
@@ -79 +84 @@
             ((u'fac1/dep1', u'fac2/dep2', u'Total'),
              self.levels,
-             ((1, 0, 0, 0, 0, 1),
-              (0, 0, 0, 0, 0, 0),
-              (1, 0, 0, 0, 0, 1),)
+             ((1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0),
+              (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+              (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0))
              ))
         self.assertEqual(
@@ -87 +92 @@
             ((u'fac1/dep1', u'fac2/dep2', u'Total'),
              self.levels,
-             ((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, 0, 0, 0, 0, 0, 0),
+              (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
              ))
         return
 
     def test_create_pdf(self):
+        self.student.sex = 'm'
         self.create_cert(u'FAC2', u'dept2', u'CERT2')
-        report = StudentLevelStatisticsReport(2010, 'faccode')
+        self.student['studycourse'].current_level = 220
+        report = StudentLevelStatisticsReport(2010, 'depcode')
         result = report.create_pdf()
         self.assertTrue(result.startswith('%PDF-'))