Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py	(revision 8046)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py	(revision 8047)
@@ -127,4 +127,20 @@
         return applicant
 
+    def test_export_emtpy(self):
+        # we can export nearly empty applicants
+        self.applicant.applicant_id = u'dp2011_654321'
+        exporter = ApplicantsExporter()
+        exporter.export([self.applicant], self.outfile)
+        result = open(self.outfile, 'rb').read()
+        self.assertEqual(
+            result,
+            'applicant_id,course1,course2,course_admitted,date_of_birth,'
+            'email,firstname,lastname,lga,middlename,notice,phone,'
+            'reg_number,screening_score,screening_venue,sex\r\n'
+
+            'dp2011_654321,,,,,,Anna,Tester,foreigner,,,,,,,\r\n'
+            )
+        return
+
     def test_export(self):
         # we can really export applicants
@@ -138,11 +154,30 @@
             'applicant_id,course1,course2,course_admitted,date_of_birth,'
             'email,firstname,lastname,lga,middlename,notice,phone,'
-            'reg_number,school_grades,screening_score,screening_venue,'
+            'reg_number,screening_score,screening_venue,'
             'sex\r\n'
 
             'dp2011_654321,CERT1,CERT1,CERT1,1981-02-04,anna@sample.com,'
             'Anna,Tester,foreigner,M.,"Some notice\nin lines.",'
-            '+234-123-12345,123456,'
-            '"[(\'computer_science\', \'A\')]",98,Exam Room,f\r\n'
+            '+234-123-12345,123456,98,Exam Room,f\r\n'
             )
         return
+
+    def test_export_all(self):
+        # we can export all applicants in a portal
+        # set values we can expect in export file
+        self.applicant = self.setup_applicant(self.applicant)
+        exporter = ApplicantsExporter()
+        exporter.export_all(self.app, self.outfile)
+        result = open(self.outfile, 'rb').read()
+        self.assertEqual(
+            result,
+            'applicant_id,course1,course2,course_admitted,date_of_birth,'
+            'email,firstname,lastname,lga,middlename,notice,phone,'
+            'reg_number,screening_score,screening_venue,'
+            'sex\r\n'
+
+            'dp2011_654321,CERT1,CERT1,CERT1,1981-02-04,anna@sample.com,'
+            'Anna,Tester,foreigner,M.,"Some notice\nin lines.",'
+            '+234-123-12345,123456,98,Exam Room,f\r\n'
+            )
+        return
