Changeset 11687 for main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/tests

Timestamp:

16 Jun 2014, 08:29:22 (11 years ago)

Author:

Henrik Bettermann

Message:

Remove dependencies on kofacustom.nigeria.

Location:

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni

Files:

• . (moved) (moved from main/kofacustom.sampleuni/trunk/src/kofacustom/skeleton)
• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_export.py (modified) (3 diffs)
• students/tests/test_student.py (modified) (1 diff)

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/tests/test_browser.py

@@ -34 +34 @@
     IExtFileStore, IFileStoreNameChooser)
 from waeup.kofa.students.interfaces import IStudentsUtils
-from kofacustom.skeleton.testing import FunctionalLayer
+from kofacustom.sampleuni.testing import FunctionalLayer
 

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/tests/test_export.py

@@ -5 +5 @@
 from waeup.kofa.schoolgrades import ResultEntry
 from waeup.kofa.students.tests.test_batching import StudentImportExportSetup
-from kofacustom.skeleton.utils.utils import CustomKofaUtils
-from kofacustom.skeleton.students.export import (
+from kofacustom.sampleuni.utils.utils import CustomKofaUtils
+from kofacustom.sampleuni.students.export import (
     CustomStudentsExporter, CustomStudentPaymentsExporter)
-from kofacustom.skeleton.testing import FunctionalLayer
+from kofacustom.sampleuni.testing import FunctionalLayer
 
 
@@ -46 +46 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'adm_code,alr_date,alr_fname,alr_no,alr_results,clearance_locked,'
-            'clr_code,date_of_birth,def_adm,disabled,email,emp2_end,'
-            'emp2_position,emp2_reason,emp2_start,emp_end,emp_position,'
-            'emp_reason,emp_start,employer,employer2,firstname,former_matric,'
-            'fst_sit_date,fst_sit_fname,fst_sit_no,fst_sit_results,'
-            'fst_sit_type,hq2_degree,hq2_disc,hq2_matric_no,hq2_school,'
-            'hq2_session,hq2_type,hq_degree,hq_disc,hq_fname,hq_matric_no,'
-            'hq_school,hq_session,hq_type,is_staff,lastname,lga,'
-            'marit_stat,matric_number,middlename,nationality,'
-            'next_kin_address,next_kin_name,next_kin_phone,next_kin_relation,'
-            'nysc_lga,nysc_location,nysc_year,officer_comment,'
-            'perm_address,personal_updated,phone,reg_number,'
-            'religion,scd_sit_date,scd_sit_fname,scd_sit_no,'
-            'scd_sit_results,scd_sit_type,sex,student_id,'
-            'suspended,suspended_comment,password,state,history,certcode,is_postgrad,'
-            'current_level,current_session\r\nmy adm code,,,,'
-            '"[(\'visual_art\', \'A1\')]",0,my clr code,1981-02-04#,,,'
-            'anna@sample.com,,,,,,,,,,,Anna,,,,,"[(\'visual_art\', \'A1\')]"'
-            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'
-            '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,,,,,'
-            '"[(\'visual_art\', \'A1\')]",,f,A111111,0,,,created,'
-            '[u\'2012-11-06 13:16:41 WAT - Record created by system\'],'
+            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
+            'employer,firstname,lastname,matric_number,middlename,'
+            'nationality,officer_comment,perm_address,personal_updated,'
+            'phone,reg_number,sex,student_id,suspended,suspended_comment,'
+            'password,state,history,certcode,is_postgrad,current_level,'
+            'current_session\r\nmy adm code,0,my clr code,1981-02-04#,'
+            'anna@sample.com,,Anna,Tester,234,M.,NG,,'
+            '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,'
+            'f,A111111,0,,,created,'
+            '[u\'2014-06-16 08:23:55 UTC - Record created by system\'],'
             'CERT1,0,200,2012\r\n',
             result
@@ -99 +87 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'ac,amount_auth,creation_date,gateway_amt,p_category,p_current,'
-            'p_id,p_item,p_level,p_session,p_state,payment_date,provider_amt,'
-            'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
-            'r_pay_reference,thirdparty_amt,student_id,state,'
-            'current_session\r\n'
-            '666,12.12,2012-04-01 13:12:01,,schoolfee,1,my-id,p-item,'
-            '100,2012,paid,2012-04-01 14:12:01,,12.12,'
-            '789,r-code,interswatch,,,,A111111,created,2012\r\n',
+            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
+            'r_code,r_desc,student_id,state,current_session\r\n666,'
+            '12.12,2012-04-01 13:12:01,schoolfee,1,my-id,p-item,'
+            '100,2012,paid,2012-04-01 14:12:01,12.12,r-code,,'
+            'A111111,created,2012\r\n',
             result
             )

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/tests/test_student.py

@@ -22 +22 @@
 from zope.interface import verify
 from waeup.kofa.testing import FunctionalTestCase
-from kofacustom.skeleton.students.student import CustomStudent, CustomStudentFactory
-from kofacustom.skeleton.students.studycourse import (
+from kofacustom.sampleuni.students.student import CustomStudent, CustomStudentFactory
+from kofacustom.sampleuni.students.studycourse import (
     CustomStudentStudyCourse, CustomStudentStudyCourseFactory)
-from kofacustom.skeleton.students.studylevel import (
+from kofacustom.sampleuni.students.studylevel import (
     CustomStudentStudyLevel, CustomCourseTicket,
     CustomStudentStudyLevelFactory,
     CustomCourseTicketFactory)
-from kofacustom.skeleton.students.interfaces import (
+from kofacustom.sampleuni.students.interfaces import (
     ICustomStudent, ICustomStudentStudyCourse,
     ICustomStudentStudyLevel, ICustomCourseTicket)
-from kofacustom.skeleton.testing import FunctionalLayer
+from kofacustom.sampleuni.testing import FunctionalLayer