Changeset 14206 for main/waeup.aaue/trunk/src/waeup/aaue/students/tests

Timestamp:

29 Sep 2016, 08:54:32 (8 years ago)

Author:

Henrik Bettermann

Message:

Add imported_gpa and imported_cgpa fields and adjust exporters and batch processors.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students/tests

Files:

• test_browser.py (modified) (2 diffs)
• test_export.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -43 +43 @@
 
 
-class StudentProcessorTest(FunctionalTestCase):
-    """Perform some batching tests.
-    """
-
-    layer = FunctionalLayer
-
-    def setUp(self):
-        super(StudentProcessorTest, self).setUp()
-        # Setup a sample site for each test
-        app = University()
-        self.dc_root = tempfile.mkdtemp()
-        app['datacenter'].setStoragePath(self.dc_root)
-
-        # Prepopulate the ZODB...
-        self.getRootFolder()['app'] = app
-        # we add the site immediately after creation to the
-        # ZODB. Catalogs and other local utilities are not setup
-        # before that step.
-        self.app = self.getRootFolder()['app']
-        # Set site here. Some of the following setup code might need
-        # to access grok.getSite() and should get our new app then
-        setSite(app)
-
-
-    def tearDown(self):
-        super(StudentProcessorTest, self).tearDown()
-        shutil.rmtree(self.workdir)
-        shutil.rmtree(self.dc_root)
-        clearSite()
-        return
-
 UPLOAD_CSV_TEMPLATE = (
     'matric_number,student_id,display_fullname,level,code,level_session,'
@@ -144 +113 @@
         self.assertEqual(self.student['studycourse']['100'].gpa_params[2], 82.0)
         # sgpa = 82 / 23
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.565)
+        self.assertEqual(
+            self.student['studycourse']['100'].gpa_params[0], 3.565)
+        # imported gpa values override calculated values
+        studylevel.imported_gpa = 4.3
+        studylevel.imported_cgpa = 5.4
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 4.3)
+        self.assertEqual(
+            self.student['studycourse']['100'].cumulative_params[0], 5.4)
+        self.assertEqual(self.student['studycourse']['100'].gpa, 4.3)
+        self.student['studycourse'].imported_cgpa = 6.6
+        self.assertEqual(
+            self.student['studycourse'].getTranscriptData()[1], 6.6)
         return
 

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_export.py

@@ -138 +138 @@
         self.assertEqual(
             result,
-            'gpa,level,level_session,level_verdict,total_credits,'
+            'gpa,imported_cgpa,imported_gpa,'
+            'level,level_session,level_verdict,total_credits,'
             'total_credits_s1,total_credits_s2,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.0,100,2012,A,100,,,,,A111111,1,CERT1\r\n'
+            '0.0,,,100,2012,A,100,,,,,A111111,1,CERT1\r\n'
             )
         return