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

Timestamp:

7 Mar 2017, 06:51:42 (8 years ago)

Author:

Henrik Bettermann

Message:

Transform helper functions into class methods to ease customization.

Location:

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

Files:

• test_level_report.py (modified) (3 diffs)
• test_raw_score_report.py (modified) (3 diffs)
• test_session_results_presentation.py (modified) (7 diffs)

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

@@ -5 +5 @@
 from waeup.kofa.interfaces import IJobManager
 from waeup.kofa.students.reports.level_report import (
-    get_students, LevelReport, ILevelReport)
+    LevelReport, ILevelReport)
 from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
@@ -65 +65 @@
         self._add_tickets()
          # we can get a table with one student
-        result = get_students('fac1', 'dep1', 'CERT1', 2010, 100)
+        lr =  LevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = lr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
         self.assertEqual(result,
             [(u'1234', u'Bob Tester', 90, 30, '1.666',
@@ -71 +72 @@
             90, 30, '1.666', '')])
         # same result when selecting all certificates
-        result = get_students('fac1', 'dep1', 'all', 2010, 100)
+        result = lr._get_students('fac1', 'dep1', 'all', 2010, 100)
         self.assertEqual(result,
             [(u'1234', u'Bob Tester', 90, 30, '1.666',

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

@@ -10 +10 @@
 from waeup.kofa.browser.tests.test_pdf import samples_dir
 from waeup.kofa.students.reports.raw_score_report import (
-    get_students, RawScoreReport, IRawScoreReport,
-    get_courses)
+    RawScoreReport, IRawScoreReport)
 
 
@@ -37 +36 @@
     def test_get_courses(self):
         # we can get a list with one course code
-        result = get_courses('fac1', 'dep1', 'CERT1', 2010, 100)
+        rsr = RawScoreReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = rsr._get_courses('fac1', 'dep1', 'CERT1', 2010, 100)
         self.assertEqual(result, [(u'Course1')])
         return
@@ -43 +43 @@
     def test_get_students(self):
         # we can get a table with one student
-        course_codes = get_courses('fac1', 'dep1', 'CERT1', 2010, 100)
-        result = get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
+        rsr = RawScoreReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        course_codes = rsr._get_courses('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = rsr._get_students(
+            'fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
         self.assertEqual(result,
             [(u'1234', u'Bob Tester', {'Course1': (70, 'A')})])
         self.student['studycourse']['100']['Course1'].score = None
-        result = get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
+        result = rsr._get_students(
+            'fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
         self.assertEqual(result,
             [(u'1234', u'Bob Tester', {'Course1': ('Nil', '')})])

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

@@ -6 +6 @@
 from waeup.kofa.interfaces import IJobManager
 from waeup.kofa.students.reports.session_results_presentation import (
-    get_students, SessionResultsPresentation, ISessionResultsPresentation)
+    SessionResultsPresentation, ISessionResultsPresentation)
 from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
@@ -26 +26 @@
 
     def test_get_students(self):
-        result = get_students('fac1', 'dep1', 'CERT1', 2010, 100)
+        sr = SessionResultsPresentation('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
         self.assertEqual(result,
             [[], [], [], [], [], [(u'K1000000', u'1234', u'Bob Tester')], []])
@@ -32 +33 @@
 
     def test_get_students_at_all_levels(self):
-        result = get_students('fac1', 'dep1', 'CERT1', 2010, 0)
+        sr = SessionResultsPresentation('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 0)
         self.assertEqual(result,
             [[], [], [], [], [], [(u'K1000000', u'1234', u'Bob Tester')], []])
@@ -38 +40 @@
 
     def test_get_students_all_certs(self):
-        result = get_students('fac1', 'dep1', 'all', 2010, 100)
+        sr = SessionResultsPresentation('fac1', 'dep1', 'all', 2010, 100)
+        result = sr._get_students('fac1', 'dep1', 'all', 2010, 100)
         self.assertEqual(result,
             [[], [], [], [], [], [(u'K1000000', u'1234', u'Bob Tester')], []])
@@ -49 +52 @@
         studylevel.level_session = 2010
         self.student['studycourse']['200'] = studylevel
-        result = get_students('fac1', 'dep1', 'CERT1', 2010, 0)
+        sr = SessionResultsPresentation('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 0)
         self.assertEqual(result,
             [[], [], [], [], [], [], [(u'K1000000', u'1234', u'Bob Tester')]])
@@ -56 +60 @@
     def test_get_students_without_scores(self):
         self.student['studycourse']['100']['Course1'].score = None
-        result = get_students('fac1', 'dep1', 'CERT1', 2010, 0)
+        sr = SessionResultsPresentation('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 0)
         self.assertEqual(result,
             [[], [], [], [], [], [], [(u'K1000000', u'1234', u'Bob Tester')]])
@@ -62 +67 @@
     def test_get_students_without_level_in_session(self):
         self.student['studycourse']['100'].level_session = 2011
-        result = get_students('fac1', 'dep1', 'CERT1', 2010)
+        sr = SessionResultsPresentation('fac1', 'dep1', 'CERT1', 2010, 100)
+        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010)
         self.assertEqual(result,
             [[], [], [], [], [], [], []])