Index: main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/applicants/tests/test_applicant.py
===================================================================
--- main/kofacustom.sampleuni/trunk/src/kofacustom/skeleton/applicants/tests/test_applicant.py	(revision 11686)
+++ main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/applicants/tests/test_applicant.py	(revision 11687)
@@ -30,9 +30,9 @@
 from waeup.kofa.interfaces import IFileStoreHandler, IFileStoreNameChooser
 from waeup.kofa.testing import FunctionalTestCase
-from kofacustom.skeleton.applicants.applicant import (
+from kofacustom.sampleuni.applicants.applicant import (
     CustomApplicant, CustomApplicantFactory,
     )
-from kofacustom.skeleton.applicants.interfaces import ICustomApplicant
-from kofacustom.skeleton.testing import FunctionalLayer
+from kofacustom.sampleuni.applicants.interfaces import ICustomApplicant
+from kofacustom.sampleuni.testing import FunctionalLayer
 
 class CustomApplicantTest(FunctionalTestCase):
Index: main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/applicants/tests/test_browser.py
===================================================================
--- main/kofacustom.sampleuni/trunk/src/kofacustom/skeleton/applicants/tests/test_browser.py	(revision 11686)
+++ main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/applicants/tests/test_browser.py	(revision 11687)
@@ -24,9 +24,11 @@
 from zope.catalog.interfaces import ICatalog
 from zope.intid.interfaces import IIntIds
-from kofacustom.skeleton.testing import FunctionalLayer
+from kofacustom.sampleuni.testing import FunctionalLayer
+from waeup.kofa.schoolgrades import ResultEntry
+from waeup.kofa.utils.utils import KofaUtils
 from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
 from waeup.kofa.applicants.tests.test_batching import ApplicantImportExportSetup
-from kofacustom.skeleton.applicants.export import CustomApplicantsExporter
-from kofacustom.skeleton.applicants.batching import CustomApplicantProcessor
+from kofacustom.sampleuni.applicants.export import CustomApplicantsExporter
+from kofacustom.sampleuni.applicants.batching import CustomApplicantProcessor
 
 class CustomApplicantUITests(ApplicantsFullSetup):
@@ -53,5 +55,4 @@
         applicant.lastname = u'Tester'
         applicant.middlename = u'M.'
-        applicant.nationality = u'NG'
         applicant.date_of_birth = datetime.date(1981, 2, 4)
         applicant.sex = 'f'
@@ -62,8 +63,11 @@
         applicant.course_admitted = self.certificate
         applicant.notice = u'Some notice\nin lines.'
-        applicant.screening_score = 98
-        applicant.screening_venue = u'Exam Room'
-        applicant.screening_date = u'Saturday, 16th June 2012 2:00:00 PM'
         applicant.password = 'any password'
+        result_entry = ResultEntry(
+            KofaUtils.EXAM_SUBJECTS_DICT.keys()[0],
+            KofaUtils.EXAM_GRADES[0][0]
+            )
+        applicant.school_grades = [
+            result_entry]
         return applicant
 
@@ -75,23 +79,18 @@
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
-        self.assertMatches(result,
-            'aggregate,applicant_id,application_date,application_number,'
-            'course1,course2,course_admitted,date_of_birth,display_fullname,'
-            'email,emp2_end,emp2_position,emp2_reason,emp2_start,emp_end,'
-            'emp_position,emp_reason,emp_start,employer,employer2,'
-            'firstname,history,hq_degree,hq_disc,hq_matric_no,hq_school,'
-            'hq_session,hq_type,jamb_score,jamb_subjects,lastname,lga,'
-            'locked,middlename,nationality,notice,nysc_lga,nysc_year,'
-            'password,phone,pp_school,presently_inst,reg_number,'
-            'result_uploaded,screening_date,screening_score,'
-            'screening_venue,sex,special_application,'
-            'state,student_id,suspended,container_code\r\n'
-            ',dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
-            'Anna M. Tester,anna@sample.com,,,,,,,,,,,Anna,'
-            '[u\'2012-10-28 21:27:52 WAT - Application initialized by system\']'
-            ',,,,,,,,,Tester,,0,M.,NG,"Some notice\nin lines.",,,'
-            'any password,+234-123-12345#,,,123456,,'
-            '"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,,initialized,,'
-            '0,dp2011\r\n')
+        self.assertTrue(
+            'applicant_id,application_date,application_number,course1,course2,'
+            'course_admitted,date_of_birth,display_fullname,email,firstname,'
+            'history,lastname,locked,middlename,notice,password,phone,'
+            'reg_number,sex,special_application,state,'
+            'student_id,suspended,container_code\r\n'
+            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
+            'Anna M. Tester,anna@sample.com,Anna,'
+            in result)
+        self.assertTrue(
+            'Application initialized by system\'],'
+            'Tester,0,M.,"Some notice\nin lines.",any password,'
+            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
+            in result)
         # We can import the same file if we ignore some columns.
         # Since the applicants_catalog hasn't been notified, the same
@@ -100,17 +99,12 @@
         result = processor.doImport(
             self.outfile,
-            ['aggreagate','ignore_applicant_id','application_date',
+            ['ignore_applicant_id','application_date',
             'ignore_application_number','course1','course2',
-            'course_admitted','date_of_birth','ignore3','email','emp2_end',
-            'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
-            'emp_reason','emp_start','employer','employer2','firstname','ignore4',
-            'hq_degree','hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
-            'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
-            'nationality','notice','nysc_lga',
-            'nysc_year','password','phone','pp_school','presently_inst',
-            'reg_number','result_uploaded',
-            'screening_date','screening_score','screening_venue','sex',
-            'special_application',
-            'state','student_id','suspended','container_code'],
+            'course_admitted','date_of_birth',
+            'ignore_display_fullname','email','firstname',
+            'ignore_history','lastname','locked','middlename',
+            'notice','password','phone',
+            'reg_number','sex','special_application','state',
+            'student_id','suspended','container_code'],
             mode='create')
         num_succ, num_fail, finished_path, failed_path = result
@@ -118,27 +112,3 @@
         self.assertEqual(num_succ,1)
         self.assertEqual(num_fail,0)
-        # Now we ignore also the container_code and import the same file
-        # in update mode which means that INigeriaApplicantUpdateByRegNo
-        # is used for field conversion. applicant_id must be ignored
-        # too since the previous import has notified the applicants_catalog
-        # so that the portal 'knows' that reg_number is in use.
-        processor = CustomApplicantProcessor()
-        result = processor.doImport(
-            self.outfile,
-            ['aggregate','ignore_applicant_id','application_date',
-            'ignore_application_number','course1','course2',
-            'course_admitted','date_of_birth','ignore3','email','emp2_end',
-            'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
-            'emp_reason','emp_start','employer','employer2','firstname','ignore4',
-            'hq_degree','hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
-            'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
-            'nationality','notice','nysc_lga',
-            'nysc_year','password','phone','pp_school','presently_inst',
-            'reg_number','result_uploaded','screening_date','screening_score',
-            'screening_venue','sex','special_application',
-            'state','student_id','suspended','ignore_container_code'],
-            mode='update')
-        num_succ, num_fail, finished_path, failed_path = result
-        self.assertEqual(num_succ,1)
-        self.assertEqual(num_fail,0)
         return
