Changeset 8728

Timestamp:

15 Jun 2012, 06:41:16 (12 years ago)

Author:

Henrik Bettermann

Message:

Merged with waeup.uniben 8726:8727.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• . (modified) (1 prop)
• applicants/interfaces.py (modified) (2 diffs)
• applicants/tests.py (modified) (5 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

@@ -302 +302 @@
         )
 
-class ICustomApplicant(IUGApplicant,IPGApplicant):
+class ICustomApplicant(IUGApplicant, IPGApplicant):
     """An interface for both types of applicants.
 
+    Attention: The IPGApplicant field seetings will be overwritten
+    by IPGApplicant field settings. If a field is defined
+    in both interfaces zope.schema validates only against the
+    constraints in IUGApplicant. This does not affect the forms
+    since they are build on either IUGApplicant or IPGApplicant.
     """
 
@@ -317 +322 @@
 
 class IUGApplicantEdit(IUGApplicant):
-    """An undergraduate applicant interface for editing.
+    """An undergraduate applicant interface for edit forms.
 
     Here we can repeat the fields from base data and set the

main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests.py

@@ -25 +25 @@
 from zope.intid.interfaces import IIntIds
 from zope.interface.verify import verifyClass, verifyObject
+from zope.schema.interfaces import ConstraintNotSatisfied
 from zope.component.hooks import setSite, clearSite
 from zope.component import createObject, getUtility
@@ -149 +150 @@
 
     def test_manage_and_view_applicant(self):
-        # Managers can manage pg applicants
+        # Managers can manage pg applicants.
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        # The IPGApplicant interface is really used in all pages
+        # The IPGApplicant interface is really used in all pages.
         self.browser.open(self.pgapplicant_path)
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
@@ -164 +165 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         # If we view the applicant in the ug container,
-        # the employer field doesn't appear
+        # the employer field doesn't appear.
         self.browser.open(self.ugapplicant_path)
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
@@ -170 +171 @@
         self.browser.open(self.ugapplicant_path + '/manage')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        # We can save the applicant
+        # We can save the applicant.
         self.fill_correct_values()
         self.browser.getControl(name="form.course1").value = ['CERT1']
@@ -181 +182 @@
         self.browser.open(self.ugapplicant_path + '/application_slip.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        return
+
+    def test_set_wrong_course1(self):
+        self.ugapplicant.course1 = self.certificate
+        self.assertRaises(
+            ConstraintNotSatisfied,
+            setattr, self.ugapplicant, 'course1', self.certificate2)
+        self.pgapplicant.course1 = self.certificate2
+        self.assertRaises(
+            ConstraintNotSatisfied,
+            setattr, self.pgapplicant, 'course1', self.certificate)
         return