Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/university/tests/test_export.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/university/tests/test_export.py (modified) (24 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/university/tests/test_export.py

@@ -22 +22 @@
 from zope.component import queryUtility
 from zope.interface.verify import verifyObject, verifyClass
-from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from waeup.kofa.interfaces import ICSVExporter
-from waeup.kofa.testing import KofaUnitTestLayer, FunctionalLayer
+from waeup.kofa.testing import KofaUnitTestLayer
 from waeup.kofa.university import (
     FacultiesContainer, Faculty, Department, Course, Certificate,
@@ -35 +34 @@
 class FacultyExporterTest(unittest.TestCase):
 
-    layer = FunctionalLayer
+    layer = KofaUnitTestLayer
 
     def setUp(self):
@@ -67 +66 @@
         self.assertEqual(
             result,
-            'code,title,title_prefix,users_with_local_roles\r\n'
-            'F1,Faculty of Cheese,faculty,[]\r\n'
+            'code,title,title_prefix\r\n'
+            'F1,Faculty of Cheese,faculty\r\n'
             )
         return
@@ -79 +78 @@
         self.assertEqual(
             result,
-            'code,title,title_prefix,users_with_local_roles\r\n'
-            'F1,Faculty of Cheese,faculty,[]\r\n'
+            'code,title,title_prefix\r\n'
+            'F1,Faculty of Cheese,faculty\r\n'
             )
         return
@@ -97 +96 @@
         self.assertEqual(
             result,
-            'code,title,title_prefix,users_with_local_roles\r\n'
-            'F1,Faculty of Cheese,faculty,[]\r\n'
-            'F2,Centre of Onion,centre,[]\r\n'
+            'code,title,title_prefix\r\n'
+            'F1,Faculty of Cheese,faculty\r\n'
+            'F2,Centre of Onion,centre\r\n'
             )
         return
@@ -115 +114 @@
         self.assertEqual(
             result,
-            'code,title,title_prefix,users_with_local_roles\r\n'
-            'F1,Faculty of Cheese,faculty,[]\r\n'
-            'F2,Centre of Onion,centre,[]\r\n'
+            'code,title,title_prefix\r\n'
+            'F1,Faculty of Cheese,faculty\r\n'
+            'F2,Centre of Onion,centre\r\n'
             )
         return
@@ -124 +123 @@
     # Tests for DepartmentExporter
 
-    layer = FunctionalLayer
+    layer = KofaUnitTestLayer
 
     def setUp(self):
@@ -142 +141 @@
         self.fac1.addDepartment(self.dept2)
         self.fac2.addDepartment(self.dept3)
-        role_manager = IPrincipalRoleManager(self.dept1)
-        role_manager.assignRoleToPrincipal(u'bobsrole', u'bob')
         return
 
@@ -170 +167 @@
         self.assertEqual(
             result,
-            'code,faculty_code,title,title_prefix,users_with_local_roles\r\n'
-            'D1,F1,Department of Cheddar,department,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
+            'code,faculty_code,title,title_prefix\r\n'
+            'D1,F1,Department of Cheddar,department\r\n'
             )
         return
@@ -182 +178 @@
         self.assertEqual(
             result,
-            'code,faculty_code,title,title_prefix,users_with_local_roles\r\n'
-            'D1,F1,Department of Cheddar,department,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'D2,F1,Institue of Gouda,institute,[]\r\n'
+            'code,faculty_code,title,title_prefix\r\n'
+            'D1,F1,Department of Cheddar,department\r\n'
+            'D2,F1,Institue of Gouda,institute\r\n'
             )
         return
@@ -196 +191 @@
         self.assertEqual(
             result,
-            'code,faculty_code,title,title_prefix,users_with_local_roles\r\n'
-            'D1,F1,Department of Cheddar,department,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'D2,F1,Institue of Gouda,institute,[]\r\n'
-            'D3,F2,Department of Rings,department,[]\r\n'
+            'code,faculty_code,title,title_prefix\r\n'
+            'D1,F1,Department of Cheddar,department\r\n'
+            'D2,F1,Institue of Gouda,institute\r\n'
+            'D3,F2,Department of Rings,department\r\n'
             )
         return
@@ -210 +204 @@
         self.assertEqual(
             result,
-            'code,faculty_code,title,title_prefix,users_with_local_roles\r\n'
-            'D1,F1,Department of Cheddar,department,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'D2,F1,Institue of Gouda,institute,[]\r\n'
-            'D3,F2,Department of Rings,department,[]\r\n'
+            'code,faculty_code,title,title_prefix\r\n'
+            'D1,F1,Department of Cheddar,department\r\n'
+            'D2,F1,Institue of Gouda,institute\r\n'
+            'D3,F2,Department of Rings,department\r\n'
             )
         return
@@ -221 +214 @@
     # Tests for CourseExporter
 
-    layer = FunctionalLayer
+    layer = KofaUnitTestLayer
 
     def setUp(self):
@@ -267 +260 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,credits,'
-            'passmark,semester,users_with_local_roles\r\n'
-            'C1,F1,D1,Cheese Basics,0,40,1,[]\r\n'
+            'code,faculty_code,department_code,title,credits,passmark,semester\r\n'
+            'C1,F1,D1,Cheese Basics,0,40,1\r\n'
             )
         return
@@ -279 +271 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,credits,passmark,'
-            'semester,users_with_local_roles\r\n'
-            'C1,F1,D1,Cheese Basics,0,40,1,[]\r\n'
-            'C2,F1,D1,Advanced Cheese Making,0,40,1,[]\r\n'
+            'code,faculty_code,department_code,title,credits,passmark,semester\r\n'
+            'C1,F1,D1,Cheese Basics,0,40,1\r\n'
+            'C2,F1,D1,Advanced Cheese Making,0,40,1\r\n'
             )
         return
@@ -293 +284 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,credits,passmark,'
-            'semester,users_with_local_roles\r\n'
-            'C1,F1,D1,Cheese Basics,0,40,1,[]\r\n'
-            'C2,F1,D1,Advanced Cheese Making,0,40,1,[]\r\n'
-            'C3,F1,D2,Selling Cheese,0,40,1,[]\r\n'
+            'code,faculty_code,department_code,title,credits,passmark,semester\r\n'
+            'C1,F1,D1,Cheese Basics,0,40,1\r\n'
+            'C2,F1,D1,Advanced Cheese Making,0,40,1\r\n'
+            'C3,F1,D2,Selling Cheese,0,40,1\r\n'
             )
         return
@@ -307 +297 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,credits,passmark,'
-            'semester,users_with_local_roles\r\n'
-            'C1,F1,D1,Cheese Basics,0,40,1,[]\r\n'
-            'C2,F1,D1,Advanced Cheese Making,0,40,1,[]\r\n'
-            'C3,F1,D2,Selling Cheese,0,40,1,[]\r\n'
+            'code,faculty_code,department_code,title,credits,passmark,semester\r\n'
+            'C1,F1,D1,Cheese Basics,0,40,1\r\n'
+            'C2,F1,D1,Advanced Cheese Making,0,40,1\r\n'
+            'C3,F1,D2,Selling Cheese,0,40,1\r\n'
             )
         return
@@ -318 +307 @@
     # Tests for CertificateExporter
 
-    layer = FunctionalLayer
+    layer = KofaUnitTestLayer
 
     def setUp(self):
@@ -350 +339 @@
         self.dept1.certificates.addCertificate(self.cert2)
         self.dept2.certificates.addCertificate(self.cert3)
-        role_manager = IPrincipalRoleManager(self.cert1)
-        role_manager.assignRoleToPrincipal(u'bobsrole', u'bob')
         return
 
@@ -378 +365 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,study_mode,start_level,'
-            'end_level,application_category,school_fee_1,'
-            'school_fee_2,school_fee_3,school_fee_4,users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
+            'code,faculty_code,department_code,title,study_mode,start_level,end_level,application_category,school_fee_1,school_fee_2\r\n'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,\r\n'
             )
         return
@@ -392 +376 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,study_mode,start_level,'
-            'end_level,application_category,school_fee_1,'
-            'school_fee_2,school_fee_3,school_fee_4,users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,,,,[]\r\n'
+            'code,faculty_code,department_code,title,study_mode,start_level,end_level,application_category,school_fee_1,school_fee_2\r\n'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,\r\n'
+            'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,\r\n'
             )
         return
@@ -408 +389 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,study_mode,start_level,'
-            'end_level,application_category,'
-            'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
-            'users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,,,,[]\r\n'
-            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,[]\r\n'
+            'code,faculty_code,department_code,title,study_mode,start_level,end_level,application_category,school_fee_1,school_fee_2\r\n'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,\r\n'
+            'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,\r\n'
+            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,\r\n'
             )
         return
@@ -425 +402 @@
         self.assertEqual(
             result,
-            'code,faculty_code,department_code,title,study_mode,start_level,'
-            'end_level,application_category,'
-            'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
-            'users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,'
-            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,,,,[]\r\n'
-            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,[]\r\n'
+            'code,faculty_code,department_code,title,study_mode,start_level,end_level,application_category,school_fee_1,school_fee_2\r\n'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,\r\n'
+            'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,\r\n'
+            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,\r\n'
             )
         return
@@ -471 +444 @@
         self.dept1.certificates.addCertificate(self.cert2)
         self.dept2.certificates.addCertificate(self.cert3)
-        self.cert1.addCertCourse(self.course1, 100, True)
-        self.cert1.addCertCourse(self.course2, 400, False)
-        self.cert3.addCertCourse(self.course3, 100, False)
+        self.cert1.addCourseRef(self.course1, 100, True)
+        self.cert1.addCourseRef(self.course2, 400, False)
+        self.cert3.addCourseRef(self.course3, 100, False)
         self.certcourse1 = self.cert1['C1_100']
         self.certcourse2 = self.cert1['C2_400']