Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/tests/test_dynamicroles.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/tests/test_dynamicroles.py (modified) (4 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/tests/test_dynamicroles.py

@@ -25 +25 @@
     Test as APRMTest, Manageable)
 from waeup.kofa.testing import FunctionalLayer
-from waeup.kofa.app import University
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
 from waeup.kofa.students import Student, StudentPrincipalRoleManager
@@ -49 +48 @@
     def setUp(self):
         super(StudentPrincipalRoleManagerFunctionalTests, self).setUp()
+        self.officer_role = 'waeup.StudentsClearanceOfficer'
         # assign clearance permissions for a virtual officer
         prm = IPrincipalRoleManager(self.app['faculties']['fac1']['dep1'])
         prm.assignRoleToPrincipal('waeup.local.ClearanceOfficer', 'alice')
-        prm.assignRoleToPrincipal('waeup.local.PGClearanceOfficer', 'bob')
-        prm.assignRoleToPrincipal('waeup.local.UGClearanceOfficer', 'anne')
         return
 
@@ -76 +74 @@
         # student
         prm = IPrincipalRoleManager(self.student)
-        result = prm.getRolesForPrincipal('claus')
+        result = prm.getRolesForPrincipal('bob')
         self.assertEqual(result, [])
         return
@@ -85 +83 @@
         prm = IPrincipalRoleManager(self.student)
         result = prm.getRolesForPrincipal('alice')
-        self.assertEqual(result, [('waeup.StudentsClearanceOfficer', Allow)])
-        # Student is a UG student
-        self.assertFalse(self.student.is_postgrad)
-        result = prm.getRolesForPrincipal('bob')
-        self.assertEqual(result, [('waeup.StudentsOfficer', Allow)])
-        result = prm.getRolesForPrincipal('anne')
-        self.assertEqual(result, [('waeup.StudentsClearanceOfficer', Allow)])
-        # Make student a PG student
-        self.certificate.study_mode = u'pg_ft'
-        self.assertTrue(self.student.is_postgrad)
-        result = prm.getRolesForPrincipal('bob')
-        # The dynamic roles changed
-        self.assertEqual(result, [('waeup.StudentsClearanceOfficer', Allow)])
-        result = prm.getRolesForPrincipal('anne')
-        self.assertEqual(result, [('waeup.StudentsOfficer', Allow)])
+        self.assertEqual(result, [(self.officer_role, Allow)])
         return