Changeset 13904 for main/waeup.kofa/trunk/src/waeup

Timestamp:

10 Jun 2016, 06:42:01 (9 years ago)

Author:

uli

Message:

Merge uli-scores-upload into trunk.

Looks like subversion branching model is broken, if
branching blocks people.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/students/tests/test_browser.py (modified) (29 diffs)

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

@@ -1 +1 @@
 ## $Id$
-## 
+##
 ## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
 ## This program is free software; you can redistribute it and/or modify
@@ -6 +6 @@
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
@@ -41 +41 @@
 from waeup.kofa.app import University
 from waeup.kofa.payments.interfaces import IPayer
-from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.student import Student
 from waeup.kofa.students.studylevel import StudentStudyLevel
@@ -56 +55 @@
 SAMPLE_IMAGE = os.path.join(os.path.dirname(__file__), 'test_image.jpg')
 SAMPLE_IMAGE_BMP = os.path.join(os.path.dirname(__file__), 'test_image.bmp')
+
 
 def lookup_submit_value(name, value, browser):
@@ -67 +67 @@
             break
     return None
+
 
 class StudentsFullSetup(FunctionalTestCase):
@@ -180 +181 @@
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
             self.course)
-        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
-            self.course, level=100)
+        self.app['faculties']['fac1']['dep1'].certificates[
+            'CERT1'].addCertCourse(self.course, level=100)
 
         # Configure university and hostels
@@ -239 +240 @@
 
 
-
 class StudentsContainerUITests(StudentsFullSetup):
     # Tests for StudentsContainer class views and pages
@@ -276 +276 @@
         self.browser.getControl(name="form.reg_number").value = '123'
         self.browser.getControl("Create student").click()
-        self.assertTrue('Registration number exists already'
-            in self.browser.contents)
+        self.assertTrue(
+            'Registration number exists already' in self.browser.contents)
         self.browser.getControl(name="form.reg_number").value = '1234'
         self.browser.getControl("Create student").click()
@@ -425 +425 @@
         return
 
+
 class OfficerUITests(StudentsFullSetup):
     # Tests for Student class views and pages
@@ -441 +442 @@
         studylevel.level = 100
         cert = self.app['faculties']['fac1']['dep1'].certificates['CERT1']
-        self.student['studycourse'].addStudentStudyLevel(
-            cert,studylevel)
+        self.student['studycourse'].addStudentStudyLevel(cert, studylevel)
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.studycourse_path + '/100/manage')
-        self.assertEqual(self.browser.url, self.studycourse_path + '/100/manage')
+        self.assertEqual(
+            self.browser.url, self.studycourse_path + '/100/manage')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
 
@@ -453 +454 @@
         self.browser.getLink("Logout").click()
         self.assertTrue('You have been logged out' in self.browser.contents)
-        # But we are still logged in since we've used basic authentication here.
-        # Wikipedia says: Existing browsers retain authentication information
-        # until the tab or browser is closed or the user clears the history.
-        # HTTP does not provide a method for a server to direct clients to
-        # discard these cached credentials. This means that there is no
-        # effective way for a server to "log out" the user without closing
-        # the browser. This is a significant defect that requires browser
-        # manufacturers to support a "logout" user interface element ...
+        # But we are still logged in since we've used basic
+        # authentication here.  Wikipedia says: Existing browsers
+        # retain authentication information until the tab or browser
+        # is closed or the user clears the history.  HTTP does not
+        # provide a method for a server to direct clients to discard
+        # these cached credentials. This means that there is no
+        # effective way for a server to "log out" the user without
+        # closing the browser. This is a significant defect that
+        # requires browser manufacturers to support a "logout" user
+        # interface element ...
         self.assertTrue('Manager' in self.browser.contents)
 
@@ -571 +574 @@
         self.browser.open(self.student_path)
         self.browser.getLink("Send email").click()
-        self.browser.getControl(name="form.subject").value = 'Important subject'
+        self.browser.getControl(
+            name="form.subject").value = 'Important subject'
         self.browser.getControl(name="form.body").value = 'Hello!'
         self.browser.getControl("Send message now").click()
-        self.assertTrue('An smtp server error occurred' in self.browser.contents)
+        self.assertTrue(
+            'An smtp server error occurred' in self.browser.contents)
         self.student.email = 'xx@yy.zz'
         self.browser.getControl("Send message now").click()
@@ -623 +628 @@
         file_ctrl.add_file(image, filename='my_birth_certificate.jpg')
         # The Save action does not upload files
-        self.browser.getControl("Save").click() # submit form
+        self.browser.getControl("Save").click()  # submit form
         self.assertFalse(
             '<a target="image" href="birth_certificate">'
@@ -661 +666 @@
             'Uploaded file is too big' in self.browser.contents)
         # we do not rely on filename extensions given by uploaders
-        image = open(SAMPLE_IMAGE, 'rb') # a jpg-file
+        image = open(SAMPLE_IMAGE, 'rb')  # a jpg-file
         ctrl = self.browser.getControl(name='birthcertificateupload')
         file_ctrl = ctrl.mech_control
@@ -682 +687 @@
         self.browser.getControl(
             name='upload_birthcertificateupload').click()
-        self.assertTrue('Only the following extensions are allowed'
+        self.assertTrue(
+            'Only the following extensions are allowed'
             in self.browser.contents)
 
@@ -693 +699 @@
         self.browser.getControl(
             name='upload_passportuploadmanage').click()
-        self.assertTrue('jpg file format expected'
-            in self.browser.contents)
+        self.assertTrue(
+            'jpg file format expected' in self.browser.contents)
         ctrl = self.browser.getControl(name='passportuploadmanage')
         file_ctrl = ctrl.mech_control
@@ -751 +757 @@
         self.assertMatches('...<span>100</span>...', self.browser.contents)
         self.assertEqual(self.student['studycourse']['100'].level, 100)
-        self.assertEqual(self.student['studycourse']['100'].level_session, 2004)
+        self.assertEqual(
+            self.student['studycourse']['100'].level_session, 2004)
         self.browser.getControl(name="addlevel").value = ['100']
         self.browser.getControl(name="level_session").value = ['2004']
@@ -767 +774 @@
             self.app['datacenter'].storage, 'logs', 'students.log')
         logcontent = open(logfile).read()
-        self.assertTrue('zope.mgr - students.browser.StudyCourseManageFormPage '
-                        '- K1000000 - removed: 100' in logcontent)
+        self.assertTrue(
+            'zope.mgr - students.browser.StudyCourseManageFormPage '
+            '- K1000000 - removed: 100' in logcontent)
         # Add level again
         self.browser.getControl(name="addlevel").value = ['100']
@@ -791 +799 @@
             self.app['datacenter'].storage, 'logs', 'students.log')
         logcontent = open(logfile).read()
-        self.assertTrue('zope.mgr - students.browser.StudyLevelManageFormPage '
-        '- K1000000 - removed: COURSE1 at 100' in logcontent)
+        self.assertTrue(
+            'zope.mgr - students.browser.StudyLevelManageFormPage '
+            '- K1000000 - removed: COURSE1 at 100' in logcontent)
         self.browser.getLink("here").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -824 +833 @@
         self.assertTrue('Grade' in self.browser.contents)
         self.assertTrue('Weight' in self.browser.contents)
-        self.assertEqual(self.student['studycourse']['100']['COURSE1'].grade, 'C')
-        self.assertEqual(self.student['studycourse']['100']['COURSE1'].weight, 3)
-        # We add another ticket to check if GPA will be correctly calculated
-        # (and rounded)
+        self.assertEqual(
+            self.student['studycourse']['100']['COURSE1'].grade, 'C')
+        self.assertEqual(
+            self.student['studycourse']['100']['COURSE1'].weight, 3)
+        # We add another ticket to check if GPA will be correctly
+        # calculated (and rounded)
         courseticket = createObject('waeup.CourseTicket')
         courseticket.code = 'ANYCODE'
@@ -839 +850 @@
         self.browser.open(self.student_path + '/studycourse/100')
         # total credits
-        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[1], 23)
+        self.assertEqual(
+            self.student['studycourse']['100'].gpa_params_rectified[1], 23)
         # weigheted credits = 3 * 10 + 4 * 13
-        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[2], 82.0)
+        self.assertEqual(
+            self.student['studycourse']['100'].gpa_params_rectified[2], 82.0)
         # sgpa = 82 / 23
-        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 3.565)
+        self.assertEqual(
+            self.student['studycourse']['100'].gpa_params_rectified[0], 3.565)
         # Carry-over courses will be collected when next level is created
         self.browser.open(self.student_path + '/studycourse/manage')
@@ -891 +905 @@
         studylevel['COURSE1'].score = studylevel['COURSE1'].passmark + 1
         # GPA is 1.
-        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 1.0)
+        self.assertEqual(
+            self.student['studycourse']['100'].gpa_params_rectified[0], 1.0)
         # Set score below passmark.
         studylevel['COURSE1'].score = studylevel['COURSE1'].passmark - 1
         # GPA is still 0.
-        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 0.0)
+        self.assertEqual(
+            self.student['studycourse']['100'].gpa_params_rectified[0], 0.0)
         studylevel2 = createObject(u'waeup.StudentStudyLevel')
         studylevel2.level = 200
@@ -905 +921 @@
         # The score of the carry-over course is now used for calculation of the
         # GPA at level 100 ...
-        self.assertEqual(self.student['studycourse']['100'].gpa_params_rectified[0], 4.0)
+        self.assertEqual(
+            self.student['studycourse']['100'].gpa_params_rectified[0], 4.0)
         # ... but not at level 200
-        self.assertEqual(self.student['studycourse']['200'].gpa_params_rectified[0], 0.0)
+        self.assertEqual(
+            self.student['studycourse']['200'].gpa_params_rectified[0], 0.0)
         return
 
@@ -940 +958 @@
         #                   self.browser.contents)
 
-        # The same payment (with same p_item, p_session and p_category)
-        # can be initialized a second time if the former ticket is not yet paid.
+        # The same payment (with same p_item, p_session and
+        # p_category) can be initialized a second time if the former
+        # ticket is not yet paid.
         self.browser.open(self.payments_path)
         self.browser.getLink("Add current session payment ticket").click()
@@ -958 +977 @@
         # an access code is created after approval.
         IWorkflowState(self.student).setState('school fee paid')
-        self.assertEqual(len(self.app['accesscodes']['SFE-0']),0)
+        self.assertEqual(len(self.app['accesscodes']['SFE-0']), 0)
         self.browser.open(payment_url)
         self.browser.getLink("Approve payment").click()
-        self.assertMatches('...Payment approved...',
-                          self.browser.contents)
+        self.assertMatches(
+            '...Payment approved...', self.browser.contents)
         # Approval is logged in students.log ...
         logcontent = open(logfile).read()
@@ -978 +997 @@
         # The authorized amount has been stored in the new access code
         self.assertEqual(
-            self.app['accesscodes']['SFE-0'].values()[0].cost,40000.0)
+            self.app['accesscodes']['SFE-0'].values()[0].cost, 40000.0)
 
         # The catalog has been updated
@@ -1386 +1405 @@
         IWorkflowState(self.student).setState('school fee paid')
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        student = self.app['students'][self.student_id]
         self.browser.open(self.trigtrans_path)
         self.assertTrue('<option value="reset6">' in self.browser.contents)
@@ -3937 +3955 @@
         # Thew job can be discarded
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
-        #job_id = self.app['datacenter'].running_exports[0][0]
-        job_id = self.wait_for_export_job_completed()
+        self.wait_for_export_job_completed()
         self.browser.open("http://localhost/app/faculties/fac1/dep1/exports")
         self.browser.getControl("Discard").click()
@@ -3976 +3993 @@
         # Thew job can be discarded
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
-        #job_id = self.app['datacenter'].running_exports[0][0]
-        job_id = self.wait_for_export_job_completed()
+        self.wait_for_export_job_completed()
         self.browser.open('http://localhost/app/faculties/exports')
         self.browser.getControl("Discard").click()