Changeset 7912 for main/waeup.kofa/trunk

Timestamp:

19 Mar 2012, 01:55:47 (13 years ago)

Author:

uli

Message:

• Make batched applicant setup an own test case for reimport in other tests.
• Fix little typo.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py

@@ -164 +164 @@
         shutil.rmtree(os.path.dirname(fin_file))
 
-class ApplicantImporterTest(FunctionalTestCase):
+class ApplicantImportExportSetup(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(ApplicantImporterTest, self).setUp()
+        super(ApplicantImportExportSetup, self).setUp()
         # Setup a sample site for each test
         app = University()
@@ -204 +204 @@
         applicant = Applicant()
         applicant.firstname = u'Anna'
-        applicant.firstname = u'Tester'
+        applicant.lastname = u'Tester'
         self.app['applicants']['dp2011'].addApplicant(applicant)
         self.application_number = applicant.application_number
         self.applicant = self.app['applicants']['dp2011'][
             self.application_number]
+        self.workdir = tempfile.mkdtemp()
+        return
+
+    def tearDown(self):
+        super(ApplicantImportExportSetup, self).tearDown()
+        shutil.rmtree(self.workdir)
+        shutil.rmtree(self.dc_root)
+        clearSite()
+        return
+
+class ApplicantImporterTest(ApplicantImportExportSetup):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(ApplicantImporterTest, self).setUp()
         self.importer = ApplicantImporter()
-        self.workdir = tempfile.mkdtemp()
         self.csv_file = os.path.join(self.workdir, 'sample_applicant_data.csv')
         self.csv_file_faulty = os.path.join(self.workdir,
@@ -219 +234 @@
         open(self.csv_file_faulty, 'wb').write(FAULTY_APPLICANT_SAMPLE_DATA)
         open(self.csv_file_update, 'wb').write(APPLICANT_SAMPLE_DATA_UPDATE)
-
-    def tearDown(self):
-        super(ApplicantImporterTest, self).tearDown()
-        shutil.rmtree(self.workdir)
-        shutil.rmtree(self.dc_root)
-        clearSite()
-        return
 
     def test_interface(self):