Changeset 8334 for main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests

Timestamp:

3 May 2012, 20:43:02 (13 years ago)

Author:

Henrik Bettermann

Message:

Update password and state correctly.

Fix and improve logging. Do not log initial transition. They are always performed twice (due to applicant creation in converter).

File:

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

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

@@ -245 +245 @@
         open(self.csv_file_update2, 'wb').write(APPLICANT_SAMPLE_DATA_UPDATE2)
 
+        self.logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'applicants.log')
+
     def test_interface(self):
         # Make sure we fulfill the interface contracts.
@@ -289 +292 @@
         assert applicant.__implemented__.__name__ == (
             'waeup.kofa.applicants.applicant.Applicant')
+        logcontent = open(self.logfile).read()
+        # Logging message from updateEntry,
+        # create applicant with given application_number
+        self.assertTrue(
+            'Applicant imported: applicant_id=dp2011_1234, password=mypwd1, '
+            'reg_number=1001, firstname=Aaren, middlename=Peter, lastname=Pieri, '
+            'sex=m, course1=CERT1, date_of_birth=1990-01-02, email=xx@yy.zz' in
+            logcontent)
+        # create applicant with random application_number which is
+        # not shown in the log file
+        self.assertTrue(
+            'Applicant imported: reg_number=1003, firstname=Aaren, '
+            'middlename=Alfons, lastname=Berson, sex=m, course1=CERT1, '
+            'date_of_birth=1990-01-04, email=xx@yy.zz' in
+            logcontent)
         shutil.rmtree(os.path.dirname(fin_file))
 
@@ -327 +345 @@
         self.assertTrue(IUserAccount(container['1234']).checkPassword('mypwd1'))
         # password of Finau is still unset
-        self.assertEqual(IUserAccount(container['2345']).password,'')
+        self.assertEqual(IUserAccount(container['2345']).password,None)
         # reg_number of Finau has changed
         self.assertEqual(container['2345'].reg_number, '6666')
+        logcontent = open(self.logfile).read()
+
+        # Logging message from updateEntry,
+        # reg_number is locator
+        self.assertTrue(
+            'Applicant updated: reg_number=1001, firstname=Aaren' in
+            logcontent)
+        # applicant_id is locator
+        self.assertTrue(
+            'Applicant updated: state=admitted, reg_number=6666, '
+            'firstname=Alfons, applicant_id=dp2011_2345' in
+            logcontent)
+
         shutil.rmtree(os.path.dirname(fin_file))
 
@@ -350 +381 @@
             self.csv_file_update, APPLICANT_HEADER_FIELDS_UPDATE, 'remove')
         self.assertEqual(num_warns,0)
-        shutil.rmtree(os.path.dirname(fin_file))
+        logcontent = open(self.logfile).read()
+
+        # Logging message from handle_applicant_transition_event
+        self.assertTrue(
+            'dp2011_1234 - Applicant record removed' in
+            logcontent)
+
+        shutil.rmtree(os.path.dirname(fin_file))